Merge lp:~dsmythies/serverguide/lp1129649_plus into lp:~ubuntu-core-doc/serverguide/raring

[Doug Smythies]

This MP addresses:
LP: #1129649
LP: #1103870 (although not to the extent that was desired by the poster)
I thought maybe LP: #922251 , but some inforomation was just added to the bug report, so no.

Some odd strange garbage bytes in the .xml files were removed.
All non single byte UTF-8 characters in the .xml files were removed, and now this:
grep --color='auto' -P -n "[\x80-\xFF]" *.xml
doesn't find anything. Now the only multi byte UTF-8 characters in the master source files are two in ubuntu.xsl defining the double >> character used in the link trails, and such is consitent with other Ubuntu docs.

Some other minor edits.

I am looking for peer review for this merge proposal, but will not wait long for it, as time is running out.

[Doug Smythies (dsmythies)]

I forgot:
Also a slight change related to LP: #1050595
And several of the multibyte UTF-8 characters in dm-multipath.xml were for quotes characters that were not needed anyhow as both the PDF and the HTML differentiate the text anyhow, so I took them out.

Note: the colored diff used herein might make some line changes difficult to see. The non-colored "bzr diff" display gets really confused by multi-byte UTF-8 characters.

[Doug Smythies (dsmythies)]

I'm going ahead and merging this.

review: Approve

=== modified file 'serverguide/C/dm-multipath.xml'
--- serverguide/C/dm-multipath.xml	2013-03-14 21:49:37 +0000
+++ serverguide/C/dm-multipath.xml	2013-03-29 23:04:23 +0000
@@ -173,8 +173,8 @@
     <sect2 id="multipath-dm-multipath-components">
       <title>&DMM; components</title>
 
-      <para>Table <link linkend="multipath-components-table">“DM-Multipath
-      Components”</link> describes the components of the DM-Multipath package.</para>
+      <para>Table <link linkend="multipath-components-table">DM-Multipath
+      Components</link> describes the components of the DM-Multipath package.</para>
       <xi:include href="multipath-components-table.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"/>
     </sect2>
@@ -272,16 +272,16 @@
       defaults, including the <emphasis role="bold"><link
       linkend="attribute-user_friendly_names">user_friendly_names</link></emphasis>
       configuration option, see Section , <link
-      linkend="multipath-config-defaults">“Configuration File
-      Defaults”</link>. You can also set the name of a multipath device to a
+      linkend="multipath-config-defaults">Configuration File
+      Defaults</link>. You can also set the name of a multipath device to a
       name of your choosing by using the <emphasis role="bold"><link
       linkend="attribute-alias">alias</link></emphasis> option in the
       <emphasis role="bold">multipaths</emphasis> section of the multipath
       configuration file. For information on the <emphasis
       role="bold">multipaths</emphasis> section of the multipath configuration
       file, see Section, <link
-      linkend="multipath-config-multipath">“Multipaths Device Configuration
-      Attributes”</link>.</para>
+      linkend="multipath-config-multipath">Multipaths Device Configuration
+      Attributes</link>.</para>
     </sect2>
 
     <sect2 id="multipath-device-names-in-cluster">
@@ -518,8 +518,8 @@
           role="bold">/dev/sda</emphasis>, in the multipath map. For further
           information on the <emphasis role="bold">multipath</emphasis>
           command output, see Section <link
-          linkend="multipath-command-output">“Multipath Command
-          Output”</link>.</para>
+          linkend="multipath-command-output">Multipath Command
+          Output</link>.</para>
 
           <screen>
 # multipath -v2
@@ -602,8 +602,8 @@
           <command>multipath -ll</command> command to display the current
           multipath configuration. For information on the <command>multipath
           -ll</command> command, see Section <link
-          linkend="multipath-queries-and-commands">“Multipath Queries with
-          multipath Command”</link>. To check that the blacklisted device was
+          linkend="multipath-queries-and-commands">Multipath Queries with
+          multipath Command</link>. To check that the blacklisted device was
           not added back, you can run the multipath command, as in the
           following example. The multipath command defaults to a verbosity
           level of <emphasis role="bold">v2</emphasis> if you do not specify a
 
=== modified file 'serverguide/C/installation.xml'
--- serverguide/C/installation.xml	2012-10-10 11:20:12 +0000
+++ serverguide/C/installation.xml	2013-03-29 23:04:23 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
 	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY % globalent SYSTEM "../../libs/global.ent">
