[deployment-guide: 161/185] Applied Deon's changes to the chapter.

Sun May 15 21:24:49 UTC 2011

commit 119abeee41589c8a3d5c7670f16d5613006e8c8e
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Apr 12 00:33:34 2011 +0200

    Applied Deon's changes to the chapter.

 en-US/Book_Info.xml                              |    2 +-
 en-US/Product_Subscriptions_and_Entitlements.xml |   22 ++++++++++++++++------
 en-US/images/ents-nag-warning.png                |  Bin 32616 -> 32176 bytes
 en-US/images/ents-nag.png                        |  Bin 12858 -> 14601 bytes
 4 files changed, 17 insertions(+), 7 deletions(-)
---

diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index b152002..f73202d 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -7,7 +7,7 @@
   <productname>Red Hat Enterprise Linux</productname>
   <productnumber>6</productnumber>
   <edition>1</edition>
-  <pubsnumber>112</pubsnumber>
+  <pubsnumber>113</pubsnumber>
   <abstract>
     <para>
       The <citetitle pubwork="book">Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;. It is oriented towards system administrators with a basic understanding of the system.
diff --git a/en-US/Product_Subscriptions_and_Entitlements.xml b/en-US/Product_Subscriptions_and_Entitlements.xml
index 585ba71..46a083d 100644
--- a/en-US/Product_Subscriptions_and_Entitlements.xml
+++ b/en-US/Product_Subscriptions_and_Entitlements.xml
@@ -97,7 +97,10 @@
 			<important>
 				<title>Important</title>
 				<para>
-					Most &OSORG; products are licensed under a GNU Public License (GPL), which allows free use of the software or code; this is different than the &OSORG; license agreement. The &OSORG; subscription requires that, as long as there is any active subscription for a product, then every system which uses the &OSORG; product must have an active subscription assigned to it. Otherwise, the subscription is violated. See <ulink url="http://www.redhat.com/subscriptions/">http://www.redhat.com/subscriptions/</ulink> and <ulink url="http://www.redhat.com/rhel/renew/faqs/#6">http://www.redhat.com/rhel/renew/faqs/#6</ulink> for more information on &OSORG;'s subscription model and terms.
+					Most &OSORG; products are licensed under a GNU Public License (GPL), which allows free use of the software or code; this a different license than the &OSORG; license agreement. A &OSORG; license provides access to &OSORG; services, like the Customer Portal and Content Delivery Network. 
+				</para>
+				<para>
+					The &OSORG; subscription requires that, as long as there is any active subscription for a product, then every system which uses the &OSORG; product must have an active subscription assigned to it. Otherwise, the subscription is violated. See <ulink url="http://www.redhat.com/subscriptions/">http://www.redhat.com/subscriptions/</ulink> and <ulink url="http://www.redhat.com/rhel/renew/faqs/#6">http://www.redhat.com/rhel/renew/faqs/#6</ulink> for more information on &OSORG;'s subscription model and terms.
 				</para>
 
 			</important>
@@ -137,6 +140,13 @@
 
 			</figure>
 			<para>
+				The repository where the product software is located is organized according to the <emphasis>product</emphasis>. Each product group within 
+				the repository may contain the primary software packages and then any required dependencies or associated packages. Altogether, the product and its 
+				associated packages are called a <emphasis>content set</emphasis>. (A content set for a product even includes other versions of the product.) 
+				When a subscription grants access to a product, it includes access to all of the 
+				associated packages in that content set.
+			</para>
+			<para>
 				A single subscription can have multiple products, and each system can have multiple different subscriptions, depending on how many entitlement certificates are loaded on the machine.
 			</para>
 	<indexterm>
@@ -240,7 +250,7 @@
 
 			</figure>
 			<para>
-				The entitlements server handles the system registration (verifying that the system is allowed to access the content). It also supplies the system with information on what products are available and handles a central list of entitlements and remaining quantities for the entire organization.
+				The subscription service handles the system registration (verifying that the system is allowed to access the content). It also supplies the system with information on what products are available and handles a central list of entitlements and remaining quantities for the entire organization.
 			</para>
 			<para>
 				The content delivery network is responsible for delivering the content to the system when requested. The content server is configured in the &OSORG; Subscription Manager configuration and then tied into the system's <command>yum</command> service through the &OSORG; Subscription Manager yum plug-in.
@@ -917,7 +927,7 @@
 			<note>
 				<title>Tip</title>
 				<para>
-					The <command>register</command> command has an option, <option>--autosubscribe</option>, which allows the system to be registered to the entitlements service and immediately subscribed to the subscription which best matches its architecture in a single step.
+					The <command>register</command> command has an option, <option>--autosubscribe</option>, which allows the system to be registered to the subscription service and immediately subscribed to the subscription which best matches its architecture in a single step.
 				</para>
 				<para>
 					Other <command>register</command> options are listed in <xref linkend="tab.register-options" />.
@@ -2422,7 +2432,7 @@ certFrequency = 240</programlisting>
 									hostname
 								</entry>
 								<entry>
-									Gives the IP address or fully-qualified domain name of the entitlements server.
+									Gives the IP address or fully-qualified domain name of the subscription service.
 								</entry>
 								<entry>
 									subscription.rhn.redhat.com
@@ -2434,7 +2444,7 @@ certFrequency = 240</programlisting>
 									prefix
 								</entry>
 								<entry>
-									Gives the directory, in the URL, to use to connect to the entitlements service.
+									Gives the directory, in the URL, to use to connect to the subscription service.
 								</entry>
 								<entry>
 									/subscription
@@ -2973,7 +2983,7 @@ proxy_password =</programlisting>
 				</listitem>
 				<listitem>
 					<para>
-						Change the settings in the <command>[server]</command> section that relate to the entitlements server connection. All parameters are described in <xref linkend="tab.rhsm.conf-parameters" />. There are three parameters directly related to the connection:
+						Change the settings in the <command>[server]</command> section that relate to the subscription service connection. All parameters are described in <xref linkend="tab.rhsm.conf-parameters" />. There are three parameters directly related to the connection:
 					</para>
 					<itemizedlist>
 						<listitem>
diff --git a/en-US/images/ents-nag-warning.png b/en-US/images/ents-nag-warning.png
index da75442..ea0f98d 100644
Binary files a/en-US/images/ents-nag-warning.png and b/en-US/images/ents-nag-warning.png differ
diff --git a/en-US/images/ents-nag.png b/en-US/images/ents-nag.png
index 216da00..a50e888 100644
Binary files a/en-US/images/ents-nag.png and b/en-US/images/ents-nag.png differ
