| 1 |
jkt 05/07/28 20:56:55 |
| 2 |
|
| 3 |
Modified: xml/htdocs/doc/en/handbook hb-portage-tools.xml |
| 4 |
Log: |
| 5 |
#100632, misc fixes to improve corectness of included instructions |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.7 +8 -8 xml/htdocs/doc/en/handbook/hb-portage-tools.xml |
| 9 |
|
| 10 |
file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=gentoo |
| 11 |
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.7&content-type=text/plain&cvsroot=gentoo |
| 12 |
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-portage-tools.xml.diff?r1=1.6&r2=1.7&cvsroot=gentoo |
| 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.6 |
| 18 |
retrieving revision 1.7 |
| 19 |
diff -u -r1.6 -r1.7 |
| 20 |
--- hb-portage-tools.xml 20 Nov 2004 22:23:30 -0000 1.6 |
| 21 |
+++ hb-portage-tools.xml 28 Jul 2005 20:56:55 -0000 1.7 |
| 22 |
@@ -4,12 +4,12 @@ |
| 23 |
<!-- The content of this document is licensed under the CC-BY-SA license --> |
| 24 |
<!-- See http://creativecommons.org/licenses/by-sa/2.0 --> |
| 25 |
|
| 26 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.6 2004/11/20 22:23:30 neysx Exp $ --> |
| 27 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.7 2005/07/28 20:56:55 jkt Exp $ --> |
| 28 |
|
| 29 |
<sections> |
| 30 |
|
| 31 |
-<version>1.3</version> |
| 32 |
-<date>2004-10-24</date> |
| 33 |
+<version>1.4</version> |
| 34 |
+<date>2005-07-28</date> |
| 35 |
|
| 36 |
<section> |
| 37 |
<title>etc-update</title> |
| 38 |
@@ -20,7 +20,7 @@ |
| 39 |
<path>._cfg0000_<name></path> files. It provides an interactive merging |
| 40 |
setup and can also auto-merge trivial changes. |
| 41 |
<path>._cfg0000_<name></path> files are generated by Portage when it wants |
| 42 |
-to store a file in a directory protected by the CONFIG_PROTECT variable. |
| 43 |
+to overwrite a file in a directory protected by the CONFIG_PROTECT variable. |
| 44 |
</p> |
| 45 |
|
| 46 |
<p> |
| 47 |
@@ -44,7 +44,7 @@ |
| 48 |
</pre> |
| 49 |
|
| 50 |
<p> |
| 51 |
-If you enter <c>-1</c>, <c>etc-update</c> will exit without performing any |
| 52 |
+If you enter <c>-1</c>, <c>etc-update</c> will exit and discontinue any further |
| 53 |
changes. If you enter <c>-3</c> or <c>-5</c>, <e>all</e> listed configuration |
| 54 |
files will be overwritten with the newer versions. It is therefore very |
| 55 |
important to first select the configuration files that should not be |
| 56 |
@@ -167,9 +167,9 @@ |
| 57 |
</pre> |
| 58 |
|
| 59 |
<p> |
| 60 |
-The prebuilt packages will be stored in <path>/usr/portage/packages/All</path>. |
| 61 |
-Symbolic links pointing to these packages are placed in |
| 62 |
-<path>/usr/portage/packages/<category></path>. |
| 63 |
+The prebuilt packages will be stored in <path>$PKGDIR/All</path> |
| 64 |
+(<path>/usr/portage/packages/All</path> by default). Symbolic links pointing to |
| 65 |
+these packages are placed in <path>$PKGDIR/<category></path>. |
| 66 |
</p> |
| 67 |
|
| 68 |
</body> |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
-- |
| 73 |
gentoo-doc-cvs@g.o mailing list |
Archives