[deployment-guide: 156/185] Applied Deon's latest changes.

Jaromir Hradilek jhradile at fedoraproject.org
Sun May 15 21:24:23 UTC 2011


commit e6d4bd4cdc2dd51c3a0ccbca3bef71691406f1b2
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Mon Apr 4 11:47:33 2011 +0200

    Applied Deon's latest changes.

 en-US/Book_Info.xml                              |    2 +-
 en-US/Product_Subscriptions_and_Entitlements.xml |  233 +++++++++++-----------
 en-US/Yum.xml                                    |   48 +++---
 en-US/images/entitlements-subscriptions.png      |  Bin 148804 -> 149240 bytes
 en-US/images/ents-compliant.png                  |  Bin 133580 -> 134185 bytes
 en-US/images/rhsm-compliance.png                 |  Bin 55742 -> 58894 bytes
 en-US/images/rhsm-compliance2.png                |  Bin 30596 -> 30410 bytes
 en-US/images/rhsm-subscribe-prod.png             |  Bin 104910 -> 103022 bytes
 en-US/images/rhsm-subscribed.png                 |  Bin 73488 -> 74608 bytes
 en-US/images/rhsm-uploadcerts.png                |  Bin 45464 -> 48158 bytes
 10 files changed, 143 insertions(+), 140 deletions(-)
---
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 9f819fa..f51eb1b 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>108</pubsnumber>
+  <pubsnumber>110</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 b38dc54..585ba71 100644
--- a/en-US/Product_Subscriptions_and_Entitlements.xml
+++ b/en-US/Product_Subscriptions_and_Entitlements.xml
@@ -14,7 +14,7 @@
 		<secondary>subscription management</secondary>
 	</indexterm>
 	<para>
-		Effective asset management requires a mechanism to handle the software inventory &mdash; both the type of products and the number of systems that the software is installed on. The entitlement service provides that mechanism and gives transparency into both global allocations of subscriptions for an entire organization and the specific subscriptions assigned to a single system.
+		Effective asset management requires a mechanism to handle the software inventory &mdash; both the type of products and the number of systems that the software is installed on. The subscription service provides that mechanism and gives transparency into both global allocations of subscriptions for an entire organization and the specific subscriptions assigned to a single system.
 	</para>
 	<para>
 		&OSORG; Subscription Manager works with <command>yum</command> to unite content delivery with subscription management. The Subscription Manager handles only the subscription-system associations. <command>yum</command> or other package management tools handle the actual content delivery. <xref linkend="ch-yum" /> describes how to use <command>yum</command>.
@@ -38,13 +38,13 @@
 		<section id="the-purpose-of-subscriptions">
 			<title>The Purpose of Subscription Management</title>
 			<para>
-				New government and industry regulations are setting new mandates for businesses to track how their infrastructure assets are used. These changes include legislation like Sarbanes-Oxley in the United States, standards like Payment Card Industry Data Security Standard (PCI-DSS), or accreditation like SAS-70. Software compliance is increasingly important to meet accounting and governmental standards.
+				New government and industry regulations are setting new mandates for businesses to track how their infrastructure assets are used. These changes include legislation like Sarbanes-Oxley in the United States, standards like Payment Card Industry Data Security Standard (PCI-DSS), or accreditation like SAS-70. Software inventory maintenance is increasingly important to meet accounting and governmental standards.
 			</para>
 			<para>
 				That means that there is increasing pressure on IT administrators to have an accurate, current accounting of the software used on their systems. Generally, this is called <emphasis>software license management</emphasis>; with &OSORG;'s subscription model, this is <emphasis>subscription management</emphasis>.
 			</para>
 			<figure id="fig.ents-compliance">
-				<title>Enabling Compliance</title>
+				<title>Managing Subscriptions for Software Inventory</title>
 				<mediaobject>
 					<imageobject>
 						<imagedata fileref="images/ents-compliant.png" />
@@ -55,11 +55,11 @@
 			</figure>
 	<indexterm>
 		<primary>subscriptions</primary>
-		<secondary>and software compliance</secondary>
+		<secondary>and software inventory maintenance</secondary>
 	</indexterm>
 	<indexterm>
 		<primary>entitlements</primary>
-		<secondary>and software compliance</secondary>
+		<secondary>and software inventory maintenance</secondary>
 	</indexterm>
 			<para>
 				Effective subscription management helps organizations achieve four primary goals:
@@ -67,7 +67,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						<emphasis>Maintain compliance</emphasis>. One of the key responsibilities of administrators is software compliance. Subscription management helps track both subscription assignments and contract expirations, which helps administrators keep systems compliant.
+						<emphasis>Maintain regulatory compliance</emphasis>. One of the key responsibilities of administrators is software compliance in conformance with legal or industry requirements. Subscription management helps track both subscription assignments and contract expirations, which helps administrators manage both systems and software inventories in accordance to their regulatory requirements.
 					</para>
 
 				</listitem>
@@ -79,7 +79,7 @@
 				</listitem>
 				<listitem>
 					<para>
-						<emphasis>Get better performance by doing better at assigning subscriptions</emphasis>. The entitlement service maintains dual inventories of available product subscriptions and registered server systems, with clear associations between subscriptions and systems. This makes it easier for IT administrators to assign relevant subscriptions to systems, because they have a view of what is in the inventory and what the system is currently subscribed to.
+						<emphasis>Get better performance by doing better at assigning subscriptions</emphasis>. The subscription service maintains dual inventories of available product subscriptions and registered server systems, with clear associations between subscriptions and systems. This makes it easier for IT administrators to assign relevant subscriptions to systems, because they have a view of what is in the inventory and what the system is currently subscribed to.
 					</para>
 
 				</listitem>
@@ -92,12 +92,12 @@
 
 			</itemizedlist>
 			<para>
-				With &OSORG;'s commitment to free and open software, subscription management is focused on delivering tools that help IT administrators monitor compliance for their own benefit. Subscription management does not enforce compliance or restrict access to products.
+				With &OSORG;'s commitment to free and open software, subscription management is focused on delivering tools that help IT administrators monitor their software/systems inventory for their own benefit. Subscription management <emphasis>does not</emphasis> enforce or restrict access to products.
 			</para>
 			<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 and the system is non-compliant. 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 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.
 				</para>
 
 			</important>
@@ -121,7 +121,7 @@
 				Subscriptions are managed though the Certificate-Based &OSORG; Network service, which ties into the Entitlements and Content Delivery Network (CDN).
 			</para>
 			<para>
