Merge lp:~ted-m-cox/serverguide/uniquebranchname into lp:serverguide/trunk

[Ted Cox]

Fixed some bugs and corrected some line wrapping.

[Doug Smythies (dsmythies)]

O.K. Thanks.

review: Approve

=== modified file 'serverguide/C/mail.xml'
--- serverguide/C/mail.xml	2014-12-04 19:53:40 +0000
+++ serverguide/C/mail.xml	2015-06-08 03:12:49 +0000
@@ -572,7 +572,7 @@
             <para>
             All the parameters you configure in the user interface are
             stored in
-            <filename>/etc/exim4/update-exim4.conf</filename> file.
+            <filename>/etc/exim4/update-exim4.conf.conf</filename> file.
             If you wish to re-configure, either you re-run the
             configuration wizard or manually edit this file
             using your favorite editor. Once you configure, you can run

=== modified file 'serverguide/C/network-auth.xml'
--- serverguide/C/network-auth.xml	2015-02-26 20:29:30 +0000
+++ serverguide/C/network-auth.xml	2015-06-08 03:12:49 +0000
@@ -19,10 +19,12 @@
 	<title>OpenLDAP Server</title>
 
 	<para>
-	The Lightweight Directory Access Protocol, or LDAP, is a protocol for querying and modifying a X.500-based directory service running
-	over TCP/IP. The current LDAP version is LDAPv3, as defined in <ulink url="http://tools.ietf.org/html/rfc4510">RFC4510</ulink>, and
-	the its implementation used in Ubuntu is from OpenLDAP.
-	</para>
+	The Lightweight Directory Access Protocol, or LDAP, is a protocol for 
+    querying and modifying a X.500-based directory service running over TCP/IP. 
+	The current LDAP version is LDAPv3, as defined in <ulink 
+    url="http://tools.ietf.org/html/rfc4510">RFC4510</ulink>, and the 
+    implementation in Ubuntu is OpenLDAP."
+    </para>
 
 	<para>
 	So the LDAP protocol accesses LDAP directories. Here are some key concepts and terms:

=== modified file 'serverguide/C/vcs.xml'
--- serverguide/C/vcs.xml	2015-02-24 21:33:24 +0000
+++ serverguide/C/vcs.xml	2015-06-08 03:12:49 +0000
@@ -9,8 +9,15 @@
 ]>
 	<chapter id="version-control-system" status="review">
 		<title>Version Control System</title>
-          <para>
-Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing those changes the next day. But the usefulness of version control software extends far beyond the bounds of the software development world. Anywhere you can find people using computers to manage information that changes often, there is room for version control.</para>
+        <para>
+            Version control is the art of managing changes to information. It 
+            has long been a critical tool for programmers, who typically spend 
+            their time making small changes to software and then undoing those 
+            changes the next day. But the usefulness of version control software 
+            extends far beyond the bounds of the software development world. 
+            Anywhere you can find people using computers to manage information 
+            that changes often, there is room for version control.
+        </para>
       <sect1 id="bazaar" status="review">
         <title>Bazaar</title> 
           <para>
@@ -102,13 +109,20 @@
         </sect2>
         <sect2 id="git-usage" status="review">
             <title>Basic usage</title>
-            <para>The above is already sufficient to use git in a distributed and secure way, provided users have access to the machine assuming the server role via SSH.  On
-                the server machine, creating a new repository can be done with</para>
+            <para>
+                The above is already sufficient to use git in a distributed and 
+                secure way, provided users have access to the machine assuming 
+                the server role via SSH. On the server machine, creating a new 
+                repository can be done with:
+            </para>
 <screen>
 <command>git init --bare /path/to/repository</command>
 </screen>
 <note><para>This creates a bare repository, that cannot be used to edit files directly. If you would rather have a working copy of the contents of the repository on the server, ommit the <emphasis>--bare</emphasis> option.</para></note>
-            <para>Any client with ssh access to the machine can from then on clone the repository with</para>
+            <para>
+                Any client with SSH access to the machine can then clone the 
+                repository with:
+            </para>
 <screen>
 <command>git clone username@hostname:/path/to/repository</command>
 </screen>