@@ -53,13 +53,20 @@
                                                         <row>
                                                                 <entry><para>Server (Minimal)</para></entry>
                                                                 <entry><para>300 megahertz</para></entry>
-                                                                <entry><para>256 megabytes</para></entry>
+                                                                <entry><para>128 megabytes</para></entry>
                                                                 <entry><para>700 megabytes</para></entry>
                                                                 <entry><para>1.4 gigabytes</para></entry>
                                                         </row>
                                                 </tbody>
                                         </tgroup>
 				</table>
+
+                                <note>
+                                <para>
+                                        A virtual installation requires a minimum of 256 megabytes of RAM during the installation phase.
+                                </para>
+                                </note>
+
 				<para>
 				The Server Edition provides a common base for all sorts of server applications. 
 				It is a minimalist design providing a platform for the desired services, such 
 
=== modified file 'serverguide/C/lamp-applications.xml'
--- serverguide/C/lamp-applications.xml	2013-03-05 01:04:42 +0000
+++ serverguide/C/lamp-applications.xml	2013-03-29 23:04:23 +0000
@@ -381,7 +381,7 @@
         </listitem>
         <listitem>
           <para>
-          The <ulink url="http://www.packtpub.com/Mediawiki/book">MediaWiki Administrators’ Tutorial Guide</ulink>
+          The <ulink url="http://www.packtpub.com/Mediawiki/book">MediaWiki Administrators' Tutorial Guide</ulink>
           contains a wealth of information for new MediaWiki administrators.
           </para>
         </listitem>
 
=== modified file 'serverguide/C/network-auth.xml'
--- serverguide/C/network-auth.xml	2013-03-18 23:44:19 +0000
+++ serverguide/C/network-auth.xml	2013-03-29 23:04:23 +0000
@@ -200,20 +200,19 @@
 <screen>
 <computeroutput>
     /etc/ldap/slapd.d/
-
-	├── cn=config
-	│   ├── cn=module{0}.ldif
-	│   ├── cn=schema
-	│   │   ├── cn={0}core.ldif
-	│   │   ├── cn={1}cosine.ldif
-	│   │   ├── cn={2}nis.ldif
-	│   │   └── cn={3}inetorgperson.ldif
-	│   ├── cn=schema.ldif
-	│   ├── olcBackend={0}hdb.ldif
-	│   ├── olcDatabase={0}config.ldif
-	│   ├── olcDatabase={-1}frontend.ldif
-	│   └── olcDatabase={1}hdb.ldif
-	└── cn=config.ldif
+    /etc/ldap/slapd.d/cn=config
+    /etc/ldap/slapd.d/cn=config/cn=module{0}.ldif
+    /etc/ldap/slapd.d/cn=config/cn=schema
+    /etc/ldap/slapd.d/cn=config/cn=schema/cn={0}core.ldif
+    /etc/ldap/slapd.d/cn=config/cn=schema/cn={1}cosine.ldif
+    /etc/ldap/slapd.d/cn=config/cn=schema/cn={2}nis.ldif
+    /etc/ldap/slapd.d/cn=config/cn=schema/cn={3}inetorgperson.ldif
+    /etc/ldap/slapd.d/cn=config/cn=schema.ldif
+    /etc/ldap/slapd.d/cn=config/olcBackend={0}hdb.ldif
+    /etc/ldap/slapd.d/cn=config/olcDatabase={0}config.ldif
+    /etc/ldap/slapd.d/cn=config/olcDatabase={-1}frontend.ldif
+    /etc/ldap/slapd.d/cn=config/olcDatabase={1}hdb.ldif
+    /etc/ldap/slapd.d/cn=config.ldif
 </computeroutput>
 </screen>
 
 
=== modified file 'serverguide/C/network-config.xml'
--- serverguide/C/network-config.xml	2012-08-20 08:09:16 +0000
+++ serverguide/C/network-config.xml	2013-03-29 23:04:23 +0000
@@ -959,7 +959,7 @@
                 </varlistentry>
             </variablelist>
             <para>
-	    The last two methods can be considered “automatic” because in each case the DHCP server
+	    The last two methods can be considered "automatic" because in each case the DHCP server
             assigns an address with no extra intervention needed. The only difference between them
 	    is in how long the IP address is leased, in other words whether a client's address varies
 	    over time.
 