-				The entitlement service maintains a complete list of subscriptions for an organization, identified by a unique ID (called a <emphasis>pool ID</emphasis>). A system is <emphasis>registered</emphasis>, or added, to the entitlement service to allow it to manage the subscriptions for that system. Like the subscription, the system is also added to the entitlement service inventory and is assigned a unique ID within the service. The subscriptions and system entries, together, comprise the <emphasis>inventory</emphasis>. 
+				The subscription service maintains a complete list of subscriptions for an organization, identified by a unique ID (called a <emphasis>pool ID</emphasis>). A system is <emphasis>registered</emphasis>, or added, to the subscription service to allow it to manage the subscriptions for that system. Like the subscription, the system is also added to the subscription service inventory and is assigned a unique ID within the service. The subscriptions and system entries, together, comprise the <emphasis>inventory</emphasis>. 
 			</para>
 			<para>
 				A system allocates one of the quantities of a product in a subscription to itself. When a subscription is consumed, it is an <emphasis>entitlement</emphasis>. (An entitlement is roughly analogous to a user license, in that it grants all of the rights to that product to that system. Unlike a user license, an entitlement doesn't grant the right to <emphasis>use</emphasis> the software; with the subscription model, an entitlement grants the ability to download the packages and receive updates.) Because the available quantity in a subscription lowers once a system subscribe to it, the system <emphasis>consumes</emphasis> the subscription.
@@ -154,7 +154,7 @@
 				The subscription tools can display even incompatible entitlements. Alternatively, the architecture definition for the system can be overridden by defining custom system facts for the subscription tools to use.
 			</para>
 			<para>
-				It is important to distinguish between subscribing to a product and installing a product. A subscription is essentially a statement of whatever products an organization has purchased. The act of subscribing to a subscription means that a system is allowed to install the product and be compliant, but subscribing doesn't actually perform any installation or updates. In the reverse, a product can also be installed apart from any entitlements for the system; the system is just non-compliant. Certificate-Based &OSORG; Network and the Content Delivery Network harmonize with content delivery and installation by using <command>yum</command> plug-ins that come with the Subscription Manager tools.
+				It's important to distinguish between subscribing to a product and installing a product. A subscription is essentially a statement of whatever products an organization has purchased. The act of subscribing to a subscription means that a system is allowed to install the product with a valid certificate, but subscribing doesn't actually perform any installation or updates. In the reverse, a product can also be installed apart from any entitlements for the system; the system is just does not have a valid product certificate. Certificate-Based &OSORG; Network and the Content Delivery Network harmonize with content delivery and installation by using <command>yum</command> plug-ins that come with the Subscription Manager tools.
 			</para>
 
 		</section>
@@ -170,12 +170,12 @@
 		<secondary>client tools</secondary>
 	</indexterm>
 			<para>
-				Subscriptions are managed through GUI and CLI tools called <emphasis>&OSORG; Subscription Manager</emphasis>. The Subscription Manager tracks and displays what entitlements are available to the local system and what entitlements have been consumed by the local system. The Subscription Manager works as a conduit back to the entitlement service to synchronize changes like available product quantities or subscription expiration and renewals.
+				Subscriptions are managed through GUI and CLI tools called <emphasis>&OSORG; Subscription Manager</emphasis>. The Subscription Manager tracks and displays what entitlements are available to the local system and what entitlements have been consumed by the local system. The Subscription Manager works as a conduit back to the subscription service to synchronize changes like available product quantities or subscription expiration and renewals.
 			</para>
 			<note>
 				<title>Note</title>
 				<para>
-					The &OSORG; Subscription Manager tools are always run as <command>root</command> because of the nature of the changes to the system. However, &OSORG; Subscription Manager connects to the entitlement service as a user account for the Customer Service Portal.
+					The &OSORG; Subscription Manager tools are always run as <command>root</command> because of the nature of the changes to the system. However, &OSORG; Subscription Manager connects to the subscription service as a user account for the Customer Service Portal.
 				</para>
 
 			</note>
@@ -211,7 +211,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						The entitlement service
+						The subscription service
 					</para>
 
 				</listitem>
@@ -230,7 +230,7 @@
 
 			</itemizedlist>
 			<figure id="fig.ents-content">
-				<title>Relationship Among Systems, the Entitlement Service, and Content Delivery Network</title>
+				<title>Relationship Among Systems, the Subscription Service, and Content Delivery Network</title>
 				<mediaobject>
 					<imageobject>
 						<imagedata fileref="images/entitlements-subscriptions.png" />
@@ -246,12 +246,12 @@
 				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.
 			</para>
 			<para>
-				Both the entitlement server and the content server used by a system's &OSORG; Subscription Manager tools can be customized. The default settings use the public entitlement service and Content Delivery Network, but either one can be changed to use organization-specific services or content mirrors.
+				Both the entitlement server and the content server used by a system's &OSORG; Subscription Manager tools can be customized. The default settings use the public subscription service and Content Delivery Network, but either one can be changed to use organization-specific services<!-- or content mirrors-->.
 			</para>
 			<note>
 				<title>Note</title>
 				<para>
-					Systems have the option of using the older &OSORG; Network and Satellite 5.x systems to deliver content. These content delivery mechanisms bypass the entitlement service in Certificate-Based &OSORG; Network, so there is no entitlement management.
+					Systems have the option of using the older &OSORG; Network and Satellite 5.x systems to deliver content. These content delivery mechanisms bypass the subscription service in Certificate-Based &OSORG; Network, so there is no entitlement management.
 				</para>
 
 			</note>
@@ -308,7 +308,7 @@
 			<para>
 				Many consumers will be physical machines which require subscriptions available through an organization's account. There are different 
 				types of consumers and different ways of handling consumers. Two scenarios are common: virtual guests and server domains. Both types of 
-				consumers are handled transparently in the entitlement service and in the &OSORG; Subscription Manager tools. 
+				consumers are handled transparently in the subscription service and in the &OSORG; Subscription Manager tools. 
 				There is no additional configuration or difference in management for different types of consumers. 
 				Information about virtual guests and domain consumers is supplied to help administrators plan and understand their IT environment more fully.
 			</para>
@@ -328,11 +328,11 @@
 				</para>
 				<note><title>Note</title>
 					<para>
-						The distinction of being a physical machine versus virtual machine matters only in the priority of how entitlements are consumed. Virtual machines are recorded in the entitlement service inventory as a regular <systemitem>system</systemitem> type of consumer.
+						The distinction of being a physical machine versus virtual machine matters only in the priority of how entitlements are consumed. Virtual machines are recorded in the subscription service inventory as a regular <systemitem>system</systemitem> type of consumer.
 					</para>
 				</note>
 				<para>
-					Virtual guests are registered to the entitlement service inventory as regular systems and subscribe to entitlements just like any other consumer.
+					Virtual guests are registered to the subscription service inventory as regular systems and subscribe to entitlements just like any other consumer.
 				</para>
 				<para>
 					Virtual entitlements can only be used by virtual machines. Physical entitlements can be used by both physical and virtual machines. When ascertaining what subscriptions are available for autosubscription, preference is given first to virtual entitlements (which are more restrictive in the type of consumer which can use them), and then to physical entitlements.
@@ -364,7 +364,7 @@
 					</listitem>
 				</itemizedlist>
 				<para>
-					For any of these virtualization services, the Subscription Manager checks to see if the system is a guest. If it is, then virtual entitlements are listed with the available subscriptions. If no more virtual entitlements are available, then the entitlement service will apply physical entitlements.
+					For any of these virtualization services, the Subscription Manager checks to see if the system is a guest. If it is, then virtual entitlements are listed with the available subscriptions. If no more virtual entitlements are available, then the subscription service will apply physical entitlements.
 				</para>
 			</section>
 			
@@ -378,7 +378,7 @@
 					<secondary>and domains</secondary>
 				</indexterm>
 				<para>
-					Consumers in the entitlement service inventory are identified by <emphasis>type</emphasis>. Most consumers will have a type of <systemitem>system</systemitem>, meaning that each individual server subscribes to its own entitlements for its own use. There is another type of consumer, though, which is available for server groups, the <systemitem>domain</systemitem> type. <systemitem>domain</systemitem>-based entitlements are not allocated to a single system; they are distributed across the group of servers to govern the behavior of that group of servers. (That server group is called a domain.)
+					Consumers in the subscription service inventory are identified by <emphasis>type</emphasis>. Most consumers will have a type of <systemitem>system</systemitem>, meaning that each individual server subscribes to its own entitlements for its own use. There is another type of consumer, though, which is available for server groups, the <systemitem>domain</systemitem> type. <systemitem>domain</systemitem>-based entitlements are not allocated to a single system; they are distributed across the group of servers to govern the behavior of that group of servers. (That server group is called a domain.)
 				</para>
 				<para>
 					There are two things to keep in mind about domain entitlements:
@@ -386,7 +386,7 @@
 				<itemizedlist>
 					<listitem>
 						<para>
-							Each member of the domain is still registered to the entitlement service as a <systemitem>system</systemitem> consumer and added to the inventory individually.
+							Each member of the domain is still registered to the subscription service as a <systemitem>system</systemitem> consumer and added to the inventory individually.
 						</para>
 					</listitem>
 					<listitem>
@@ -399,7 +399,7 @@
 					The best example of a domain is an IPA domain<footnote><para>While an IPA domain is related to identity and authentication, a domain can have any kind of purpose or function.</para></footnote>.
 				</para>
 				<para>
-					On &OSORG; systems, the IPA servers are available by default and allow an identity server and up to 25 clients to be installed without requiring any additional entitlements. Each individual server in the domain is registered to the entitlement service as a <systemitem>system</systemitem> consumer. To allow replication between the servers in the domain, then each server must subscribe (individually) to the appropriate IPA replication system entitlements.
+					On &OSORG; systems, the IPA servers are available by default and allow an identity server and up to 25 clients to be installed without requiring any additional entitlements. Each individual server in the domain is registered to the subscription service as a <systemitem>system</systemitem> consumer. To allow replication between the servers in the domain, then each server must subscribe (individually) to the appropriate IPA replication system entitlements.
 				</para>
 				<para>
 					To have more than 25 servers in the IPA domain &mdash; both servers and clients, regardless of replication &mdash; requires an additional <systemitem>domain</systemitem> entitlement to set the new quantity. The domain entitlement identifies how many clients can be in the domain; rather than being consumed by any one server, the subscription is bound to the domain itself. A server on the domain consumes the domain entitlement and then the entitlement is replicated to the other servers in the domain.
@@ -419,7 +419,7 @@
 			</para>
 			<important><title>Important</title>
 				<para>
-					This entire chapter deals with entitlement and subscription management through &OSORG; Network with the entitlement service tools. This is the recommended content/subscription system for &MAJOROS; 6.1 machines.
+					This entire chapter deals with entitlement and subscription management through &OSORG; Network with the subscription service tools. This is the recommended content/subscription system for &MAJOROS; 6.1 machines.
 				</para>
 			</important>
 			<para>
@@ -441,7 +441,7 @@
 				</listitem>
 			</itemizedlist>
 			<para>
-				&OSORG; Network is an integration of the Customer Portal, Content Delivery Network, and entitlement service (subscription management). It uses simple and streamlined local tools (the &OSORG; Subscription Manager client) to give greater visibility into how entitlements and subscriptions are used and assigned and to help control software subscriptions as they are added and expire. 
+				&OSORG; Network is an integration of the Customer Portal, Content Delivery Network, and subscription service (subscription management). It uses simple and streamlined local tools (the &OSORG; Subscription Manager client) to give greater visibility into how entitlements and subscriptions are used and assigned and to help control software subscriptions as they are added and expire. 
 			</para>
 			<para>
 				Since the client tools for subscription manager (the focus of &OSORG; Network) are only available in &MAJOROS; 6.1 systems and later, &OSORG; Network can only be utilized by 6.1 systems. 
@@ -475,10 +475,10 @@
 				Satellite 5.x systems use a channel-based model similar to RHN Classic. 
 			</para>
 			<para>
-				While RHN Classic has an expanded systems management feature set, RHN Classic does not provide the compliance subscription management that the enhanced &OSORG; Network and entitlement service do. RHN Classic is provided for older &MAJOROS; systems (&MAJOROS; 4.x, &MAJOROS; 5.x, and Satellite 5.x) to migrate systems over to &MAJOROSVER;. 
+				While RHN Classic has an expanded systems management feature set, RHN Classic does not provide the system-level view into installed and subscribed products that the enhanced &OSORG; Network and subscription service do. RHN Classic is provided for older &MAJOROS; systems (&MAJOROS; 4.x, &MAJOROS; 5.x, and Satellite 5.x) to migrate systems over to Red Hat Enterprise Linux 6.1 and later version. 
 			</para>
 			<para>
-				When a system is registered with RHN Classic, then the &OSORG; Subscription Manager shows an error that the system is already registered and cannot be managed by the Subscription Manager tools. Likewise, similar errors are returned in the RHN Classic tools if a system is registered with &OSORG; Network and the entitlement service.
+				When a system is registered with RHN Classic, then the &OSORG; Subscription Manager shows an error that the system is already registered and cannot be managed by the Subscription Manager tools. Likewise, similar errors are returned in the RHN Classic tools if a system is registered with &OSORG; Network and the subscription service.
 			</para>
 		</section>
 	</section>
@@ -634,7 +634,7 @@
 								register
 							</entry>
 							<entry>
-								Registers or identifies a new system to the entitlement service.
+								Registers or identifies a new system to the subscription service.
 							</entry>
 
 						</row>
@@ -643,7 +643,7 @@
 								unregister
 							</entry>
 							<entry>
-								Unregisters a machine, which strips its subscriptions and removes the machine from the entitlement service.
+								Unregisters a machine, which strips its subscriptions and removes the machine from the subscription service.
 							</entry>
 
 						</row>
@@ -715,7 +715,7 @@
 								clean
 							</entry>
 							<entry>
-								Removes all of the subscription and identity data from the local system, <emphasis>without affecting the consumer information in the entitlement service</emphasis>. Any of the subscriptions consumed by the system are still consumed and are not available for other systems to use. The <command>clean</command> command is useful in cases where the local entitlement information is corrupted or lost somehow, and the system will be reregistered using the <command>register --consumerid=EXISTING_ID</command> command.
+								Removes all of the subscription and identity data from the local system, <emphasis>without affecting the consumer information in the subscription service</emphasis>. Any of the subscriptions consumed by the system are still consumed and are not available for other systems to use. The <command>clean</command> command is useful in cases where the local entitlement information is corrupted or lost somehow, and the system will be reregistered using the <command>register --consumerid=EXISTING_ID</command> command.
 							</entry>
 
 						</row>
@@ -761,7 +761,7 @@
 				<note>
 					<title>Note</title>
 					<para>
-						RHN Subscription Management gives a global view of all consumers, of all types, for an organization, which is crucial for planning and effectively assigning subscriptions. However, it does <emphasis role="bold">not</emphasis> provide any insight into what products are installed on a system and whether subscriptions are assigned for those products. To track software compliance, you must use the local &OSORG; Subscription Manager tools.
+						RHN Subscription Management gives a global view of all consumers, of all types, for an organization, which is crucial for planning and effectively assigning subscriptions. However, it does <emphasis role="bold">not</emphasis> provide any insight into what products are installed on a system and whether subscriptions are assigned for those products. To track the validity of installed products, you must use the local Subscription Manager tools.
 					</para>
 				</note>
 				<para>
@@ -817,13 +817,13 @@
 		<secondary>registering</secondary>
 	</indexterm>
 		<para>
-			Entitlements are managed by organizing and maintaining the systems which use entitlement subscriptions. The entitlements and subscriptions are managed by &OSORG; through the entitlement service. A system is recognized to the entitlement service by being <emphasis>registered</emphasis> with the service. The entitlement service assigns the system (called a <emphasis>consumer</emphasis>) a unique ID (essentially as an inventory number) and issues that system an identifying certificate (with the UUID in its subject CN) to identify that system.
+			Entitlements are managed by organizing and maintaining the systems which use entitlement subscriptions. The entitlements and subscriptions are managed by &OSORG; through the subscription service. A system is recognized to the subscription service by being <emphasis>registered</emphasis> with the service. The subscription service assigns the system (called a <emphasis>consumer</emphasis>) a unique ID (essentially as an inventory number) and issues that system an identifying certificate (with the UUID in its subject CN) to identify that system.
 		</para>
 		<para>
-			Whenever a subscription is purchased by an organization, the consumer can <emphasis>subscribe</emphasis> to that subscription. This means that a portion of the subscription is allocated to that consumer ID; when the consumer contacts the content delivery network and downloads the software, the licenses have been already assigned to the system. The system is in compliance with the organization's subscriptions.
+			Whenever a subscription is purchased by an organization, the consumer can <emphasis>subscribe</emphasis> to that subscription. This means that a portion of the subscription is allocated to that consumer ID; when the consumer contacts the content delivery network and downloads the software, the licenses have been already assigned to the system. The system has valid certificates for its subscriptions.
 		</para>
 		<para>
-			Systems can be registered with an entitlement service during the firstboot process or as part of the kickstart setup (both described in the <citetitle>Installation Guide</citetitle>). Systems can also be registered after they've been configured or removed from the entitlement service inventory (unregistered) if they will no longer be managed within that entitlement system.
+			Systems can be registered with an subscription service during the firstboot process or as part of the kickstart setup (both described in the <citetitle>Installation Guide</citetitle>). Systems can also be registered after they've been configured or removed from the subscription service inventory (unregistered) if they will no longer be managed within that entitlement system.
 		</para>
 		<section id="registering-ui">
 			<title>Registering from the GUI</title>
@@ -865,7 +865,7 @@
 				</listitem>
 				<listitem>
 					<para>
-						Enter the username and password of the user account on the entitlement service; this is the account used to access the Customer Portal.
+						Enter the username and password of the user account on the subscription service; this is the account used to access the Customer Portal.
 					</para>
 					<informalfigure> <mediaobject>
 						<imageobject>
@@ -904,7 +904,7 @@
 		<tertiary>from the command line</tertiary>
 	</indexterm>
 			<para>
-				The simplest way to register a machine is to pass the <command>register</command> command with the user account information required to authenticate to the Certificate-Based &OSORG; Network (the credentials used to access entitlement service or the Customer Portal). When the system is successfully authenticated, it echoes back the newly-assigned consumer ID and the user account name which registered it.
+				The simplest way to register a machine is to pass the <command>register</command> command with the user account information required to authenticate to the Certificate-Based &OSORG; Network (the credentials used to access subscription service or the Customer Portal). When the system is successfully authenticated, it echoes back the newly-assigned consumer ID and the user account name which registered it.
 			</para>
 			<example id="ex.ents-register">
 				<title>Registering a New Consumer</title>
@@ -1027,7 +1027,7 @@
 		<secondary>unregistering</secondary>
 	</indexterm>
 			<para>
-				The only thing required to unregister a machine is to run the <command>unregister</command> command. This removes the system's entry from the entitlement service, unsubscribes it from any subscriptions, and, locally, deletes its identity and entitlement certificates.
+				The only thing required to unregister a machine is to run the <command>unregister</command> command. This removes the system's entry from the subscription service, unsubscribes it from any subscriptions, and, locally, deletes its identity and entitlement certificates.
 			</para>
 			<para>
 				In the &OSORG; Subscription Manager GUI, there is an <guibutton>Unregister</guibutton> button at the top of the window in the <guilabel>Tools</guilabel> area.
@@ -1068,15 +1068,15 @@
 				There are times when the local registration and subscription information could be lost or corrupted. There could be a hardware failure or system crash. Or other IT considerations may require that a system be moved to a different machine. Whatever the reason, the local subscription configuration is lost.
 			</para>
 			<para>
-				A system can be registered against an existing system entry in the &OSORG; entitlement service, which essentially restores or reregisters that consumer. The reregister operation uses the original consumer ID with the registration request, so that all of the previous subscriptions associated with the consumer entry are restored along with the registration.
+				A system can be registered against an existing system entry in the &OSORG; subscription service, which essentially restores or reregisters that consumer. The reregister operation uses the original consumer ID with the registration request, so that all of the previous subscriptions associated with the consumer entry are restored along with the registration.
 			</para>
 			<para>
-				Reregistering a system uses the <command>register</command> command. This command passes the original UUID for a system to issue a request to the entitlement service to receive a new certificate using the same UUID. This essentially renews its previous registration.
+				Reregistering a system uses the <command>register</command> command. This command passes the original UUID for a system to issue a request to the subscription service to receive a new certificate using the same UUID. This essentially renews its previous registration.
 			</para>
 			<example id="ex.ents-identity">
 				<title>Registering a System Against an Existing Identity Certificate</title>
 				<para>
-					The <command>register</command> command uses the original ID to identify itself to the entitlement service and restore its previous subscriptions.
+					The <command>register</command> command uses the original ID to identify itself to the subscription service and restore its previous subscriptions.
 				</para>
 				
 <programlisting language="Bash">[root at server1 ~]# subscription-manager register --username admin-example --password secret --consumerid=7d133d55-876f-4f47-83eb-0ee931cb0a97</programlisting>
@@ -1106,7 +1106,7 @@
 								--consumerid
 							</entry>
 							<entry>
-								Gives the consumer UUID used by an <emphasis>existing</emphasis> consumer. The system's consumer entry must exist in the &OSORG; entitlement service for the reregister operation to succeed.
+								Gives the consumer UUID used by an <emphasis>existing</emphasis> consumer. The system's consumer entry must exist in the &OSORG; subscription service for the reregister operation to succeed.
 							</entry>
 							<entry>
 								Required
@@ -1228,7 +1228,7 @@
 <programlisting language="Bash"># subscription-manager activate --email=jsmith at example.com</programlisting>
 				<note><title>Note</title>
 					<para>
-						The machine must be registered <emphasis>first</emphasis> so that the entitlement service can properly identify the system and its subscriptions.
+						The machine must be registered <emphasis>first</emphasis> so that the subscription service can properly identify the system and its subscriptions.
 					</para>
 				</note>
 		</section>
@@ -1258,7 +1258,7 @@
 			A system can be subscribed to multiple subscriptions, a single subscription, or a single product. Subscribing a system requires the ID number of the subscription or the subscription key for the product.
 		</para>
 		<para>
-			Unsubscribing a machine removes the entitlement to any of the products in the subscription, but the machine remains registered with the entitlement service. Unsubscribing one system frees the subscription so that it can be allocated to another system.
+			Unsubscribing a machine removes the entitlement to any of the products in the subscription, but the machine remains registered with the subscription service. Unsubscribing one system frees the subscription so that it can be allocated to another system.
 		</para>
 		<section id="sub-ui">
 			<title>Subscribing and Unsubscribing through the &OSORG; Subscription Manager GUI</title>
@@ -1313,7 +1313,7 @@
 							</listitem>
 							<listitem>
 								<para>
-									<emphasis>have no overlap with existing subscriptions</emphasis> excludes subscriptions with duplicate products. If a system is already subscribed to an entitlement for a specific product or if multiple entitlements supply the same product, then the entitlement service filters those subscriptions and shows only the best fit.
+									<emphasis>have no overlap with existing subscriptions</emphasis> excludes subscriptions with duplicate products. If a system is already subscribed to an entitlement for a specific product or if multiple entitlements supply the same product, then the subscription service filters those subscriptions and shows only the best fit.
 								</para>
 
 							</listitem>
@@ -1368,7 +1368,7 @@
 		<tertiary>uploading product certs</tertiary>
 	</indexterm>
 				<para>
-					In certain situations, new product subscriptions can be added by uploading the X.509 entitlements certificate directly rather than polling the entitlement service. This method is common for products purchased from &OSORG; directly.
+					In certain situations, new product subscriptions can be added by uploading the X.509 entitlements certificate directly rather than polling the subscription service. This method is common for products purchased from &OSORG; directly.
 				</para>
 				<orderedlist>
 					<listitem>
@@ -1521,7 +1521,7 @@ ProductId:              MKT-rhel-server
 Quantity:               10                       
 Expires:                2011-09-20</programlisting>
 				<para>
-					Alternatively, the system can be subscribed to the best-fitting subscriptions, as identified by the entitlement service, by using the <option>--auto</option> option (which is analogous to the <option>--autosubscribe</option> option with the <command>register</command> command).
+					Alternatively, the system can be subscribed to the best-fitting subscriptions, as identified by the subscription service, by using the <option>--auto</option> option (which is analogous to the <option>--autosubscribe</option> option with the <command>register</command> command).
 				</para>
 <programlisting language="Bash">[root at server1 ~]# subscription-manager subscribe --auto</programlisting>
 				<table id="tab.subscribe-options">
@@ -1739,7 +1739,7 @@ Expires:             2011-11-18</programlisting>
 				</listitem>
 				<listitem>
 					<para>
-						<emphasis>have no overlap with existing subscriptions</emphasis> excludes subscriptions with duplicate products. If a system is already subscribed to an entitlement for a specific product or if multiple entitlements supply the same product, then the entitlement service filters those subscriptions and shows only the best fit.
+						<emphasis>have no overlap with existing subscriptions</emphasis> excludes subscriptions with duplicate products. If a system is already subscribed to an entitlement for a specific product or if multiple entitlements supply the same product, then the subscription service filters those subscriptions and shows only the best fit.
 					</para>
 
 				</listitem>
@@ -1915,24 +1915,24 @@ AccountNumber:       12331131231</programlisting>
 	</section>
 	
 	<section id="responding-to-nags-ui">
-		<title>Responding to Subscription Compliance Messages</title>
+		<title>Responding to Subscription Notifications</title>
 	<indexterm>
 		<primary>entitlements</primary>
-		<secondary>compliance messages</secondary>
+		<secondary>notifications</secondary>
 	</indexterm>
 	<indexterm>
 		<primary>systems</primary>
-		<secondary>compliance messages</secondary>
+		<secondary>notifications</secondary>
 	</indexterm>
 	<indexterm>
 		<primary>subscriptions</primary>
-		<secondary>compliance messages</secondary>
+		<secondary>notifications</secondary>
 	</indexterm>
 		<para>
-			The &OSORG; Subscription Manager provides a series of log and UI messages that indicate any changes to the compliance of any installed products for a system. Whenever there is a warning about compliance, a small icon appears in the top menu bar, similar to a fuel gauge.
+			The &OSORG; Subscription Manager provides a series of log and UI messages that indicate any changes to the valid certificates of any installed products for a system. Whenever there is a warning about subscription changes, a small icon appears in the top menu bar, similar to a fuel gauge.
 		</para>
 		<figure id="fig.ents-nag">
-			<title>Entitlements Compliance Icon</title>
+			<title>Subscription Notification Icon</title>
 			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/ents-nag.png" />
@@ -1942,7 +1942,7 @@ AccountNumber:       12331131231</programlisting>
 
 		</figure>
 		<para>
-			As any installed product nears the expiration date of the subscription, the Subscription Manager daemon will issue a warning. A similar message is given when the system is out of compliance, meaning a product is installed without the system being subscribed to a subscription that entitles that product or installed past the expiration of the subscription. Clicking the <guilabel>Manage My Subscriptions...</guilabel> button in the compliance message opens the &OSORG; Subscription Manager GUI to view and update subscriptions.
+			As any installed product nears the expiration date of the subscription, the Subscription Manager daemon will issue a warning. A similar message is given when the system is has products without a valid certificate, meaning either the system is not subscribed to a subscription that entitles that product or the product is installed past the expiration of the subscription. Clicking the <guilabel>Manage My Subscriptions...</guilabel> button in the subscription notification window opens the &OSORG; Subscription Manager GUI to view and update subscriptions.
 		</para>
 		<figure id="fig.ents-nag-warning">
 			<title>Entitlements Warning Message</title>
@@ -1954,10 +1954,10 @@ AccountNumber:       12331131231</programlisting>
 			</mediaobject>
 		</figure>
 		<para>
-			When the Subscription Manager UI opens, whether it was opened through a compliance message or just opened normally, there is a notification in the upper left corner that shows the number of products that are out of compliance. The easiest way to maintain compliance is to click the <guibutton>Become Compliant</guibutton> button.
+			When the Subscription Manager UI opens, whether it was opened through a notification or just opened normally, there is a box in the upper left corner that shows the number of products that lack a valid certificate. The easiest way to allocate subscriptions which match invalidated products is to click the <guibutton>Update Certificates</guibutton> button.
 		</para>
 		<figure id="fig.rhsm-compliance">
-			<title>Become Compliant Button</title>
+			<title>Update Certificates Button</title>
 			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/rhsm-compliance2.png" />
@@ -1966,10 +1966,10 @@ AccountNumber:       12331131231</programlisting>
 			</mediaobject>
 		</figure>
 		<para>
-			The Compliance Manager pop-up window of Subscription Manager shows a targeted list of available subscriptions that apply to the specific products that are out of compliance (assuming subscriptions are available). 
+			The Subscription Assistant pop-up window shows a targeted list of available subscriptions that apply to the specific products that do not have valid certificates (assuming subscriptions are available). 
 		</para>
 		<figure id="fig.rhsm-compliance1">
-			<title>Compliance Manager</title>
+			<title>Subscription Assistant</title>
 			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/rhsm-compliance.png" />
@@ -2012,13 +2012,13 @@ AccountNumber:       12331131231</programlisting>
 		<secondary>updating entitlement certs</secondary>
 	</indexterm>
  		<para>
-			An entitlement certificate represents a subscription. It includes all of the products which were purchased in the subscription, the subscription's start and end dates, and the number of entitlements included for each product. An entitlement certificate does not list products that are <emphasis>currently installed</emphasis> on the system; rather, it lists all of that products that are <emphasis>available</emphasis> to the system.
+			An entitlement certificate represents a subscription that has been consumed by a given system. It includes all of the products which are included in the subscription for service and support, the subscription's start and end dates, and the number of entitlements included for each product. An entitlement certificate does not list products that are <emphasis>currently installed</emphasis> on the system; rather, it lists all of that products that are <emphasis>available</emphasis> to the system.
 		</para>
 		<para>
-			The entitlement certificate is an X.509 certificate and is stored in a 64-bit blob in a <filename>.pem</filename> file.
+			The entitlement certificate is an X.509 certificate and is stored in a base 64-encoded blob in a <filename>.pem</filename> file.
 		</para>
 		<para>
-			When a subscription expires or is changed, then the entitlement certificate must be updated to account for the changes. The &OSORG; Subscription Manager polls the entitlement service periodically to check for updated entitlement certificates; this can also be updated immediately or pulled down from the Customer Portal. The entitlement certificates are updated by revoking the previous entitlement certificate and generating a new one to replace it.
+			When a subscription expires or is changed, then the entitlement certificate must be updated to account for the changes. The &OSORG; Subscription Manager polls the subscription service periodically to check for updated entitlement certificates; this can also be updated immediately or pulled down from the Customer Portal. The entitlement certificates are updated by revoking the previous entitlement certificate and generating a new one to replace it.
 		</para>
 		<section id="regen-certs-ui"><title>Regenering Entitlement Certificates in the GUI</title>
 
@@ -2076,7 +2076,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 	<section id="rhsm-config">
 		<title>Configuring the Subscription Service</title>
 		<para>
-			By default, &OSORG; Subscription Manager (both GUI and CLI) talk to the entitlement service and the Customer Portal for their subscription services and content delivery, respectively. &OSORG; Subscription Manager can be configured to use different content servers or entitlement services. Other aspects of the &OSORG; Subscription Manager &mdash; like the locations to look for system and product certificates or the system information used by &OSORG; Subscription Manager to identify compatible entitlements &mdash; can also be customized to fit the network environment.
+			By default, &OSORG; Subscription Manager (both GUI and CLI) talk to the subscription service and the Customer Portal for their subscription services and content delivery, respectively. &OSORG; Subscription Manager can be configured to use different content servers or subscription services. Other aspects of the &OSORG; Subscription Manager &mdash; like the locations to look for system and product certificates or the system information used by &OSORG; Subscription Manager to identify compatible entitlements &mdash; can also be customized to fit the network environment.
 		</para>
 		<section id="rhsm-files">
 			<title>&OSORG; Subscription Manager Configuration Files</title>
@@ -2187,7 +2187,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 									/etc/pki/consumer
 								</entry>
 								<entry>
-									The directory which contains the identity certificates used by the system to identify itself to the entitlement service.
+									The directory which contains the identity certificates used by the system to identify itself to the subscription service.
 								</entry>
 
 							</row>
@@ -2241,7 +2241,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 									/etc/init.d/rhsmcertd
 								</entry>
 								<entry>
-									The subscription compliance daemon.
+									The subscription certificate daemon.
 								</entry>
 
 							</row>
@@ -2250,7 +2250,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 									/etc/cron.daily/rhsm-complianced and /usr/libexec/rhsm-complianced
 								</entry>
 								<entry>
-									Files to run daily checks and notifications for subscription compliance.
+									Files to run daily checks and notifications for subscription validity.
 								</entry>
 
 							</row>
@@ -2313,7 +2313,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 				<itemizedlist>
 					<listitem>
 						<para>
-							The entitlement service connection information, including the server host and port
+							The subscription service connection information, including the server host and port
 						</para>
 
 					</listitem>
@@ -2325,14 +2325,14 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 					</listitem>
 					<listitem>
 						<para>
-							The location of all of the different certificates used by the entitlement service, including CA certificates for SSL authentication, identity certificates for the system, and entitlement and product certificates
+							The location of all of the different certificates used by the subscription service, including CA certificates for SSL authentication, identity certificates for the system, and entitlement and product certificates
 						</para>
 
 					</listitem>
 
 				</itemizedlist>
 				<para>
-					The <filename>rhsm.conf</filename> file is divided into three sections. Two major sections defined the entitlement service (<command>[server]</command>) and content and product delivery (<command>[rhsm]</command>). The third section relates to the <command>rhsmcertd</command> daemon. Each assertion is a simple <emphasis>attribute= value</emphasis> pair. Any of the default values can be edited; all possible attributes are present and active in the default <filename>rhsm.conf</filename> file.
+					The <filename>rhsm.conf</filename> file is divided into three sections. Two major sections defined the subscription service (<command>[server]</command>) and content and product delivery (<command>[rhsm]</command>). The third section relates to the <command>rhsmcertd</command> daemon. Each assertion is a simple <emphasis>attribute= value</emphasis> pair. Any of the default values can be edited; all possible attributes are present and active in the default <filename>rhsm.conf</filename> file.
 				</para>
 				<example id="ex.rhsm.conf">
 					<title>Default rhsm.conf File</title>
@@ -2342,7 +2342,7 @@ eff9a4c9-3579-49e5-a52f-83f2db29ab52 server.example.com</programlisting>
 # Unified Entitlement Platform Configuration
 [server]
 # Server hostname:
-hostname = subscriptions.rhn.redhat.com
+hostname = subscription.rhn.redhat.com
 
 # Server prefix:
 prefix = /subscription
@@ -2351,7 +2351,7 @@ prefix = /subscription
 port = 443
 
 # Set to 1 to disable certificate validation:
-insecure = 1
+insecure = 0
 
 # Set the depth of certs which should be checked
 # when validating a certificate
@@ -2364,7 +2364,7 @@ ca_cert_dir = /etc/rhsm/ca/
 proxy_hostname =
 
 # port for http proxy server
-proxy_port =
+proxy_port = 
 
 # user name for authenticating to an http proxy, if needed
 proxy_user =
@@ -2374,10 +2374,10 @@ proxy_password =
 
 [rhsm]
 # Content base URL:
-baseurl= http://redhat.com/content
+baseurl= https://cdn.redhat.com
 
 # Default CA cert to use when generating yum repo configs:
-repo_ca_cert = %(ca_cert_dir)sfakamai-cp1.pem
+repo_ca_cert = %(ca_cert_dir)sredhat-uep.pem
 
 # Where the certificates should be stored
 productCertDir = /etc/pki/product
@@ -2386,7 +2386,7 @@ consumerCertDir = /etc/pki/consumer
 
 [rhsmcertd]
 # Frequency of certificate refresh (in minutes):
-certFrequency=240</programlisting>
+certFrequency = 240</programlisting>
 
 				</example>
 				<table id="tab.rhsm.conf-parameters">
@@ -2425,7 +2425,7 @@ certFrequency=240</programlisting>
 									Gives the IP address or fully-qualified domain name of the entitlements server.
 								</entry>
 								<entry>
-									subscriptions.rhn.redhat.com
+									subscription.rhn.redhat.com
 								</entry>
 
 							</row>
@@ -2437,7 +2437,7 @@ certFrequency=240</programlisting>
 									Gives the directory, in the URL, to use to connect to the entitlements service.
 								</entry>
 								<entry>
-									/candlepin
+									/subscription
 								</entry>
 
 							</row>
@@ -2446,10 +2446,10 @@ certFrequency=240</programlisting>
 									port
 								</entry>
 								<entry>
-									Gives the port to use to connect to the entitlement service.
+									Gives the port to use to connect to the subscription service.
 								</entry>
 								<entry>
-									8443
+									443
 								</entry>
 
 							</row>
@@ -2458,7 +2458,7 @@ certFrequency=240</programlisting>
 									insecure
 								</entry>
 								<entry>
-									Sets whether to use a secure (0) or insecure (1) connection for connections between the Subscription Manager clients and the entitlement service.
+									Sets whether to use a secure (0) or insecure (1) connection for connections between the Subscription Manager clients and the subscription service.
 								</entry>
 								<entry>
 									0
@@ -2525,7 +2525,7 @@ certFrequency=240</programlisting>
 									ca_cert_dir
 								</entry>
 								<entry>
-									Gives the location for the CA certificate for the CA which issued the entitlement service's certificates. This allows the client to identify and trust the entitlement service for authentication for establishing an SSL connection.
+									Gives the location for the CA certificate for the CA which issued the subscription service's certificates. This allows the client to identify and trust the subscription service for authentication for establishing an SSL connection.
 								</entry>
 								<entry>
 									/etc/rhsm/ca
@@ -2545,7 +2545,7 @@ certFrequency=240</programlisting>
 									Gives the full URL to access the content delivery system.
 								</entry>
 								<entry>
-									http://redhat.com/content
+									https://cdn.redhat.com
 								</entry>
 
 							</row>
@@ -2557,7 +2557,7 @@ certFrequency=240</programlisting>
 									Identifies the default CA certificate to use to set the yum repo configuration.
 								</entry>
 								<entry>
-									%(ca_cert_dir)-cp1.pem
+									%(ca_cert_dir)sredhat-uep.pem
 								</entry>
 
 							</row>
@@ -2644,7 +2644,7 @@ certFrequency=240</programlisting>
 			
 
 		</section>
-		
+		<!--	
 		<section id="setting-up-rhsm-mirror">
 			<title>Configuring &OSORG; Subscription Manager to Use a Content Mirror</title>
 	<indexterm>
@@ -2688,6 +2688,7 @@ baseurl= http://cotent.example.com/content-satellite</programlisting>
 			</orderedlist>
 
 		</section>
+		-->
 		
  		<section id="rhsm-http-proxy">
 			<title>Using an HTTP Proxy</title>
@@ -2712,7 +2713,7 @@ baseurl= http://cotent.example.com/content-satellite</programlisting>
 		<tertiary>HTTP proxy (GUI)</tertiary>
 	</indexterm>
 				<para>
-					The &OSORG; Subscription Manager GUI can be configured to use an HTTP proxy for all of its connections to the entitlement service. (This is also an advanced configuration option at firstboot.) To configure the proxy:
+					The &OSORG; Subscription Manager GUI can be configured to use an HTTP proxy for all of its connections to the subscription service. (This is also an advanced configuration option at firstboot.) To configure the proxy:
 				</para>
 				<orderedlist>
 					<listitem>
@@ -2781,7 +2782,7 @@ baseurl= http://cotent.example.com/content-satellite</programlisting>
 					<tertiary>HTTP proxy (configuration file)</tertiary>
 				</indexterm>
 				<para>
-					The HTTP proxy settings can be configured in the <filename>rhsm.conf</filename> file; this is the same as configuring it in the Subscription Manager GUI. The proxy configuration is stored and used for every connection between the entitlement service and the local system.
+					The HTTP proxy settings can be configured in the <filename>rhsm.conf</filename> file; this is the same as configuring it in the Subscription Manager GUI. The proxy configuration is stored and used for every connection between the subscription service and the local system.
 				</para>
 				<orderedlist>
 				<listitem>
@@ -2940,24 +2941,26 @@ proxy_password =</programlisting>
 		</section>
 		
 		<section id="changing-ents-server">
-			<title>Changing the Entitlement Server</title>
+			<title>Changing the Subscription Server</title>
 	<indexterm>
 		<primary>entitlements</primary>
 		<secondary>configuration</secondary>
-		<tertiary>changing entitlement service</tertiary>
+		<tertiary>changing subscription service</tertiary>
 	</indexterm>
 	<indexterm>
 		<primary>systems</primary>
 		<secondary>subscription configuration</secondary>
-		<tertiary>changing entitlement service</tertiary>
+		<tertiary>changing subscription service</tertiary>
 	</indexterm>
 	<indexterm>
 		<primary>subscriptions</primary>
 		<secondary>configuration</secondary>
-		<tertiary>changing entitlement service</tertiary>
+		<tertiary>changing subscription service</tertiary>
 	</indexterm>
 			<para>
-				The Subscription Manager usually connects to the entitlement service, and the public server is configured in the <filename>rhsm.conf</filename> file. There may be instances when an organization is running a mirror, an internal entitlement service, or some other entitlement service. The entitlement service connection settings are in the <command>[server]</command> section of the configuration file.
+				The Subscription Manager usually connects to the subscription service, and the public server is configured in the <filename>rhsm.conf</filename> file. 
+				<!-- There may be instances when an organization is running a mirror, an internal subscription service, or some other subscription service. -->
+				The subscription service connection settings are in the <command>[server]</command> section of the configuration file.
 			</para>
 			<orderedlist>
 				<listitem>
@@ -2981,13 +2984,13 @@ proxy_password =</programlisting>
 						</listitem>
 						<listitem>
 							<para>
-								<parameter>prefix</parameter> for the entitlement service directory
+								<parameter>prefix</parameter> for the subscription service directory
 							</para>
 
 						</listitem>
 						<listitem>
 							<para>
-								<parameter>port</parameter> for the entitlement service port
+								<parameter>port</parameter> for the subscription service port
 							</para>
 
 						</listitem>
@@ -3006,7 +3009,7 @@ port=8443</programlisting>
 		</section>
 		
 		<section id="secure-cxn-ents-server">
-			<title>Managing Secure Connections to the Entitlement Server</title>
+			<title>Managing Secure Connections to the Subscription Server</title>
 	<indexterm>
 		<primary>entitlements</primary>
 		<secondary>configuration</secondary>
@@ -3023,7 +3026,7 @@ port=8443</programlisting>
 		<tertiary>SSL</tertiary>
 	</indexterm>
 			<para>
-				&OSORG; Subscription Manager assumes, by default, that the subscription clients connect to the entitlement service using a secure (SSL) connection. This requires that the CA certificate of the entitlement service be downloaded and available locally for the client and that the appropriate connections be configured.
+				&OSORG; Subscription Manager assumes, by default, that the subscription clients connect to the subscription service using a secure (SSL) connection. This requires that the CA certificate of the subscription service be downloaded and available locally for the client and that the appropriate connections be configured.
 			</para>
 			<orderedlist>
 				<listitem>
@@ -3053,7 +3056,7 @@ port=8443</programlisting>
 						</listitem>
 						<listitem>
 							<para>
-								<parameter>port</parameter> for the entitlement service port; this should be an SSL port if a secure connection is required
+								<parameter>port</parameter> for the subscription service port; this should be an SSL port if a secure connection is required
 							</para>
 
 						</listitem>
@@ -3157,7 +3160,7 @@ rhsmcertd (pid 13084) is running...</programlisting>
 			<title>Checking Logs</title>
 	<indexterm>
 		<primary>logs</primary>
-		<secondary>for subscription/entitlement services</secondary>
+		<secondary>for subscription/subscription services</secondary>
 	</indexterm>
 	<indexterm>
 		<primary>entitlements</primary>
@@ -3311,7 +3314,7 @@ showIncompatiblePools = 1</programlisting>
 			<note>
 				<title>Tip</title>
 				<para>
-					Updating the facts resends the information about the system to the &OSORG; entitlement service so that it can update the list of subscriptions which match the system architecture. Updating the facts is a very good thing to do after hardware upgrades or other important system changes.
+					Updating the facts resends the information about the system to the &OSORG; subscription service so that it can update the list of subscriptions which match the system architecture. Updating the facts is a very good thing to do after hardware upgrades or other important system changes.
 				</para>
 
 			</note>
@@ -3479,7 +3482,7 @@ dmi.baseboard.product_name: Server Blade
 		<secondary>system UUID</secondary>
 	</indexterm>
 			<para>
-				The consumer or system UUID is a unique identifier used in the inventory entitlement service. This UUID can be used to re-register the system if there is some kind of corruption or for internal tracking. In the GUI (<xref linkend="rhsm-facts-gui" />), this is listed as one of the system facts, under the system category:
+				The consumer or system UUID is a unique identifier used in the inventory subscription service. This UUID can be used to re-register the system if there is some kind of corruption or for internal tracking. In the GUI (<xref linkend="rhsm-facts-gui" />), this is listed as one of the system facts, under the system category:
 			</para>
 			<informalfigure> <mediaobject>
 				<imageobject>
@@ -3540,7 +3543,7 @@ dmi.baseboard.product_name: Server Blade
 								Consumer ID
 							</entry>
 							<entry>
-								A unique identifier for each system that is registered to the entitlement service.
+								A unique identifier for each system that is registered to the subscription service.
 							</entry>
 							<entry>
 								identity
@@ -3658,10 +3661,10 @@ ProductId: MKT-rhel-server
 		<secondary>certificates</secondary>
 	</indexterm>
 		<para>
-			Part of managing subscriptions requires verifying the <emphasis>identity</emphasis> of everything involved, such as the system, the entitlement service, and the available products. The subscription service uses X.509 certificates to handle the identity and authentication aspects of the entitlement service. These X.509 certificates also contain the actual data about available subscriptions and installed products.
+			Part of managing subscriptions requires verifying the <emphasis>identity</emphasis> of everything involved, such as the system, the subscription service, and the available products. The subscription service uses X.509 certificates to handle the identity and authentication aspects of the subscription service. These X.509 certificates also contain the actual data about available subscriptions and installed products.
 		</para>
 		<para>
-			The first time a system is subscribed to a subscription, it downloads a certificate from the entitlement service. The entitlement certificate contains all of the information about products that are available through that subscription. The entitlement certificate is revoked and reissued any time there is a change in the subscriptions for an organization. Once a product is actually installed on a machine, then another certificate is issued to manage the entitlements for the product on the system.
+			The first time a system is subscribed to a subscription, it downloads a certificate from the subscription service. The entitlement certificate contains all of the information about products that are available through that subscription. The entitlement certificate is revoked and reissued any time there is a change in the subscriptions for an organization. Once a product is actually installed on a machine, then another certificate is issued to manage the entitlements for the product on the system.
 		</para>
 		<para>
 			Each certificate issued and used by the Subscription Manager services is a <filename>.pem</filename> formatted file. This file format stores both keys and certificates in a base-64 blob. For example:
@@ -3692,7 +3695,7 @@ lZuvBTYROOX6W2vKXw==
 			Tools like <command>openssl</command> or <command>pk12util</command> can be used to extract and view information from these certificates, in a pretty-print format. The product- and subscription-related information is extracted and viewable in the &OSORG; Subscription Manager GUI or command-line tools.
 		</para>
 		<para>
-			This section describes the different certificates used by the entitlement service and the entitlement information contained in those certificates. A much more detailed description of X.509 certificates and a public key infrastructure (PKI) is given in the &OSORG; Certificate System documentation in <ulink url="http://docs.redhat.com/docs/en-US/Red_Hat_Certificate_System/8.0/html/Deployment_Guide/Introduction_to_Public_Key_Cryptography.html">chapter 1, "Introduction to Public-Key Cryptography,"</ulink> in the <citetitle>&OSORG; Certificate System Deployment Guide</citetitle>.
+			This section describes the different certificates used by the subscription service and the entitlement information contained in those certificates. A much more detailed description of X.509 certificates and a public key infrastructure (PKI) is given in the &OSORG; Certificate System documentation in <ulink url="http://docs.redhat.com/docs/en-US/Red_Hat_Certificate_System/8.0/html/Deployment_Guide/Introduction_to_Public_Key_Cryptography.html">chapter 1, "Introduction to Public-Key Cryptography,"</ulink> in the <citetitle>&OSORG; Certificate System Deployment Guide</citetitle>.
 		</para>
 	<indexterm>
 		<primary>entitlements</primary>
@@ -3728,7 +3731,7 @@ lZuvBTYROOX6W2vKXw==
 							Consumer Identity Certificate
 						</entry>
 						<entry>
-							Used to identify the system (consumer) to the entitlement service. This contains a unique ID which is assigned to the system when it is registered to the system. The identity certificate itself is generated by the entitlement service when the system is registered and then sent to the consumer.
+							Used to identify the system (consumer) to the subscription service. This contains a unique ID which is assigned to the system when it is registered to the system. The identity certificate itself is generated by the subscription service when the system is registered and then sent to the consumer.
 						</entry>
 						<entry>
 							/etc/pki/consumer
@@ -3764,7 +3767,7 @@ lZuvBTYROOX6W2vKXw==
 							CA Certificate
 						</entry>
 						<entry>
-							A certificate for the certificate authority which issued the SSL server certificate used by the entitlement service. This must be installed on a system for the system to use SSl to connect to the entitlement service.
+							A certificate for the certificate authority which issued the SSL server certificate used by the subscription service. This must be installed on a system for the system to use SSl to connect to the subscription service.
 						</entry>
 						<entry>
 							/etc/rhsm/ca/candlepin-ca.pem
@@ -3776,7 +3779,7 @@ lZuvBTYROOX6W2vKXw==
 							Satellite Certificate
 						</entry>
 						<entry>
-							An XML-formatted certificate which contains a product list. This is used by local Satellite 5.x systems, not the newer entitlement service.
+							An XML-formatted certificate which contains a product list. This is used by local Satellite 5.x systems, not the newer subscription service.
 						</entry>
 						<entry>
 
@@ -3802,7 +3805,7 @@ lZuvBTYROOX6W2vKXw==
 		<tertiary>identity certificate structure</tertiary>
 	</indexterm>
 			<para>
-				An identity certificate is a standard SSL client certificate. This certificate is issued by the entitlement service when the system registers to it. The system-consumer subsequently uses this certificate to authenticate to the entitlement service whenever it contacts the service after registration.
+				An identity certificate is a standard SSL client certificate. This certificate is issued by the subscription service when the system registers to it. The system-consumer subsequently uses this certificate to authenticate to the subscription service whenever it contacts the service after registration.
 			</para>
 			<para>
 				The certificate contains three important pieces of information:
@@ -3816,7 +3819,7 @@ lZuvBTYROOX6W2vKXw==
 				</listitem>
 				<listitem>
 					<para>
-						The entitlement service which the system is registered to, in the issuer field of the certificate
+						The subscription service which the system is registered to, in the issuer field of the certificate
 					</para>
 
 				</listitem>
@@ -3910,7 +3913,7 @@ lZuvBTYROOX6W2vKXw==
 		<tertiary>entitlement certificate structure</tertiary>
 	</indexterm>
 			<para>
-				An entitlement is analogous to an assigned software license. <emphasis>Entitlement certificates</emphasis> contain a list of available products for a system &mdash; software that the system has been granted rights to download and update. When a system is subscribed to a subscription pool, the system pulls down the entitlement certificate from the entitlement service, which contains all of the information about available products.
+				An entitlement is analogous to an assigned software license. <emphasis>Entitlement certificates</emphasis> contain a list of available products for a system &mdash; software that the system has been granted rights to download and update. When a system is subscribed to a subscription pool, the system pulls down the entitlement certificate from the subscription service, which contains all of the information about available products.
 			</para>
 			<para>
 				An entitlement certificate contains a list of every <emphasis>potential</emphasis> product from every potential content source. The structure of the entitlement certificate, then, allows multiple namespaces, each, for products, content servers, roles, orders, and systems. An entitlement certificate also contains <emphasis>complete</emphasis> information about the subscribed pool, even for products which may not be compatible with the specific system. In an entitlement certificate, the architecture and version definitions contain all of the <emphasis>allowed</emphasis> architectures and versions.
@@ -3918,12 +3921,12 @@ lZuvBTYROOX6W2vKXw==
 			<note>
 				<title>Note</title>
 				<para>
-					The local Subscription Manager polls the entitlement service routinely (every four hours by default) to check for changes in the entitlements. When a subscription is changed in some way, then the original entitlement certificate is revoked and is replaced with a new entitlement certificate.
+					The local Subscription Manager polls the subscription service routinely (every four hours by default) to check for changes in the entitlements. When a subscription is changed in some way, then the original entitlement certificate is revoked and is replaced with a new entitlement certificate.
 				</para>
 
 			</note>
 			<para>
-				The entitlement certificate is a <filename>*.pem</filename> file stored in the entitlement certificates directory, <filename>/etc/pki/entitlement</filename>. The name of the <filename>*.pem</filename> file is a generated numeric identifier that is generated by the entitlement service. This ID is an inventory number that is used to associate a subscription quantity with the system in the software inventory.
+				The entitlement certificate is a <filename>*.pem</filename> file stored in the entitlement certificates directory, <filename>/etc/pki/entitlement</filename>. The name of the <filename>*.pem</filename> file is a generated numeric identifier that is generated by the subscription service. This ID is an inventory number that is used to associate a subscription quantity with the system in the software inventory.
 			</para>
 			<para>
 				The heading of the certificate contains the name of the entitlement server which issued it, the validity period of the certificate (which is tied to the installation date of the product), and then the serial number of the installation of the product.
@@ -4036,7 +4039,7 @@ lZuvBTYROOX6W2vKXw==
 		<tertiary>product certificate structure</tertiary>
 	</indexterm>
 			<para>
-				The products that are installed on a system through the subscriptions assigned to a system are identified by X.509 certificates. When an available product is installed, the entitlement service generates a <emphasis>product certificate</emphasis>, which contains the information about the product contract and the specific installation.
+				The products that are installed on a system through the subscriptions assigned to a system are identified by X.509 certificates. When an available product is installed, the subscription service generates a <emphasis>product certificate</emphasis>, which contains the information about the product contract and the specific installation.
 			</para>
 			<para>
 				Structurally, entitlement certificates and product certificates are very similar, because they both provide much of the same information about products. The main difference is that a product certificate contains information about a single product that has been installed, so no other subscription information (like other available products or other product versions) is included in a product certificate the way that it is in an entitlement certificate.
@@ -4045,7 +4048,7 @@ lZuvBTYROOX6W2vKXw==
 				A product certificate contains a single product namespace (meaning, a single product definition) which shows only <emphasis>what is actually installed on the system</emphasis>. The architecture and version definitions in a product certificate reflect the architecture and version of the product that is actually installed.
 			</para>
 			<para>
-				The product certificate is a <filename>*.pem</filename> file stored in the entitlement certificates directory, <filename>/etc/pki/entitlement/<replaceable>product_serial#</replaceable>.pem</filename>. The name of the <filename>*.pem</filename> file is a generated numeric identifier that is generated by the entitlement service. As with entitlement tracking, the generated ID is an inventory number, used to track installed products and associate them with systems within the entitlement service.
+				The product certificate is a <filename>*.pem</filename> file stored in the entitlement certificates directory, <filename>/etc/pki/entitlement/<replaceable>product_serial#</replaceable>.pem</filename>. The name of the <filename>*.pem</filename> file is a generated numeric identifier that is generated by the subscription service. As with entitlement tracking, the generated ID is an inventory number, used to track installed products and associate them with systems within the subscription service.
 			</para>
 
 		</section>
@@ -4065,7 +4068,7 @@ lZuvBTYROOX6W2vKXw==
 			<important>
 				<title>Important</title>
 				<para>
-					Satellite certificates are used by Satellite 5.x deployments. They are not used on &MAJOROSVER; or by the entitlement service.
+					Satellite certificates are used by Satellite 5.x deployments. They are not used on &MAJOROSVER; or by the subscription service.
 				</para>
 
 			</important>
@@ -4128,7 +4131,7 @@ aPcaAJ0e5neOfdDZRLOgDE+Tp/Im3Hc3Rg==
 -----END PGP SIGNATURE-----
 &lt;/rhn-cert-signature&gt;</programlisting>
 			<para>
-				The <option>name="slot"</option> field lists how many <emphasis>total</emphasis> systems are allowed to use this Satellite certificate to receive content. It is a global quantity.
+				The <option>name="slot"</option> field lists how many <emphasis>total</emphasis> systems are allowed to use this Satellite certificate to receive content. It's a global quantity.
 			</para>
 			
 <programlisting language="XML">  &lt;rhn-cert-field name="slots"&gt;119&lt;/rhn-cert-field&gt;</programlisting>
diff --git a/en-US/Yum.xml b/en-US/Yum.xml
index 3eafb5b..fd9fb9c 100644
--- a/en-US/Yum.xml
+++ b/en-US/Yum.xml
@@ -8,7 +8,7 @@
     <application>Yum</application> is the &OSORG; package manager that is able to query for information about packages, fetch packages from repositories, install and uninstall packages using automatic dependency resolution, and update an entire system to the latest available packages. <application>Yum</application> performs automatic dependency resolution on packages you are updating, installing or removing, and thus is able to automatically determine, fetch and install all available dependent packages. <application>Yum</application> can be configured with new, additional repositories, or <firstterm>package sources</firstterm>, and also provides many plugins which enhance and extend its capabilities. <application>Yum</application> is able to perform many of the same tasks that <application>RPM</application> can; additionally, many of the command line options are similar. <application>Yum</application> enables easy and simple package management on a single machine or on group
 s of them.</para>
   <important
     id="important-Secure_Package_Management_with_GPG-Signed_Packages">
-    <title>Secure Package Management with GPG-Signed Packages</title>
+    <title>Important: Secure Package Management with GPG-Signed Packages</title>
     <para>
       <application>Yum</application> provides secure package management by enabling GPG (Gnu Privacy Guard; also known as GnuPG) signature verification on GPG-signed packages to be turned on for all package repositories (i.e. package sources), or for individual repositories. When signature verification is enabled, <application>Yum</application> will refuse to install any packages not GPG-signed with the correct key for that repository. This means that you can trust that the <application>RPM</application> packages you download and install on your system are from a trusted source, such as &OSORG;, and were not modified during transfer. Refer to <xref
         linkend="sec-Configuring_Yum_and_Yum_Repositories"/> for details on enabling signature-checking with <application>Yum</application>, or <xref
@@ -121,7 +121,7 @@ Is this ok [y/N]:</screen>
             <computeroutput>kernel.x86_64</computeroutput> — you can download and install new kernels safely with <command>yum</command>.</para>
           <important
             id="important-Important-Updating_and_Installing_Kernels_with_Yum">
-            <title>Important: Updating and Installing Kernels with Yum</title>
+            <title>Important: Updating and Installing Kernels with <application>Yum</application></title>
             <para>
               <command>yum</command> always <emphasis
                 role="strong">install</emphasis>s a new kernel in the same sense that <application>RPM</application>&#160;<emphasis>installs</emphasis> a new kernel when you use the command <command>rpm -i kernel</command>. Therefore, you do not need to worry about the distinction between <emphasis>installing</emphasis> and <emphasis>upgrading</emphasis> a kernel package when you use <command>yum</command>: it will do the right thing, regardless of whether you are using the <command>yum update</command> or <command>yum install</command> command.</para>
@@ -144,7 +144,7 @@ Is this ok [y/N]:</screen>
       <para>To update all packages and their dependencies, simply enter <command>yum update</command> (without any arguments):</para>
       <example
         id="ex-Updating_all_packages_at_once">
-        <title>Updating all packages at once</title>
+        <title>Updating All Packages at Once</title>
         <screen>~]# <command>yum update</command></screen>
       </example>
     </section>
