Merge lp:~petermatulis/serverguide/1410-other_useful_applications-refactor_resources 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-refactor_resources
Merge into: lp:serverguide/trunk
Diff against target: 131 lines (+63/-32)
1 file modified
serverguide/C/other-apps.xml (+63/-32)
To merge this branch: bzr merge lp:~petermatulis/serverguide/1410-other_useful_applications-refactor_resources
Reviewer Review Type Date Requested Status
Doug Smythies 2014-12-05 Approve on 2015-01-05
Review via email: mp+243749@code.launchpad.net
To post a comment you must log in.
Doug Smythies (dsmythies) wrote :

Peter, this looks O.K. to me (not sure I see the value added with this change though). I did not check formatting and such (i.e. I didn't build it in HTML and PDF, but I assume you did). So go ahead and merge it.

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:48 +0000
4@@ -146,7 +146,34 @@
5 <application>pam_motd</application>.
6 </para>
7
8+
9+ <sect2 id="pam_motd-resources" status="review">
10+ <title>Resources</title>
11+
12+ <itemizedlist>
13+
14+ <listitem>
15+ <para>
16+ See the <ulink url="http://manpages.ubuntu.com/manpages/&distro-short-codename;/en/man5/update-motd.5.html">update-motd man page</ulink> for
17+ more options available to <application>update-motd</application>.
18+ </para>
19+ </listitem>
20+
21+ <listitem>
22+ <para>
23+ The Debian Package of the Day
24+ <ulink url="http://debaday.debian.net/2007/10/04/weather-check-weather-conditions-and-forecasts-on-the-command-line/">weather</ulink>
25+ article has more details about using the <application>weather</application>utility.
26+ </para>
27+ </listitem>
28+
29+ </itemizedlist>
30+
31+ </sect2>
32+
33 </sect1>
34+
35+
36 <sect1 id="etckeeper" status="review">
37 <title>etckeeper</title>
38
39@@ -276,7 +303,38 @@
40 For more information on <application>bzr</application> see <xref linkend="bazaar"/>.
41 </para>
42
43+
44+
45+ <sect2 id="etckeeper-resources" status="review">
46+ <title>Resources</title>
47+
48+ <itemizedlist>
49+
50+ <listitem>
51+ <para>
52+ See the <ulink url="http://kitenet.net/~joey/code/etckeeper/">etckeeper</ulink> site for more details on using
53+ <application>etckeeper</application>.
54+ </para>
55+ </listitem>
56+
57+ <listitem>
58+ <para>
59+ The <ulink url="https://help.ubuntu.com/community/etckeeper">etckeeper Ubuntu Wiki</ulink> page.
60+ </para>
61+ </listitem>
62+
63+ <listitem>
64+ <para>
65+ For the latest news and information about <application>bzr</application> see the <ulink url="http://bazaar-vcs.org/">bzr</ulink> web site.
66+ </para>
67+ </listitem>
68+
69+ </itemizedlist>
70+
71+ </sect2>
72+
73 </sect1>
74+
75 <sect1 id="byobu" status="review">
76 <title>Byobu</title>
77
78@@ -340,42 +398,12 @@
79 <listitem><para><emphasis>n</emphasis> - Moves to the next match, either forward or backward</para></listitem>
80 </itemizedlist>
81
82- </sect1>
83- <sect1 id="other-app-references" status="review">
84- <title>References</title>
85+ <sect2 id="byobu-resources" status="review">
86+ <title>Resources</title>
87
88 <itemizedlist>
89 <listitem>
90 <para>
91- See the <ulink url="http://manpages.ubuntu.com/manpages/&distro-short-codename;/en/man5/update-motd.5.html">update-motd man page</ulink> for
92- more options available to <application>update-motd</application>.
93- </para>
94- </listitem>
95- <listitem>
96- <para>
97- The Debian Package of the Day
98- <ulink url="http://debaday.debian.net/2007/10/04/weather-check-weather-conditions-and-forecasts-on-the-command-line/">weather</ulink>
99- article has more details about using the <application>weather</application>utility.
100- </para>
101- </listitem>
102- <listitem>
103- <para>
104- See the <ulink url="http://kitenet.net/~joey/code/etckeeper/">etckeeper</ulink> site for more details on using
105- <application>etckeeper</application>.
106- </para>
107- </listitem>
108- <listitem>
109- <para>
110- The <ulink url="https://help.ubuntu.com/community/etckeeper">etckeeper Ubuntu Wiki</ulink> page.
111- </para>
112- </listitem>
113- <listitem>
114- <para>
115- For the latest news and information about <application>bzr</application> see the <ulink url="http://bazaar-vcs.org/">bzr</ulink> web site.
116- </para>
117- </listitem>
118- <listitem>
119- <para>
120 For more information on <application>screen</application> see the <ulink url="http://www.gnu.org/software/screen/">screen web site</ulink>.
121 </para>
122 </listitem>
123@@ -391,5 +419,8 @@
124 </para>
125 </listitem>
126 </itemizedlist>
127+ </sect2>
128+
129 </sect1>
130+
131 </chapter>

Subscribers

People subscribed via source and target branches