1 |
nightmorph 11/03/02 09:25:49 |
2 |
|
3 |
Modified: hb-portage-branches.xml hb-portage-files.xml |
4 |
Log: |
5 |
change the deprecated package.keywords references to package.accept_keywords, bug 337159 |
6 |
|
7 |
Revision Changes Path |
8 |
1.17 xml/htdocs/doc/en/handbook/hb-portage-branches.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?rev=1.17&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?rev=1.17&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?r1=1.16&r2=1.17 |
13 |
|
14 |
Index: hb-portage-branches.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v |
17 |
retrieving revision 1.16 |
18 |
retrieving revision 1.17 |
19 |
diff -u -r1.16 -r1.17 |
20 |
--- hb-portage-branches.xml 14 May 2010 22:04:32 -0000 1.16 |
21 |
+++ hb-portage-branches.xml 2 Mar 2011 09:25:49 -0000 1.17 |
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-branches.xml,v 1.16 2010/05/14 22:04:32 nightmorph Exp $ --> |
27 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v 1.17 2011/03/02 09:25:49 nightmorph Exp $ --> |
28 |
|
29 |
<sections> |
30 |
|
31 |
@@ -15,8 +15,8 @@ |
32 |
individually. |
33 |
</abstract> |
34 |
|
35 |
-<version>1.8</version> |
36 |
-<date>2010-05-14</date> |
37 |
+<version>2</version> |
38 |
+<date>2011-03-02</date> |
39 |
|
40 |
<section> |
41 |
<title>Using One Branch</title> |
42 |
@@ -87,19 +87,19 @@ |
43 |
<section> |
44 |
<title>Mixing Stable with Testing</title> |
45 |
<subsection> |
46 |
-<title>The package.keywords location</title> |
47 |
+<title>The package.accept_keywords location</title> |
48 |
<body> |
49 |
|
50 |
<p> |
51 |
You can ask Portage to allow the testing branch for particular packages but use |
52 |
the stable branch for the rest of the system. To achieve this, add the package |
53 |
category and name you want to use the testing branch of in |
54 |
-<path>/etc/portage/package.keywords</path>. You can also create a directory |
55 |
-(with the same name) and list the package in the files under that directory. |
56 |
-For instance, to use the testing branch for <c>gnumeric</c>: |
57 |
+<path>/etc/portage/package.accept_keywords</path>. You can also create a |
58 |
+directory (with the same name) and list the package in the files under that |
59 |
+directory. For instance, to use the testing branch for <c>gnumeric</c>: |
60 |
</p> |
61 |
|
62 |
-<pre caption="/etc/portage/package.keywords setting for gnumeric"> |
63 |
+<pre caption="/etc/portage/package.accept_keywords setting for gnumeric"> |
64 |
app-office/gnumeric |
65 |
</pre> |
66 |
|
67 |
@@ -112,8 +112,8 @@ |
68 |
<p> |
69 |
If you want to use a specific software version from the testing branch but you |
70 |
don't want Portage to use the testing branch for subsequent versions, you can |
71 |
-add in the version in the <path>package.keywords</path> location. In this case |
72 |
-you <e>must</e> use the = operator. You can also enter a version range |
73 |
+add in the version in the <path>package.accept_keywords</path> location. In this |
74 |
+case you <e>must</e> use the = operator. You can also enter a version range |
75 |
using the <=, <, > or >= operators. |
76 |
</p> |
77 |
|
78 |
|
79 |
|
80 |
|
81 |
1.21 xml/htdocs/doc/en/handbook/hb-portage-files.xml |
82 |
|
83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?rev=1.21&view=markup |
84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?rev=1.21&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?r1=1.20&r2=1.21 |
86 |
|
87 |
Index: hb-portage-files.xml |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v |
90 |
retrieving revision 1.20 |
91 |
retrieving revision 1.21 |
92 |
diff -u -r1.20 -r1.21 |
93 |
--- hb-portage-files.xml 21 Jan 2009 06:44:51 -0000 1.20 |
94 |
+++ hb-portage-files.xml 2 Mar 2011 09:25:49 -0000 1.21 |
95 |
@@ -4,7 +4,7 @@ |
96 |
<!-- The content of this document is licensed under the CC-BY-SA license --> |
97 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
98 |
|
99 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v 1.20 2009/01/21 06:44:51 nightmorph Exp $ --> |
100 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v 1.21 2011/03/02 09:25:49 nightmorph Exp $ --> |
101 |
|
102 |
<sections> |
103 |
|
104 |
@@ -13,8 +13,8 @@ |
105 |
files and data. |
106 |
</abstract> |
107 |
|
108 |
-<version>1.13</version> |
109 |
-<date>2009-01-20</date> |
110 |
+<version>2</version> |
111 |
+<date>2011-03-02</date> |
112 |
|
113 |
<section> |
114 |
<title>Portage Files</title> |
115 |
@@ -101,8 +101,8 @@ |
116 |
emerging them |
117 |
</li> |
118 |
<li> |
119 |
- <path>package.keywords</path> which lists the packages you want to be able |
120 |
- to install even though the package hasn't been found suitable for your |
121 |
+ <path>package.accept_keywords</path> which lists the packages you want to be |
122 |
+ able to install even though the package hasn't been found suitable for your |
123 |
system or architecture (yet) |
124 |
</li> |
125 |
<li> |