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

[Sven Vermeulen (swift)]

swift       13/08/01 19:12:51

  Modified:             hb-working-portage.xml
  Log:
  Fix bug #479386 - Update ACCEPT_LICENSE example, thanks to Ulrich Muller for the feedback and suggestions

Revision  Changes    Path
1.82                 xml/htdocs/doc/en/handbook/hb-working-portage.xml

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

Index: hb-working-portage.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- hb-working-portage.xml	15 Aug 2012 07:20:36 -0000	1.81
+++ hb-working-portage.xml	1 Aug 2013 19:12:51 -0000	1.82
@@ -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-portage.xml,v 1.81 2012/08/15 07:20:36 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.82 2013/08/01 19:12:51 swift Exp $ -->
 
 <sections>
 
@@ -13,8 +13,8 @@
 maintain the software on his system.
 </abstract>
 
-<version>7</version>
-<date>2012-08-15</date>
+<version>8</version>
+<date>2013-08-01</date>
 
 <section>
 <title>Welcome to Portage</title>
@@ -410,17 +410,18 @@
 
 <p>
 The variable that controls permitted licenses is <c>ACCEPT_LICENSE</c>, which
-can be set in <path>/etc/portage/make.conf</path>:
+can be set in <path>/etc/portage/make.conf</path>. In the next example, this
+default value is shown:
 </p>
 
-<pre caption="Default ACCEPT_LICENSE in /etc/portage/make.conf">
+<pre caption="Setting ACCEPT_LICENSE in /etc/portage/make.conf">
 ACCEPT_LICENSE="* -@EULA"
 </pre>
 
 <p>
 With this configuration, packages that require interaction during installation
-to approve their EULA <e>will not</e> be installed. Packages without an EULA
-<e>will</e> be installed.
+to approve their EULA <e>will not</e> be installable. Packages without an EULA
+<e>will</e> be installable.
 </p>
 
 <p>
@@ -454,28 +455,19 @@
 
 <p>
 License groups defined in <c>ACCEPT_LICENSE</c> are prefixed with an <b>@</b>
-sign. Here's an example of a system that globally permits the GPL-compatible
-license group, as well as a few other groups and individual licenses:
+sign. Here's an example of a system that globally permits the free software (and
+documentation) license group, as well as a few other individual licenses:
 </p>
 
 <pre caption="ACCEPT_LICENSE in /etc/portage/make.conf">
-ACCEPT_LICENSE="@GPL-COMPATIBLE @OSI-APPROVED @EULA atheros-hal BitstreamVera"
-</pre>
-
-<p>
-If you want only free software and documentation on your system, you might use
-the following setup:
-</p>
-
-<pre caption="Use only free licenses">
-ACCEPT_LICENSE="-* @FREE"
+ACCEPT_LICENSE="-* @FREE atheros-hal BitstreamVera"
 </pre>
 
 <p>
 In this case, "free" is mostly defined by the <uri
 link="http://www.gnu.org/philosophy/free-sw.html">FSF</uri> and <uri
 link="http://www.opensource.org/docs/osd">OSI</uri>. Any package whose license
-does not meet these requirements will not be installed on your system.
+does not meet these requirements will not be installable on your system.
 </p>
 
 </body>