Reduce line width

doc/user/lua-tutorial.xml

@@ -377,7 +377,7 @@ lua function main_function()
   end_time = os.clock()
   end!
 call main_function()!
-lua print('inserted 1 million tuples in ' .. end_time - start_time .. ' seconds')!
+lua print('insert done in ' .. end_time - start_time .. ' seconds')!
 </programlisting>
 
 The Lua os.clock() function will return the number of seconds since the start.
@@ -401,7 +401,7 @@ the statement that created main_function(), and the statement that invokes main_
 
 
 <programlisting>
-#NB: If you have already said "setopt delimiter = '!'", do not say it again -- skip this statement.
+#Skip the following statement if you have already said "setopt delimiter = '!'"
 setopt delimiter = '!'
 
 lua function string_function()
@@ -426,7 +426,7 @@ lua function main_function()
   end_time = os.clock()
   end!
 call main_function()!
-lua print('inserted 1 million tuples in ' .. end_time - start_time .. ' seconds')!
+lua print('insert done in ' .. end_time - start_time .. ' seconds')!
 </programlisting>
 
 The screen now looks like this:
@@ -459,9 +459,9 @@ localhost&gt; <userinput>lua function main_function()</userinput>
 ...
 localhost&gt; <userinput>call main_function()!</userinput>
 Call OK, 0 rows affected
-localhost&gt; <userinput>lua print('inserted 1 million tuples in ' .. end_time - start_time .. ' seconds')!</userinput>
+localhost&gt; <userinput>lua print('insert done in ' .. end_time - start_time .. ' seconds')!</userinput>
 ---
-inserted 1 million tuples in 41.66 seconds
+insert done in 41.66 seconds
 ...
 localhost&gt;
 </programlisting>

doc/user/persistence-architecture.xml

@@ -30,24 +30,24 @@ On the left are the hexadecimal bytes that one would see with
 <programlisting><prompt>$ </prompt><userinput>hexdump work_dir/00000000000000000002.xlog</userinput></programlisting>
 and on the right are comments.
 <programlisting>
-Hex dump of WAL file        Comment
---------------------        -------
-58 4c 4f 47 0a              File header: "XLOG\n"
-30 2e 31 31 0a 0a           File header: "0.11\n\n" = version
-ed ab 0b ba                 Magic row marker always = 0xba0babed for version 0.11
-10 2a 1b 5e                 Record header: crc32 checksum of header fields
-02 00 00 00 00 00 00 00     Record header: 2 = (64-bit int) log sequence number
-99 c8 f1 d9 32 a8 d4 41     Record header: (double) UNIX time-since-epoch for transaction
-1d 00 00 00                 Record header: 29 = length of rest of record, non-inclusive
-60 45 94 cd                 Record header: crc32 checksum of data fields
-fe ff                       Tag = XLOG which is #defined as 65534
-02 00 99 f9 7f 00 00 01     Session cookie, comes from struct sockaddr_in *addr
-0d 00 00 00                 Data change request code = insert which is #defined as 13
-00 00                       Space number = 0
-02 00 00 00                 Flags = BOX_ADD which is defined as 2
-01 00 00 00                 Tuple: Count of fields in tuple = 1
-04                          Tuple: field[0] length = 4 because value is 4 bytes long
-01 00 00 00                 Tuple: field[0] value = 1
+Hex dump of WAL file       Comment
+--------------------       -------
+58 4c 4f 47 0a             File header: "XLOG\n"
+30 2e 31 31 0a 0a          File header: "0.11\n\n" = version
+ed ab 0b ba                Magic row marker always = 0xba0babed if version 0.11
+10 2a 1b 5e                Record header: crc32 checksum of header fields
+02 00 00 00 00 00 00 00    Record header: 2 = (64-bit int) log sequence number
+99 c8 f1 d9 32 a8 d4 41    Record header: UNIX time-since-epoch for transaction
+1d 00 00 00                Record header: 29 = length of rest of record
+60 45 94 cd                Record header: crc32 checksum of data fields
+fe ff                      Tag = XLOG which is #defined as 65534
+02 00 99 f9 7f 00 00 01    Session cookie, comes from struct sockaddr_in *addr
+0d 00 00 00                Data change request code = insert. #defined as 13
+00 00                      Space number = 0
+02 00 00 00                Flags = BOX_ADD which is defined as 2
+01 00 00 00                Tuple: Count of fields in tuple = 1
+04                         Tuple: field[0] length = 4 (value is 4 bytes long)
+01 00 00 00                Tuple: field[0] value = 1
 </programlisting>
 </para>
 

doc/user/plugins.xml