@@ -271,7 +271,7 @@ Warning: No matches found for: meld</screen>
         <para>The following examples show both methods:</para>
         <example
           id="ex-Filtering_results_using_a_single_glob_expression_with_two_escaped_wildcards">
-          <title>Filtering results using a single glob expression with two escaped wildcard characters</title>
+          <title>Filtering Results Using a Single Glob Expression with Two Escaped Wildcard Characters</title>
           <screen>~]# <command>yum list available gstreamer\*plugin\*</command>
 Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
 Updating Red Hat repositories.
@@ -285,7 +285,7 @@ gstreamer-plugins-good.i686                   0.10.18-1.el6            rhel</scr
         </example>
         <example
           id="ex-Filtering_results_using_a_double-quoted_glob_expression">
-          <title>Filtering results using a double-quoted glob expression</title>
+          <title>Filtering Results Using a Double-Quoted Glob Expression</title>
           <screen>~]# <command>yum list installed &quot;krb?-*&quot;</command>
 Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
 Updating Red Hat repositories.
@@ -302,7 +302,7 @@ krb5-workstation.x86_64                  1.8.1-3.el6                  @rhel</scr
             </command> — List information on installed and available packages matching all glob expressions.</para>
           <example
             id="ex-Listing_all_ABRT_addons_and_plugins_using_glob_expressions">
