Merge lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu into lp:serverguide/trunk

[Peter Matulis]

[Doug Smythies (dsmythies)]

Line 10: "be stored"
should be "to be stored"

Line 11: "and automatically commit changes"
should be "and automatically commits changes"

Otherwise O.K. so once fixed, go ahead and merge it.

review: Needs Fixing

[Peter Matulis (petermatulis)]

Done. I didn't update my MP but made the correction while committing. I'll try to avoid doing that in the future, it's confusing.

review: Approve

=== modified file 'serverguide/C/other-apps.xml'
--- serverguide/C/other-apps.xml	2013-07-10 15:53:33 +0000
+++ serverguide/C/other-apps.xml	2014-12-05 01:25:06 +0000
@@ -151,8 +151,8 @@
     <title>etckeeper</title>
 
     <para>
-    <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be easily stored in 
-    Version Control System (VCS) repository. It hooks into <application>apt</application> to automatically commit changes to
+    <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be stored in a
+    Version Control System (VCS) repository. It integrates with <application>APT</application> and automatically commit changes to
     <filename>/etc</filename> when packages are installed or upgraded.  Placing <filename>/etc</filename> under version control 
     is considered an industry best practice, and the goal of <application>etckeeper</application> is to make this process as 
     painless as possible.  
@@ -168,11 +168,9 @@
 
     <para>
     The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple.  The main option is which
-    VCS to use.  By default <application>etckeeper</application> is configured to use 
-    <application>bzr</application> for version control.
-    The repository is automatically initialized (and committed for the first
-    time) during package installation. It is possible to undo this by entering
-    the following command:
+    VCS to use and by default <application>etckeeper</application> is configured to use <application>Bazaar</application>.  The
+    repository is automatically initialized (and committed for the first time) during package installation. It is possible to undo
+    this by entering the following command:
     </para>
 
 <screen>
@@ -180,11 +178,9 @@
 </screen>
 
     <para>
-    By default, etckeeper will commit uncommitted changes made to /etc daily.
-    This can be disabled using the AVOID_DAILY_AUTOCOMMITS configuration
-    option. It will also automatically commit changes before and after package
-    installation. For a more precise tracking of changes, it is recommended
-    to commit your changes manually, together with a commit message, using:
+	    By default, etckeeper will commit uncommitted changes made to /etc daily.  This can be disabled using the AVOID_DAILY_AUTOCOMMITS
+	    configuration option. It will also automatically commit changes before and after package installation. For a more precise tracking
+	    of changes, it is recommended to commit your changes manually, together with a commit message, using:
     </para>
 
 <screen>
@@ -192,7 +188,7 @@
 </screen>
 
     <para>
-    Using the VCS commands you can view log information about files in <filename>/etc</filename>:
+    Using bzr's VCS commands you can view log information:
     </para>
 
 <screen>
@@ -200,7 +196,7 @@
 </screen>
 
     <para>
-    To demonstrate the integration with the package management system, install <application>postfix</application>:
+    To demonstrate the integration with the package management system (APT), install <application>postfix</application>:
     </para>
 
 <screen>
@@ -269,7 +265,7 @@
     </para>
 
 <screen>
-<command>sudo etckeeper commit "new host"</command>
+<command>sudo etckeeper commit "added new host"</command>
 </screen>
 
     <para>
@@ -277,19 +273,27 @@
     </para>
    
   </sect1>
+
   <sect1 id="byobu" status="review">
     <title>Byobu</title>
 
     <para>
-    One of the most useful applications for any system administrator is <application>screen</application>.  It allows the execution
-    of multiple shells in one terminal. To make some of the advanced <application>screen</application> features more 
-    user friendly, and provide some useful information about the system, the <application>byobu</application> package was 
-    created.  
+	    One of the most useful applications for any system administrator is an xterm multiplexor such as <application>screen</application> or
+	    <application>tmux</application>.  It allows for the execution of multiple shells in one terminal. To make some of the advanced multiplexor
+	    features more user-friendly and provide some useful information about the system, the <application>byobu</application> package was created.
+	    It acts as a wrapper to these programs.  By default Byobu uses tmux (if installed) but this can be changed by the user.  
     </para>
 
     <para>
-    When executing <application>byobu</application> pressing the <emphasis>F9</emphasis> key will bring up the  
-    <application>Configuration</application> menu.  This menu will allow you to:
+	    Invoke it simply with:
+    </para>
+	    
+<screen>
+<command>byobu</command>
+</screen>
+	    
+    <para>
+	Now bring up the configuration menu.  By default this is done by pressing the <emphasis>F9</emphasis> key.  This will allow you to:
     </para>
 
     <itemizedlist>