=== modified file 'serverguide/C/security.xml'
--- serverguide/C/security.xml	2012-09-20 15:06:36 +0000
+++ serverguide/C/security.xml	2013-03-29 23:04:23 +0000
@@ -1644,7 +1644,7 @@
           <title>eCryptfs</title>
           
           <para>
-          <emphasis>eCryptfs</emphasis> is a POSIX-compliant enterprise-class stacked cryptographic filesystem for Linux.  Layering on
+          <emphasis>eCryptfs</emphasis> is a POSIX-compliant enterprise-class stacked cryptographic filesystem for Linux. Layering on
           top of the filesystem layer <emphasis>eCryptfs</emphasis> protects files no matter the underlying filesystem, partition 
           type, etc.
           </para>
 
=== modified file 'serverguide/C/virtualization.xml'
--- serverguide/C/virtualization.xml	2013-03-23 22:09:27 +0000
+++ serverguide/C/virtualization.xml	2013-03-29 23:04:23 +0000
@@ -38,7 +38,7 @@
     </para>
     <note>
       <para>
-      On most computer whose processor supports virtualization, it is
+      On many computers with processors supporting hardware assisted virtualization, it is
       necessary to activate an option in the BIOS to enable it. 
       </para>
     </note>
@@ -46,13 +46,14 @@
       <title>Virtual Networking</title>
 
       <para>
-      There are a few different ways to allow a virtual machine access to the external network.  The default virtual network configuration is 
-      <emphasis>usermode</emphasis> networking, which uses the SLIRP protocol and traffic is NATed through the host interface to the outside network.
+      There are a few different ways to allow a virtual machine access to the external network.  The default virtual network configuration includes
+      <emphasis>bridging</emphasis> and <emphasis>iptables</emphasis> rules implementing <emphasis>usermode</emphasis> networking, which uses the
+      SLIRP protocol. Traffic is NATed through the host interface to the outside network.
       </para>
 
       <para>
-      To enable external hosts to directly access services on virtual machines a <emphasis>bridge</emphasis> needs to be configured.  This allows
-      the virtual interfaces to connect to the outside network through the physical interface, making them appear as normal hosts to the rest 
+      To enable external hosts to directly access services on virtual machines a different type of <emphasis>bridge</emphasis> than the default needs
+      to be configured.  This allows the virtual interfaces to connect to the outside network through the physical interface, making them appear as normal hosts to the rest 
       of the network. For information on setting up a bridge see <xref linkend="bridging"/>.
       </para>
 
@@ -63,7 +64,7 @@
       To install the necessary packages, from a terminal prompt enter:
       </para>
 <screen>
-<command>sudo apt-get install kvm libvirt-bin</command>
+<command>sudo apt-get install qemu-kvm libvirt-bin</command>
 </screen>
       <para>
       After installing <application>libvirt-bin</application>, the user used to manage virtual machines will need to be added to 
@@ -116,8 +117,8 @@
 <screen>
 <command>sudo virt-install -n web_devel -r 256 \
 --disk path=/var/lib/libvirt/images/web_devel.img,bus=virtio,size=4 -c \
-jeos.iso --accelerate --network network=default,model=virtio \
---connect=qemu:///system --vnc --noautoconsole -v</command>
+jeos.iso --network network=default,model=virtio \
+--graphics vnc,listen=0.0.0.0 --noautoconsole -v</command>
 </screen>
       <itemizedlist>
         <listitem>
@@ -145,18 +146,14 @@
         </listitem>
         <listitem>
           <para>
-          <emphasis>--accelerate:</emphasis> enables the kernel's acceleration technologies. 
-          </para>
-        </listitem>
-        <listitem>
-          <para>
           <emphasis>--network</emphasis> provides details related to the VM's network interface.  Here the <emphasis>default</emphasis>
           network is used, and the interface model is configured for <emphasis>virtio</emphasis>.
           </para>
         </listitem>
         <listitem>
           <para>
-          <emphasis>--vnc:</emphasis> exports the guest's virtual console using VNC. 
+          <emphasis>--graphics vnc,listen=0.0.0.0:</emphasis> exports the guest's virtual console using VNC and on all host interfaces.
+          Typically servers have no GUI, so another GUI based computer on the Local Area Network (LAN) can connect via VNC to complete the installation.
           </para>
         </listitem>
         <listitem>
@@ -172,7 +169,7 @@
       </itemizedlist>
       <para>
       After launching <application>virt-install</application> you can connect to the virtual machine's console either locally
