Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: hb-portage-branches.xml hb-portage-files.xml
Date: Wed, 02 Mar 2011 09:26:02
Message-Id: 20110302092549.E3FF92005C@flycatcher.gentoo.org
nightmorph    11/03/02 09:25:49

  Modified:             hb-portage-branches.xml hb-portage-files.xml
  Log:
  change the deprecated package.keywords references to package.accept_keywords, bug 337159

Revision  Changes    Path
1.17                 xml/htdocs/doc/en/handbook/hb-portage-branches.xml

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

Index: hb-portage-branches.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hb-portage-branches.xml	14 May 2010 22:04:32 -0000	1.16
+++ hb-portage-branches.xml	2 Mar 2011 09:25:49 -0000	1.17
@@ -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-branches.xml,v 1.16 2010/05/14 22:04:32 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v 1.17 2011/03/02 09:25:49 nightmorph Exp $ -->
 
 <sections>
 
@@ -15,8 +15,8 @@
 individually.
 </abstract>
 
-<version>1.8</version>
-<date>2010-05-14</date>
+<version>2</version>
+<date>2011-03-02</date>
 
 <section>
 <title>Using One Branch</title>
@@ -87,19 +87,19 @@
 <section>
 <title>Mixing Stable with Testing</title>
 <subsection>
-<title>The package.keywords location</title>
+<title>The package.accept_keywords location</title>
 <body>
 
 <p>
 You can ask Portage to allow the testing branch for particular packages but use
 the stable branch for the rest of the system. To achieve this, add the package
 category and name you want to use the testing branch of in
-<path>/etc/portage/package.keywords</path>. You can also create a directory
-(with the same name) and list the package in the files under that directory.
-For instance, to use the testing branch for <c>gnumeric</c>:
+<path>/etc/portage/package.accept_keywords</path>. You can also create a
+directory (with the same name) and list the package in the files under that
+directory. For instance, to use the testing branch for <c>gnumeric</c>:
 </p>
 
-<pre caption="/etc/portage/package.keywords setting for gnumeric">
+<pre caption="/etc/portage/package.accept_keywords setting for gnumeric">
 app-office/gnumeric
 </pre>
 
@@ -112,8 +112,8 @@
 <p>
 If you want to use a specific software version from the testing branch but you
 don't want Portage to use the testing branch for subsequent versions, you can
-add in the version in the <path>package.keywords</path> location. In this case 
-you <e>must</e> use the = operator. You can also enter a version range 
+add in the version in the <path>package.accept_keywords</path> location. In this
+case you <e>must</e> use the = operator. You can also enter a version range
 using the &lt;=, &lt;, &gt; or &gt;= operators.
 </p>
 



1.21                 xml/htdocs/doc/en/handbook/hb-portage-files.xml

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

Index: hb-portage-files.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hb-portage-files.xml	21 Jan 2009 06:44:51 -0000	1.20
+++ hb-portage-files.xml	2 Mar 2011 09:25:49 -0000	1.21
@@ -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-files.xml,v 1.20 2009/01/21 06:44:51 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v 1.21 2011/03/02 09:25:49 nightmorph Exp $ -->
 
 <sections>
 
@@ -13,8 +13,8 @@
 files and data.
 </abstract>
 
-<version>1.13</version>
-<date>2009-01-20</date>
+<version>2</version>
+<date>2011-03-02</date>
 
 <section>
 <title>Portage Files</title>
@@ -101,8 +101,8 @@
     emerging them
   </li>
   <li>
-    <path>package.keywords</path> which lists the packages you want to be able
-    to install even though the package hasn't been found suitable for your 
+    <path>package.accept_keywords</path> which lists the packages you want to be
+    able to install even though the package hasn't been found suitable for your
     system or architecture (yet)
   </li>
   <li>