@@ -74,7 +74,7 @@ OK
 # Check that the mysql client can connect using some factory defaults:
 # port = 3306, user = 'root', user password = '', database = 'test'.
 # These can be changed, provided one changes them in all places.
-<prompt>$ </prompt><userinput>~/mysql-5.5/bin/mysql --port=3306 --host=127.0.0.1 --user=root --database=test</userinput>
+<prompt>$ </prompt><userinput>~/mysql-5.5/bin/mysql --port=3306 -h 127.0.0.1 --user=root --database=test</userinput>
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 25
 Server version: 5.5.35 MySQL Community Server (GPL)
@@ -97,7 +97,8 @@ Bye
 <prompt>$ </prompt><userinput>cd ~/tarantool-stable</userinput>
 <prompt>$ </prompt><userinput>make clean</userinput>
 <prompt>$ </prompt><userinput>rm CMakeCache.txt</userinput>
-<prompt>$ </prompt><userinput>cmake . -DWITH_MYSQL=on -DMYSQL_INCLUDE_DIR=~/mysql-5.5/include -DMYSQL_LIBRARIES=~/mysql-5.5/lib/libmysqlclient.so -DENABLE_CLIENT=true</userinput>
+<prompt>$ </prompt><userinput>cmake . -DWITH_MYSQL=on -DMYSQL_INCLUDE_DIR=~/mysql-5.5/include\</userinput>
+<prompt>&gt; </prompt><userinput> -DMYSQL_LIBRARIES=~/mysql-5.5/lib/libmysqlclient.so -DENABLE_CLIENT=true</userinput>
 ...
 -- Found MySQL includes: ~/mysql-5.5/include/mysql.h
 -- Found MySQL library: ~/mysql-5.5/lib/libmysqlclient.so
@@ -127,8 +128,8 @@ Linking CXX shared library libmysql.so
 # So it's possible to see the message that the plugin was loaded.
 <prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool_box&amp;</userinput>
 2013-12-03 17:46:16.239 [12957] 1/sched C&gt; version 1.5.1-271-g610930e
-2013-12-03 17:46:16.241 [12957] 1/sched I&gt; Loading plugin: ~/tarantool-stable/src/plugin/mysql/libmysql.so
-2013-12-03 17:46:16.242 [12957] 1/sched I&gt; Plugin 'mysql' was loaded, version: 1
+... Loading plugin: ~/tarantool-stable/src/plugin/mysql/libmysql.so ...
+... Plugin 'mysql' was loaded, version: 1
 ...
 2013-12-03 17:46:16.244 [12957] 1/sched C&gt; entering event loop
 
@@ -149,7 +150,8 @@ plugins:
 # Lua tutorial in the Tarantool user manual.
 <prompt>localhost&gt; </prompt><userinput>SETOPT delimiter = '!'</userinput>
 <prompt>localhost&gt; </prompt><userinput>lua function mysql_select ()</userinput>
-        <prompt>-&gt; </prompt><userinput>  local dbh = box.net.sql.connect('mysql', '127.0.0.1', 3306, 'root', '', 'test')</userinput>
+        <prompt>-&gt; </prompt><userinput>  local dbh = box.net.sql.connect(</userinput>
+        <prompt>-&gt; </prompt><userinput>      'mysql', '127.0.0.1', 3306, 'root', '', 'test')</userinput>
         <prompt>-&gt; </prompt><userinput>  local test = dbh:select('SELECT * FROM test WHERE s1 = 1')</userinput>
         <prompt>-&gt; </prompt><userinput>  for i, card in pairs(test) do</userinput>
         <prompt>-&gt; </prompt><userinput>    print(card.s2)</userinput>
@@ -189,7 +191,8 @@ on the local host 127.0.0.1.
 </para>
 
 <programlisting>
-# Check that the include subdirectory exists by looking for /usr/include/postgresql/libpq-fe-h.
+# Check that the include subdirectory exists
+# by looking for /usr/include/postgresql/libpq-fe-h.
 <prompt>$ </prompt><userinput>[ -f /usr/include/postgresql/libpq-fe.h ] &amp;&amp; echo "OK" || echo "Error"</userinput>
 OK
 
@@ -220,7 +223,8 @@ INSERT 0 1
 <prompt>$ </prompt><userinput>cd ~/tarantool-stable</userinput>
 <prompt>$ </prompt><userinput>make clean</userinput>
 <prompt>$ </prompt><userinput>rm CMakeCache.txt</userinput>