-            <title>Listing all ABRT addons and plugins using glob expressions</title>
+            <title>Listing All ABRT Addons and Plugins Using Glob Expressions</title>
             <screen>~]# <command>yum list abrt-addon\* abrt-plugin\*</command>
 Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
 Updating Red Hat repositories.
@@ -447,7 +447,7 @@ yum-3.2.27-4.el6.noarch
     </section>
     <section
       id="sec-Installing">
-      <title>Installing</title>
+      <title>Installing Packages</title>
       <indexterm>
         <primary>packages</primary>
         <secondary>installing with Yum</secondary>
@@ -471,7 +471,7 @@ yum-3.2.27-4.el6.noarch
       <para>What if you know you want to install the package that contains the <filename>named</filename> binary, but don't know in which bin or sbin directory that file lives? In that situation, you can give <command>yum provides</command> a glob expression:</para>
       <example
         id="ex-Finding_which_package_owns_a_file_and_installing_it">
-        <title>Finding which package owns a file and installing it</title>
+        <title>Finding which Package Owns a File and Installing It</title>
         <screen>~]# <command>yum provides &quot;*bin/named&quot;</command>
 Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
 Updating Red Hat repositories.
@@ -484,8 +484,8 @@ Filename    : /usr/sbin/named
 ~]# <command>yum install bind</command></screen>
       </example>
       <note
