Gentoo Archives: gentoo-doc-cvs

From: Joshua Saddler <nightmorph@××××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: hb-portage-tools.xml
Date: Sun, 02 Mar 2008 08:09:41
Message-Id: E1JVjGL-0008QC-Lq@stork.gentoo.org
1 nightmorph 08/03/02 08:09:37
2
3 Modified: hb-portage-tools.xml
4 Log:
5 etc-update sucks. use dispatch-conf. it's friendlier for new gentoo users and power developers alike.
6
7 Revision Changes Path
8 1.10 xml/htdocs/doc/en/handbook/hb-portage-tools.xml
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.10&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.10&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?r1=1.9&r2=1.10
13
14 Index: hb-portage-tools.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v
17 retrieving revision 1.9
18 retrieving revision 1.10
19 diff -u -r1.9 -r1.10
20 --- hb-portage-tools.xml 28 Oct 2006 09:17:55 -0000 1.9
21 +++ hb-portage-tools.xml 2 Mar 2008 08:09:37 -0000 1.10
22 @@ -4,7 +4,7 @@
23 <!-- The content of this document is licensed under the CC-BY-SA license -->
24 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
25
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.9 2006/10/28 09:17:55 neysx Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.10 2008/03/02 08:09:37 nightmorph Exp $ -->
28
29 <sections>
30
31 @@ -13,23 +13,90 @@
32 better. Read on to discover how to use dispatch-conf and other tools.
33 </abstract>
34
35 -<version>1.4</version>
36 -<date>2005-07-28</date>
37 +<version>1.5</version>
38 +<date>2008-03-01</date>
39
40 <section>
41 +<title>dispatch-conf</title>
42 +<body>
43 +
44 +<p>
45 +<c>dispatch-conf</c> is a tool that aids in merging the
46 +<path>._cfg0000_&lt;name&gt;</path> files. <path>._cfg0000_&lt;name&gt;</path>
47 +files are generated by Portage when it wants to overwrite a file in a directory
48 +protected by the CONFIG_PROTECT variable.
49 +</p>
50 +
51 +<p>
52 +With <c>dispatch-conf</c>, you are able to merge updates to your configuration
53 +files while keeping track of all changes. <c>dispatch-conf</c> stores the
54 +differences between the configuration files as patches or by using the RCS
55 +revision system. This means that if you make a mistake when updating a config
56 +file, you can revert to the previous version of your config file at any time.
57 +</p>
58 +
59 +<p>
60 +When using <c>dispatch-conf</c>, you can ask to keep the configuration file
61 +as-is, use the new configuration file, edit the current one or merge the changes
62 +interactively. <c>dispatch-conf</c> also has some nice additional features:
63 +</p>
64 +
65 +<ul>
66 + <li>
67 + Automatically merge configuration file updates that only contain updates to
68 + comments
69 + </li>
70 + <li>
71 + Automatically merge configuration files which only differ in the amount of
72 + whitespace
73 + </li>
74 +</ul>
75 +
76 +<p>
77 +Make certain you edit <path>/etc/dispatch-conf.conf</path> first and create the
78 +directory referenced by the archive-dir variable.
79 +</p>
80 +
81 +<pre caption="Running dispatch-conf">
82 +# <i>dispatch-conf</i>
83 +</pre>
84 +
85 +<p>
86 +When running <c>dispatch-conf</c>, you'll be taken through each changed config
87 +file, one at a time. Press <c>u</c> to update (replace) the current config file
88 +with the new one and continue to the next file. Press <c>z</c> to zap (delete)
89 +the new config file and continue to the next file. Once all config files have
90 +been taken care of, <c>dispatch-conf</c> will exit. You can also press <c>q</c>
91 +to exit any time.
92 +</p>
93 +
94 +<p>
95 +For more information, check out the <c>dispatch-conf</c> man page. It tells you
96 +how to interactively merge current and new config files, edit new config files,
97 +examine differences between files, and more.
98 +</p>
99 +
100 +<pre caption="Reading the dispatch-conf man page">
101 +$ <i>man dispatch-conf</i>
102 +</pre>
103 +
104 +</body>
105 +</section>
106 +<section>
107 <title>etc-update</title>
108 <body>
109
110 <p>
111 -<c>etc-update</c> is a tool that aids in merging the
112 -<path>._cfg0000_&lt;name&gt;</path> files. It provides an interactive merging
113 -setup and can also auto-merge trivial changes.
114 -<path>._cfg0000_&lt;name&gt;</path> files are generated by Portage when it wants
115 -to overwrite a file in a directory protected by the CONFIG_PROTECT variable.
116 +You can also use <c>etc-update</c> to merge config files. It's not as simple to
117 +use as <c>dispatch-conf</c>, nor as featureful, but it does provide an
118 +interactive merging setup and can also auto-merge trivial changes.
119 </p>
120
121 <p>
122 -Running <c>etc-update</c> is pretty straight-forward:
123 +However, unlike <c>dispatch-conf</c>, <c>etc-update</c> does <e>not</e> preserve
124 +the old versions of your config files. Once you update the file, the old version
125 +is gone forever! So be very careful, as using <c>etc-update</c> is
126 +<e>significantly</e> less safe than using <c>dispatch-conf</c>.
127 </p>
128
129 <pre caption="Running etc-update">
130 @@ -109,50 +176,6 @@
131 </body>
132 </section>
133 <section>
134 -<title>dispatch-conf</title>
135 -<body>
136 -
137 -<p>
138 -Using <c>dispatch-conf</c> you are able to merge updates to your configuration
139 -files while keeping track of all changes. <c>dispatch-conf</c> stores the
140 -differences between the configuration files as patches or by using the RCS
141 -revision system.
142 -</p>
143 -
144 -<p>
145 -Like <c>etc-update</c>, you can ask to keep the configuration file as-is, use
146 -the new configuration file, edit the current one or merge the changes
147 -interactively. However, <c>dispatch-conf</c> also has some nice additional
148 -features:
149 -</p>
150 -
151 -<ul>
152 - <li>
153 - Automatically merge configuration file updates that only contain updates to
154 - comments
155 - </li>
156 - <li>
157 - Automatically merge configuration files which only differ in the amount of
158 - whitespace
159 - </li>
160 -</ul>
161 -
162 -<p>
163 -Make certain you edit <path>/etc/dispatch-conf.conf</path> first and create the
164 -directory referenced by the archive-dir variable.
165 -</p>
166 -
167 -<p>
168 -For more information, check out the <c>dispatch-conf</c> man page:
169 -</p>
170 -
171 -<pre caption="Reading the dispatch-conf man page">
172 -$ <i>man dispatch-conf</i>
173 -</pre>
174 -
175 -</body>
176 -</section>
177 -<section>
178 <title>quickpkg</title>
179 <body>
180
181
182
183
184 --
185 gentoo-doc-cvs@l.g.o mailing list