-<prompt>$ </prompt><userinput>cmake . -DWITH_POSTGRESQL=on -DPostgreSQL_LIBRARY=/usr/lib/libpq.so -DPostgreSQL_INCLUDE_DIR=/usr/include/postgresql -DENABLE_CLIENT=true</userinput>
+<prompt>$ </prompt><userinput>cmake . -DWITH_POSTGRESQL=on -DPostgreSQL_LIBRARY=/usr/lib/libpq.so\</userinput>
+<prompt>&gt; </prompt><userinput> -DPostgreSQL_INCLUDE_DIR=/usr/include/postgresql -DENABLE_CLIENT=true</userinput>
 ...
 -- Found PostgreSQL: /usr/lib/libpq.so 
 -- box.net.sql(pg): INC=/usr/include/postgresql;/usr/include/postgresql
@@ -249,8 +253,8 @@ Linking CXX shared library libpg.so
 # So it's possible to see the message that the plugin was loaded.
 <prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool_box&amp;</userinput>
 2013-12-06 13:01:51.518 [23978] 1/sched C> version 1.5.1-290-g45b93e7
-2013-12-06 13:01:51.520 [23978] 1/sched I> Loading plugin: ~/tarantool-stable/src/plugin/pg/libpg.so
-2013-12-06 13:01:51.527 [23978] 1/sched I> Plugin 'postgresql' was loaded, version: 1
+... Loading plugin: ~/tarantool-stable/src/plugin/pg/libpg.so ...
+... Plugin 'postgresql' was loaded, version: 1
 ...
 2013-12-06 13:01:51.531 [23978] 1/sched C> entering event loop
 
@@ -271,7 +275,8 @@ plugins:
 # Lua tutorial in the Tarantool user manual.
 <prompt>localhost&gt; </prompt><userinput>SETOPT delimiter = '!'</userinput>
 <prompt>localhost&gt; </prompt><userinput>lua function postgresql_select ()</userinput>
-        <prompt>-&gt; </prompt><userinput>  local dbh = box.net.sql.connect('pg', '127.0.0.1', 5432, 'postgres', 'postgres', 'postgres')</userinput>
+        <prompt>-&gt; </prompt><userinput>  local dbh = box.net.sql.connect(</userinput>
+        <prompt>-&gt; </prompt><userinput>      'pg', '127.0.0.1', 5432, 'postgres', 'postgres', 'postgres')</userinput>
         <prompt>-&gt; </prompt><userinput>  local test = dbh:select('SELECT * FROM test WHERE s1 = 1')</userinput>
         <prompt>-&gt; </prompt><userinput>  for i, card in pairs(test) do</userinput>
         <prompt>-&gt; </prompt><userinput>    print(card.s2)</userinput>

doc/user/server-administration.xml

@@ -468,12 +468,17 @@ to print write-ahead-log contents, or to send write-ahead-log
 contents to the server.
 Here is an example of a print-and-play-mode tarantool client session:
 <programlisting>
-<prompt>$ </prompt>tarantool --cat /home/user1/tarantool_test/work_dir/00000000000000000005.xlog --from 22 --to 26
-Insert, lsn: 22, time: 1385327353.345869, len: 33, space: 0, cookie: 127.0.0.1:44787 ['X-1', 100]
-Insert, lsn: 23, time: 1385327353.346745, len: 42, space: 0, cookie: 127.0.0.1:44787 ['X-2', 200, 8243105135088135759]
-Insert, lsn: 24, time: 1385327353.347352, len: 34, space: 0, cookie: 127.0.0.1:44787 ['X-3', 300, '']
-Update, lsn: 25, time: 1385327353.348209, len: 42, space: 0, cookie: 127.0.0.1:44787 ['X-1']
-Delete, lsn: 26, time: 1385327353.348879, len: 28, space: 0, cookie: 127.0.0.1:44787 ['X-2']
+<prompt>$ </prompt>tarantool --cat 00000000000000000005.xlog --from 22 --to 26
+Insert, lsn: 22, time: 1385327353.345869, len: 33, space: 0,
+    cookie: 127.0.0.1:44787 ['X-1', 100]
+Insert, lsn: 23, time: 1385327353.346745, len: 42, space: 0,
+    cookie: 127.0.0.1:44787 ['X-2', 200, 8243105135088135759]
+Insert, lsn: 24, time: 1385327353.347352, len: 34, space: 0,
+    cookie: 127.0.0.1:44787 ['X-3', 300, '']
+Update, lsn: 25, time: 1385327353.348209, len: 42, space: 0,
+    cookie: 127.0.0.1:44787 ['X-1']
+Delete, lsn: 26, time: 1385327353.348879, len: 28, space: 0,
+    cookie: 127.0.0.1:44787 ['X-2']
 <prompt>$ </prompt>
 </programlisting>
 </para>