-        id="note-Note">
-        <title>Note</title>
+        id="note-Note-yum_provides_and_yum_whatprovides">
+        <title>Note: <command>yum provides</command> and <command>yum whatprovides</command></title>
         <para>
           <command>yum provides</command> is the same as <command>yum whatprovides</command>.</para>
       </note>
@@ -506,11 +506,11 @@ Filename    : /usr/sbin/named
         <secondary>installing a package group with Yum</secondary>
       </indexterm>
       <para>A package group is similar to a package: it is not useful by itself, but installing one pulls a group of dependent packages that serve a common purpose. A package group has a name and a groupid. The <command>yum grouplist -v</command> command lists the names of all package groups, and, next to each of them, their <firstterm>groupid</firstterm> in parentheses. The groupid is always the term in the last pair of parentheses, such as <literal>kde-desktop</literal> and <literal>kde-software-development</literal> in this example:</para>
-      <important>
-        <title>Not all packages used in examples may be available on RHN</title>
+      <note>
+        <title>Note: Not All Packages Used in Examples May Be Available on RHN</title>
         <para>Some of the software packages—or package groups—queried for and installed with <application>Yum</application> in this chapter may not be available from Red Hat Network. Their use in examples is purely to demonstrate <application>Yum</application>'s command usage.</para>
         <para>Note that obtaining and installing software packages from unverified or untrusted software sources other than Red Hat Network constitutes a potential security risk, and could lead to security, stability, compatibility maintainability issues.</para>