-      using a GUI or with the <application>virt-viewer</application> utility.
+      using a GUI (if your server has a GUI), or via a remote VNC client from a GUI based computer.
       </para>
     </sect2>
     <sect2 id="libvirt-virt-clone" status="review">
@@ -730,7 +727,7 @@
   line of the partition file should specify (root first):
       mountpoint size
   where  size  is  in megabytes. You can have up to 4 virtual disks, a new disk starts
-  on a line with ’---’.  ie :
+  on a line with '---'.  ie :
       root 1000
       /opt 1000
       swap 256
@@ -939,7 +936,7 @@
             <para>
             By default, <application>apt-mirror</application> uses the configuration file in <filename>/etc/apt/mirror.list</filename>. 
             As it is set up, it will replicate only the architecture of the local machine. If you would like to support other 
-            architectures on your mirror, simply duplicate the lines starting with “deb”, replacing the deb keyword by /deb-{arch}
+            architectures on your mirror, simply duplicate the lines starting with "deb", replacing the deb keyword by /deb-{arch}
             where arch can be i386, amd64, etc... For example, on an amd64 machine, to have the i386 archives as well, you will have
             (some lines have been split to fit the format of this document):
             </para>
@@ -1115,7 +1112,7 @@
     <sect2 id="ubuntu-cloud-prerequisites" status="review">
       <title>Prerequisites</title>
     <para>
-		To deploy a minimal Ubuntu Cloud infrastructure, you’ll need at least:
+		To deploy a minimal Ubuntu Cloud infrastructure, you'll need at least:
     </para>
 
     <itemizedlist>
@@ -1153,8 +1150,8 @@
 		time server (ntp). This will assure that we have instantiated machines and hosts in sync. 
 		</para>
 		<para>
-		In this example the “private network” will be in the 10.0.0.0/24 range on eth1. All the internal communication between instances will happen 
-		there while the “public network” will be in the 10.153.107.0/29 range on eth0.
+		In this example the "private network" will be in the 10.0.0.0/24 range on eth1. All the internal communication between instances will happen 
+		there while the "public network" will be in the 10.153.107.0/29 range on eth0.
 		</para>
 
 		<sect3 id="ubuntu-cloud-config-bridge" status="review">
@@ -1225,7 +1222,7 @@
 <command>sudo service libvirt-bin restart</command>
 </screen>	
 		<para>
-		Install RabbitMQ – Advanced Message Queuing Protocol (AMQP)
+		Install RabbitMQ - Advanced Message Queuing Protocol (AMQP)
 		</para>
 <screen>
 <command>sudo apt-get install rabbitmq-server</command>
@@ -1293,7 +1290,7 @@
 <command>sudo nova-manage service list</command>
 <command>sudo nova-manage version list</command>
 </screen>
-			<para>If nova services don’t show up correctly restart OpenStack services as described previously. For more information please 
+			<para>If nova services don't show up correctly restart OpenStack services as described previously. For more information please 
 			refer to the troubleshooting section on this guide.</para>
 
 </sect2>
@@ -1353,9 +1350,8 @@
 
 	<para>Download, register and publish an Ubuntu cloud image</para>
 <screen>
-<command>distro=lucid</command>
-<command>wget http://cloud-images.ubuntu.com/$distro/current/$distro-server-cloudimg-amd64.tar.gz</command>
-<command>cloud-publish-tarball "$distro"-server-cloudimg-amd64.tar.gz "$distro"_amd64</command>
+<command>wget http://cloud-images.ubuntu.com/&distro-short-codename;/current/&distro-short-codename;-server-cloudimg-amd64.tar.gz</command>
+<command>cloud-publish-tarball &distro-short-codename;-server-cloudimg-amd64.tar.gz &distro-short-codename;_amd64</command>
 </screen>
 		<para>Create a key pair and start an instance</para>
 <screen>
@@ -1509,7 +1505,7 @@
         </listitem>
            <listitem>
           <para>
-          <emphasis>IaaS</emphasis> - Infrastructure as a Service — Cloud infrastructure services, whereby a virtualized 
+          <emphasis>IaaS</emphasis> - Infrastructure as a Service -- Cloud infrastructure services, whereby a virtualized 
           environment is delivered as a service over the Internet by the provider. The infrastructure can include servers, 
           network equipment, and software.
           </para>