Merge lp:~ttx/ubuntu-docs/serverguide-mods into lp:ubuntu-docs/karmic

Proposed by Thierry Carrez
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ttx/ubuntu-docs/serverguide-mods
Merge into: lp:ubuntu-docs/karmic
Diff against target: None lines
To merge this branch: bzr merge lp:~ttx/ubuntu-docs/serverguide-mods
Reviewer Review Type Date Requested Status
Adam Sommer Pending
Ubuntu Documentation Committers Pending
Review via email: mp+12050@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Fix for bug 432377

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 2009-02-08 18:36:57 +0000
3+++ serverguide/C/other-apps.xml 2009-09-18 11:49:45 +0000
4@@ -191,26 +191,28 @@
5 </screen>
6
7 <para>
8- The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple. The main options being which
9- VCS and which package management system to use. By default <application>etckeeper</application> is configured to use
10- <application>bzr</application> for version control, <application>apt</application> for high level package mangement, and
11- <application>dpkg</application> for low level package management.
12+ The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple. The main option is which
13+ VCS to use. By default <application>etckeeper</application> is configured to use
14+ <application>bzr</application> for version control.
15+ The repository is automatically initialized (and committed for the first
16+ time) during package installation. It is possible to undo this by entering
17+ the following command:
18 </para>
19
20+<screen>
21+<command>sudo etckeeper uninit</command>
22+</screen>
23+
24 <para>
25- With the package installed, it is time to initialize the repository. In a terminal enter:
26+ By default, etckeeper will commit uncommitted changes made to /etc daily.
27+ This can be disabled using the AVOID_DAILY_AUTOCOMMITS configuration
28+ option. It will also automatically commit changes before and after package
29+ installation. For a more precise tracking of changes, it is recommended
30+ to commit your changes manually, together with a commit message, using:
31 </para>
32
33 <screen>
34-<command>sudo etckeeper init</command>
35-</screen>
36-
37- <para>
38- Next, commit the files to the repository:
39- </para>
40-
41-<screen>
42-<command>sudo etckeeper commit "initial import"</command>
43+<command>sudo etckeeper commit "..Reason for configuration change.."</command>
44 </screen>
45
46 <para>
47@@ -218,7 +220,7 @@
48 </para>
49
50 <screen>
51-<command>sudo bzr log /etc/passswd</command>
52+<command>sudo bzr log /etc/passwd</command>
53 </screen>
54
55 <para>

Subscribers

People subscribed via source and target branches