-      </important>
+      </note>
       <screen>~]# <command>yum -v grouplist kde\*</command>
 Loading "rhnplugin" plugin
 Loading "product-id" plugin
@@ -536,7 +536,7 @@ Done</screen>
     </section>
     <section
       id="sec-Removing">
-      <title>Removing</title>
+      <title>Removing Packages</title>
       <indexterm>
         <primary>packages</primary>
         <secondary>uninstalling packages with Yum</secondary>
@@ -583,14 +583,14 @@ Done</screen>
       <para>You can remove a package group using syntax congruent with the <command>install</command> syntax.</para>
       <example
         id="ex-Alternative_but_equivalent_ways_of_removing_a_package_group">
-        <title>Alternative but equivalent ways of removing a package group</title>
+        <title>Alternative But Equivalent Ways of Removing a Package Group</title>
         <screen>~]# <command>yum groupremove &quot;KDE Desktop&quot;</command>
 ~]# <command>yum groupremove kde-desktop</command>
 ~]# <command>yum remove @kde-desktop</command></screen>
       </example>
       <important
         id="important-Smart_package_group_removal">
-        <title>Smart package group removal</title>
+        <title>Important: Smart Package Group Removal</title>
         <indexterm>
           <primary>packages</primary>
           <secondary>removing package groups with Yum</secondary>
