[gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: hb-portage-configuration.xml hb-working-features.xml

[Sven Vermeulen (swift)]

swift       13/12/17 11:00:37

  Modified:             hb-portage-configuration.xml
                        hb-working-features.xml
  Log:
  Bug 489782 - SYNC is no longer used, use sync-type and sync-uri instead

Revision  Changes    Path
1.19                 xml/htdocs/doc/en/handbook/hb-portage-configuration.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?r1=1.18&r2=1.19

Index: hb-portage-configuration.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hb-portage-configuration.xml	24 Jul 2012 12:12:52 -0000	1.18
+++ hb-portage-configuration.xml	17 Dec 2013 11:00:37 -0000	1.19
@@ -4,7 +4,7 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v 1.18 2012/07/24 12:12:52 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v 1.19 2013/12/17 11:00:37 swift Exp $ -->
 
 <sections>
 
@@ -13,8 +13,8 @@
 configuration file or as environment variable.
 </abstract>
 
-<version>2</version>
-<date>2012-07-24</date>
+<version>3</version>
+<date>2013-12-17</date>
 
 <section>
 <title>Portage Configuration</title>
@@ -23,12 +23,14 @@
 
 <p>
 As noted previously, Portage is configurable through many variables which 
-you should define in <path>/etc/portage/make.conf</path>. Please refer to
-the <path>make.conf</path> man page for more and complete information:
+you should define in <path>/etc/portage/make.conf</path> or one of the subdirectories
+of <path>/etc/portage</path>. Please refer to the <path>make.conf</path> and
+<path>portage</path> man pages for more and complete information:
 </p>
 
-<pre caption="Reading the make.conf man page">
+<pre caption="Reading the man pages">
 $ <i>man make.conf</i>
+$ <i>man portage</i>
 </pre>
 
 </body>
@@ -164,18 +166,22 @@
 
 <p>
 A third setting involves the location of the rsync server which you use when you
-update your Portage tree:
+update your Portage tree. This is defined in the <path>/etc/portage/repos.conf</path>
+file (or a file inside that directory if it is defined as a directory):
 </p>
 
 <ul>
   <li>
-    SYNC defines a particular server which Portage uses to fetch the
+    sync-type defines the type of server and defaults to "rsync"
+  </li>
+  <li>
+    sync-uri defines a particular server which Portage uses to fetch the
     Portage tree from
   </li>
 </ul>
 
 <p>
-The GENTOO_MIRRORS and SYNC variables can be set automatically through the
+The GENTOO_MIRRORS, sync-type and sync-uri variables can be set automatically through the
 <c>mirrorselect</c> application. You need to <c>emerge mirrorselect</c> first
 before you can use it. For more information, see mirrorselect's online
 help:



1.45                 xml/htdocs/doc/en/handbook/hb-working-features.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?r1=1.44&r2=1.45

Index: hb-working-features.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hb-working-features.xml	17 Dec 2013 10:45:50 -0000	1.44
+++ hb-working-features.xml	17 Dec 2013 11:00:37 -0000	1.45
@@ -4,7 +4,7 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v 1.44 2013/12/17 10:45:50 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v 1.45 2013/12/17 11:00:37 swift Exp $ -->
 
 <sections>
 
@@ -13,7 +13,7 @@
 ccache and more.
 </abstract>
 
-<version>8</version>
+<version>9</version>
 <date>2013-12-17</date>
 
 <section>
@@ -371,10 +371,15 @@
 method.
 </p>
 
-<pre caption="Updating Portage for signed tree validation">
+<pre caption="Updating make.conf">
 FEATURES="webrsync-gpg"
 PORTAGE_GPG_DIR="/etc/portage/gpg"
-SYNC=""
+</pre>
+
+<pre caption="Updating repos.conf">
+<comment># Make sure sync-type and sync-uri are commented out</comment>
+# sync-type = rsync
+# sync-uri = ...
 </pre>
 
 <p>