[user-guide] actually put printing chapter into guide. Fix some XML to be valid for build.

Tue Oct 26 00:26:23 UTC 2010

commit 4a0f935b808ccaa53a0912855d8c9353a34dd830
Author: Susan Lauber <laubersm at fedoraproject.org>
Date:   Mon Oct 25 20:26:10 2010 -0400

    actually put printing chapter into guide.  Fix some XML to be valid for build.

 en-US/Printing.xml   |   20 ++++++++++----------
 en-US/User_Guide.xml |    1 +
 2 files changed, 11 insertions(+), 10 deletions(-)
---

diff --git a/en-US/Printing.xml b/en-US/Printing.xml
index e2cdf5f..fc7a9f5 100644
--- a/en-US/Printing.xml
+++ b/en-US/Printing.xml
@@ -15,17 +15,17 @@
 	graphical program, with some discussion of the basic command-line tools. 
 	</para>
 
-	<section id="sect-User_Guide-Printing-adding_a_single_printer">
+	<section id="sect-User_Guide-Printing-single_printer">
 		<title>Adding a Single Printer</title>
 		<para>Most users need to connect to a single printer, often connected
 		to the computer by a USB cable, although some printer models have
 		built-in network cards for wired or wireless connection to your local
 		network.  
 		</para>
-		<section id="sect-User_Guide-adding_a_single_printer-USB">
+		<section id="sect-User_Guide-Printing-single_printer-USB">
 		<title>Adding a USB printer</title>
 
-			<section id="sect-User_Guide-single_printer-USB-Gnome">
+			<section id="sect-User_Guide-Printing-single_printer-USB-Gnome">
 			<title>Adding a USB printer in Gnome</title>
 			<para>For a USB printer, Fedora makes the setup as easy as possible:
 			simply plug the USB cable into the computer.  You'll be prompted to install
@@ -40,7 +40,7 @@
 			this process completes, the printer is installed and ready for use.</para>
 			</section>
 
-			<section id="sect-User_Guide-single_printer-KDE">
+			<section id="sect-User_Guide-Printing-single_printer-USB-KDE">
 			<title>Adding a USB printer in KDE</title>
 			<para>The KDE printing applet automates the installation of many models of printer.
 			Simply plug the printer in and in a few seconds it will be added to the system.
@@ -54,7 +54,7 @@
 		</section>
 
 
-		<section id="sect-User_Guide-adding_a_single_printer-Network">
+		<section id="sect-User_Guide-Printing-single_printer-Network">
 		<title>Adding a network printer</title>
 		<para>In some cases, the printer might not be in reach of a USB cable, or it might be
 		shared by several different computers.  One way to solve this is to print over
@@ -63,7 +63,7 @@
 		with a network connection, even if it's in a different room.</para>
 
 
-			<section id="sect-User_Guide-single_printer-Network-Gnome">
+			<section id="sect-User_Guide-Printing-single_printer-Network-Gnome">
 			<title>Adding a network printer in Gnome</title>
 			<para>Even if the printer is on your local network, connecting is still
 			easy.  To start, open the printing configuration.  In GNOME, this is 
@@ -98,7 +98,7 @@
 			</para>
 			</section>
 
-			<section id="sect-User_Guide-single_printer-Network-KDE">
+			<section id="sect-User_Guide-Printing-single_printer-Network-KDE">
 			<title>Adding a network printer in KDE</title>
 			<!--KDE printing is made slightly more difficult by https://bugs.kde.org/show_bug.cgi?id=248308 -->
 			<para> In KDE, you first have to launch the Sytem Settings program.  Press
@@ -158,8 +158,8 @@
 		<para>KDE does not have an option for connecting to all queues on a remote printer.
 		To add printers connected to a print server, follow the directions above.</para>
 		</section>
-
-	<note>
+	
+	<section id="sect-User_Guide-Printing-print_server-files">
 	<title>Connecting to a print server from the CUPS configuration files</title>
 	<para>Regardless of the desktop environment in use, a computer can be connected to a CUPS
 	print server by editing the file <filename>/etc/cups/client.conf</filename>.  By default,
@@ -168,7 +168,7 @@
 	where <replaceable>server</replaceable>is the host name or IP address of the server.  All
 	of the available print queues on that system will immediately be shown on the client
 	computer.</para>
-	</note>
+	</section>
 	</section>	
 	
 	<section id="sect-User_Guide-Printing-send_a_job">
diff --git a/en-US/User_Guide.xml b/en-US/User_Guide.xml
index 2bb81e9..4026767 100644
--- a/en-US/User_Guide.xml
+++ b/en-US/User_Guide.xml
@@ -15,6 +15,7 @@
 	<xi:include href="Connecting_to_the_Internet.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
 	<xi:include href="Accessing_the_Web.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
 	<xi:include href="Communications.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+	<xi:include href="Printing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
 	<xi:include href="Office_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
 	<xi:include href="Financial_software.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
 	<xi:include href="Playing_multimedia.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