@@ -796,7 +796,7 @@ installonly_limit=3
               <constant>0</constant> — Disable all <application>Yum</application> plugins globally.</para>
             <important
               id="important-Disabling_plugins_is_not_advised-main_options">
-              <title>Disabling plugins is not advised</title>
+              <title>Important: Disabling Plugins Is Not Advised</title>
               <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem class="systemname">RHN Classic</systemitem>, and <application>product-id</application> and <application>subscription-manager</application> plugins enable connecting to the certificate-based <systemitem class="systemname">Content Delivery Network</systemitem> (<acronym>CDN</acronym>). Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
             </important>
             <para>
@@ -937,7 +937,7 @@ baseurl=http://path/to/repo or ftp://path/to/repo or file://path/to/local/repo</
         To define a custom variable or to override the value of an existing one, create a file with the same name as the variable (without the <quote><literal>$</literal></quote> sign) in the <filename class="directory">/etc/yum/vars/</filename> directory, and add the desired value on its first line.
       </para>
       <example id="exam-Using_Yum_Variables">
-        <title>Using a custom Yum variable</title>
+        <title>Using a Custom <application>Yum</application> Variable</title>
         <para>
           Repository descriptions often include the operating system name. To define a new variable called <varname>$osname</varname>, create a new file with <quote>&MAJOROS;</quote> on the first line and save it as <filename>/etc/yum/vars/osname</filename>. For example:
         </para>
