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

Proposed by Peter Matulis on 2014-12-05
Status: Merged
Merge reported by: Peter Matulis
Merged at revision: not available
Proposed branch: lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu
Merge into: lp:serverguide/trunk
Diff against target: 105 lines (+25/-21)
1 file modified
serverguide/C/other-apps.xml (+25/-21)
To merge this branch: bzr merge lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu
Reviewer Review Type Date Requested Status
Peter Matulis Approve on 2015-02-05
Doug Smythies 2014-12-05 Needs Fixing on 2015-01-05
Review via email: mp+243748@code.launchpad.net
To post a comment you must log in.
Doug Smythies (dsmythies) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/other-apps.xml'
2--- serverguide/C/other-apps.xml 2013-07-10 15:53:33 +0000
3+++ serverguide/C/other-apps.xml 2014-12-05 01:25:06 +0000
4@@ -151,8 +151,8 @@
5 <title>etckeeper</title>
6
7 <para>
8- <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be easily stored in
9- Version Control System (VCS) repository. It hooks into <application>apt</application> to automatically commit changes to
10+ <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be stored in a
11+ Version Control System (VCS) repository. It integrates with <application>APT</application> and automatically commit changes to
12 <filename>/etc</filename> when packages are installed or upgraded. Placing <filename>/etc</filename> under version control
13 is considered an industry best practice, and the goal of <application>etckeeper</application> is to make this process as
14 painless as possible.
15@@ -168,11 +168,9 @@
16
17 <para>
18 The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple. The main option is which
19- VCS to use. By default <application>etckeeper</application> is configured to use
20- <application>bzr</application> for version control.
21- The repository is automatically initialized (and committed for the first
22- time) during package installation. It is possible to undo this by entering
23- the following command:
24+ VCS to use and by default <application>etckeeper</application> is configured to use <application>Bazaar</application>. The
25+ repository is automatically initialized (and committed for the first time) during package installation. It is possible to undo
26+ this by entering the following command:
27 </para>
28
29 <screen>
30@@ -180,11 +178,9 @@
31 </screen>
32
33 <para>
34- By default, etckeeper will commit uncommitted changes made to /etc daily.
35- This can be disabled using the AVOID_DAILY_AUTOCOMMITS configuration
36- option. It will also automatically commit changes before and after package
37- installation. For a more precise tracking of changes, it is recommended
38- to commit your changes manually, together with a commit message, using:
39+ By default, etckeeper will commit uncommitted changes made to /etc daily. This can be disabled using the AVOID_DAILY_AUTOCOMMITS
40+ configuration option. It will also automatically commit changes before and after package installation. For a more precise tracking
41+ of changes, it is recommended to commit your changes manually, together with a commit message, using:
42 </para>
43
44 <screen>
45@@ -192,7 +188,7 @@
46 </screen>
47
48 <para>
49- Using the VCS commands you can view log information about files in <filename>/etc</filename>:
50+ Using bzr's VCS commands you can view log information:
51 </para>
52
53 <screen>
54@@ -200,7 +196,7 @@
55 </screen>
56
57 <para>
58- To demonstrate the integration with the package management system, install <application>postfix</application>:
59+ To demonstrate the integration with the package management system (APT), install <application>postfix</application>:
60 </para>
61
62 <screen>
63@@ -269,7 +265,7 @@
64 </para>
65
66 <screen>
67-<command>sudo etckeeper commit "new host"</command>
68+<command>sudo etckeeper commit "added new host"</command>
69 </screen>
70
71 <para>
72@@ -277,19 +273,27 @@
73 </para>
74
75 </sect1>
76+
77 <sect1 id="byobu" status="review">
78 <title>Byobu</title>
79
80 <para>
81- One of the most useful applications for any system administrator is <application>screen</application>. It allows the execution
82- of multiple shells in one terminal. To make some of the advanced <application>screen</application> features more
83- user friendly, and provide some useful information about the system, the <application>byobu</application> package was
84- created.
85+ One of the most useful applications for any system administrator is an xterm multiplexor such as <application>screen</application> or
86+ <application>tmux</application>. It allows for the execution of multiple shells in one terminal. To make some of the advanced multiplexor
87+ features more user-friendly and provide some useful information about the system, the <application>byobu</application> package was created.
88+ It acts as a wrapper to these programs. By default Byobu uses tmux (if installed) but this can be changed by the user.
89 </para>
90
91 <para>
92- When executing <application>byobu</application> pressing the <emphasis>F9</emphasis> key will bring up the
93- <application>Configuration</application> menu. This menu will allow you to:
94+ Invoke it simply with:
95+ </para>
96+
97+<screen>
98+<command>byobu</command>
99+</screen>
100+
101+ <para>
102+ Now bring up the configuration menu. By default this is done by pressing the <emphasis>F9</emphasis> key. This will allow you to:
103 </para>
104
105 <itemizedlist>

Subscribers

People subscribed via source and target branches