@@ -958,7 +958,7 @@ baseurl=http://path/to/repo or ftp://path/to/repo or file://path/to/local/repo</
       <para>To set up a <application>Yum</application> repository, follow these steps:</para>
       <procedure
         id="procedure-Setting_Up_a_Yum_repository">
-        <title>Setting Up a <application>Yum</application> repository</title>
+        <title>Setting Up a <application>Yum</application> Repository</title>
         <step>
           <para>Install the <filename>createrepo</filename> package:</para>
           <screen>~]# <command>yum install createrepo</command></screen>
@@ -1012,13 +1012,13 @@ Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
       <para>You can disable all plugins by changing this line to <command>plugins=0</command>.</para>
       <important
         id="important-Disabling_plugins_is_not_advised-plugins">
-        <title>Disabling plugins is not advised</title>
+        <title>Important: Disabling Plugins Is Not Advised</title>
         <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem class="systemname">RHN Classic</systemitem>, and <application>product-id</application> and <application>subscription-manager</application> plugins enable connecting to the certificate-based <systemitem class="systemname">Content Delivery Network</systemitem> (<acronym>CDN</acronym>). Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
       </important>
       <para>Every installed plugin has its own configuration file in the <filename>/etc/yum/pluginconf.d/</filename> directory. You can set plugin-specific options in these files. For example, here is the <application>security</application> plugin's <filename>security.conf</filename> configuration file:</para>
       <example
         id="ex-A_minimal_Yum_plugin_configuration_file">
-        <title>A minimal <application>Yum</application> plugin configuration file</title>
+        <title>A Minimal <application>Yum</application> Plugin Configuration File</title>
         <screen>[main]
 enabled=1</screen>
       </example>
@@ -1028,7 +1028,7 @@ enabled=1</screen>
       <para>If you simply want to disable one or more <application>Yum</application> plugins for a single <command>yum</command> command, then you can add the <option>--disableplugin=&lt;plugin_name&gt;</option> option to the command:</para>
       <example
         id="ex-Disabling_the_presto_plugin_while_running_yum_update">
-        <title>Disabling the presto plugin while running yum update</title>
+        <title>Disabling the <application>presto</application> Plugin While Running <command>yum update</command></title>
         <screen>~]# <command>yum update --disableplugin=presto</command></screen>
       </example>
       <para>The plugin names you provide to the <option>--disableplugin=</option> option are the same names listed after the <command>Loaded plugins:</command> line in the output of any <command>yum</command> command. You can disable multiple plugins by separating their names with commas. In addition, you can match multiple similarly-named plugin names or simply shorten long ones by using glob expressions: <option>--disableplugin=presto,refresh-pack*</option>.</para>
@@ -1064,7 +1064,7 @@ enabled=1</screen>
               To configure the <application>kabi</application> plugin, edit the configuration file located in <filename>/etc/yum/pluginconf.d/kabi.conf</filename>. Refer to <xref linkend="tab-Yum_Plugins-kabi" /> for a list of directives that can be used in the <option>[main]</option> section, and <xref linkend="exam-Yum_Plugins-kabi" /> for a sample configuration.
             </para>
             <table id="tab-Yum_Plugins-kabi">
-              <title>Supported <filename>/etc/yum/pluginconf.d/kabi.conf</filename> directives</title>
+              <title>Supported <filename>/etc/yum/pluginconf.d/kabi.conf</filename> Directives</title>
               <tgroup cols="2">
                 <colspec colname="directive" colnum="1" colwidth="30*" />
                 <colspec colname="description" colnum="2" colwidth="70*" />
@@ -1107,7 +1107,7 @@ enabled=1</screen>
               </tgroup>
             </table>
             <example id="exam-Yum_Plugins-kabi">
-              <title>The default kabi configuration</title>
+              <title>The Default <application>kabi</application> Configuration</title>
               <screen>[main]
 enabled=1
 whitelists=/lib/modules/kabi
diff --git a/en-US/images/entitlements-subscriptions.png b/en-US/images/entitlements-subscriptions.png
index f2bc9cc..29d5db3 100644
Binary files a/en-US/images/entitlements-subscriptions.png and b/en-US/images/entitlements-subscriptions.png differ
diff --git a/en-US/images/ents-compliant.png b/en-US/images/ents-compliant.png
index adee9bc..b310444 100644
Binary files a/en-US/images/ents-compliant.png and b/en-US/images/ents-compliant.png differ
diff --git a/en-US/images/rhsm-compliance.png b/en-US/images/rhsm-compliance.png
index f3a44bf..240ea77 100644
Binary files a/en-US/images/rhsm-compliance.png and b/en-US/images/rhsm-compliance.png differ
diff --git a/en-US/images/rhsm-compliance2.png b/en-US/images/rhsm-compliance2.png
index 91939ee..72bc4a2 100644
Binary files a/en-US/images/rhsm-compliance2.png and b/en-US/images/rhsm-compliance2.png differ
diff --git a/en-US/images/rhsm-subscribe-prod.png b/en-US/images/rhsm-subscribe-prod.png
index ac9e64f..508bf15 100644
Binary files a/en-US/images/rhsm-subscribe-prod.png and b/en-US/images/rhsm-subscribe-prod.png differ
diff --git a/en-US/images/rhsm-subscribed.png b/en-US/images/rhsm-subscribed.png
index b92fc8b..a76e7ae 100644
Binary files a/en-US/images/rhsm-subscribed.png and b/en-US/images/rhsm-subscribed.png differ
diff --git a/en-US/images/rhsm-uploadcerts.png b/en-US/images/rhsm-uploadcerts.png
index e73e2e4..5f4e178 100644
Binary files a/en-US/images/rhsm-uploadcerts.png and b/en-US/images/rhsm-uploadcerts.png differ


More information about the docs-commits mailing list