[deployment-guide: 87/185] minor update of the SSSD chapter, 2 patches applied from ekopalov on printer chapter

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


commit b43da5cd23e69d0fff015b5475e81b16361ffa22
Author: Martin Prpic <mprpic at redhat.com>
Date:   Wed Feb 9 13:59:19 2011 +0100

    minor update of the SSSD chapter, 2 patches applied from ekopalov on printer chapter

 en-US/Printer_Configuration.xml           | 1773 +++++++++++++++++++----------
 en-US/SSSD.xml                            |   27 +-
 en-US/images/gnome-print-manager-list.png |  Bin 9276 -> 22007 bytes
 en-US/images/gnome-print-queue.png        |  Bin 9498 -> 85016 bytes
 en-US/images/print_conf_print-job.png     |  Bin 0 -> 22007 bytes
 en-US/images/print_conf_window.png        |  Bin 0 -> 25527 bytes
 en-US/images/printconf-add-printer.png    |  Bin 24113 -> 25284 bytes
 en-US/images/printconf-config1.png        |  Bin 45311 -> 38068 bytes
 en-US/images/printconf-config2.png        |  Bin 30893 -> 36077 bytes
 en-US/images/printconf-config3.png        |  Bin 34432 -> 24632 bytes
 en-US/images/printconf-config4.png        |  Bin 36553 -> 158664 bytes
 en-US/images/printconf-config5.png        |  Bin 33780 -> 58801 bytes
 en-US/images/printconf-config6.png        |  Bin 0 -> 117540 bytes
 en-US/images/printconf-ipp.png            |  Bin 25875 -> 36645 bytes
 en-US/images/printconf-jetdirect.png      |  Bin 26510 -> 31625 bytes
 en-US/images/printconf-lpd.png            |  Bin 13551 -> 35202 bytes
 en-US/images/printconf-select-driver.png  |  Bin 0 -> 35786 bytes
 en-US/images/printconf-select-model.png   |  Bin 61313 -> 38501 bytes
 en-US/images/printconf-smb.png            |  Bin 41883 -> 47605 bytes
 19 files changed, 1219 insertions(+), 581 deletions(-)
---
diff --git a/en-US/Printer_Configuration.xml b/en-US/Printer_Configuration.xml
index 80a5421..e867cc2 100644
--- a/en-US/Printer_Configuration.xml
+++ b/en-US/Printer_Configuration.xml
@@ -1,609 +1,1222 @@
 <?xml version='1.0'?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
-<section id="s1-Printer_Configuration">
+<section id="sec-Printer_Configuration">
   <title>Printer Configuration</title>
-  <indexterm
-    significance="normal">
+<!-- <indexterm significance="normal">
     <primary>
       <application>printtool</application>
     </primary>
     <see>printer configuration</see>
-  </indexterm>
-  <indexterm
+  </indexterm>-->
+<!-- <indexterm
     significance="normal">
     <primary>
       <command>system-config-printer</command>
     </primary>
     <see>printer configuration</see>
-  </indexterm>
-  <indexterm
+  </indexterm>-->
+<!-- <indexterm
     significance="normal">
     <primary>
       <command>printconf</command>
     </primary>
     <see>printer configuration</see>
-  </indexterm>
-  <indexterm
+  </indexterm>-->
+<!-- <indexterm
     significance="normal">
     <primary>
-      <application>Printer Configuration Tool</application>
+      <application>Printer Configuration</application> tool
     </primary>
     <see>printer configuration</see>
-  </indexterm>
-  <indexterm
+  </indexterm>-->
+<!-- <indexterm
     significance="normal">
     <primary>printer configuration</primary>
-  </indexterm>
+  </indexterm>-->
   <para>
-    <application>Printer Configuration Tool</application> allows users to configure a printer. This tool helps maintain the printer configuration file, print spool directories, print filters, and printer classes.</para>
-  <indexterm
-    significance="normal">
-    <primary>CUPS</primary>
-  </indexterm>
-  <indexterm
-    significance="normal">
-    <primary>printer configuration</primary>
-    <secondary>CUPS</secondary>
-  </indexterm>
-  <para>&MAJOROSVER; uses the Common Unix Printing System (<acronym>CUPS</acronym>). If a system was upgraded from a previous &MAJOROS; version that used CUPS, the upgrade process preserves the configured queues.</para>
-  <para>Using <application>Printer Configuration Tool</application> requires root privileges. To start the application, select System (on the panel) &gt; <guimenu>Administration</guimenu> &gt; <guimenuitem>Printing</guimenuitem>, or type the command <command>system-config-printer</command> at a shell prompt.</para>
-  <figure
-    float="0"
-    id="fig-printconf-main">
-    <title>
-      <application>Printer Configuration Tool</application>
-    </title>
-    <mediaobject>
-      <imageobject>
-        <imagedata
-          fileref="images/printconf-main.png"
-          format="PNG"
-          scalefit="1"/>
-      </imageobject>
-      <textobject>
-        <para>Main window</para>
-      </textobject>
-    </mediaobject>
-  </figure>
-  <para>The following types of print queues can be configured:</para>
-  <itemizedlist>
-    <listitem>
-      <para>
-        <guimenuitem>AppSocket/HP JetDirect</guimenuitem> — a printer connected directly to the network through HP JetDirect or Appsocket interface instead of a computer.</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guimenuitem>Internet Printing Protocol (IPP)</guimenuitem> — a printer that can be accessed over a TCP/IP network via the Internet Printing Protocol (for example, a printer attached to another &MAJOROS; system running CUPS on the network).</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guimenuitem>LPD/LPR Host or Printer</guimenuitem> — a printer attached to a different UNIX system that can be accessed over a TCP/IP network (for example, a printer attached to another &MAJOROS; system running LPD on the network).</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guimenuitem>Networked Windows (SMB)</guimenuitem> — a printer attached to a different system which is sharing a printer over an SMB network (for example, a printer attached to a Microsoft <trademark
-          class="trade">Windows</trademark> machine).</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guimenuitem>Networked JetDirect</guimenuitem> — a printer connected directly to the network through HP JetDirect instead of a computer.</para>
-    </listitem>
-  </itemizedlist>
-  <important>
-    <title>Important</title>
-    <indexterm
-      significance="normal">
-      <primary>
-        <command>lpd</command>
-      </primary>
-    </indexterm>
-    <para>If you add a new print queue or modify an existing one, you must apply the changes for them to take effect.</para>
-  </important>
-  <para>Clicking the <guibutton>Apply</guibutton> button prompts the printer daemon to restart with the changes you have configured.</para>
-  <para>Clicking the <guibutton>Revert</guibutton> button discards unapplied changes.</para>
-  <section
-    id="s2-printing-local-printer">
-    <title>Adding a Local Printer</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>local printer</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>adding</secondary>
-      <tertiary>local printer</tertiary>
-    </indexterm>
-    <para>To add a local printer, such as one attached through a parallel port or USB port on your computer, click the <guibutton>New Printer</guibutton> button in the main <application>Printer Configuration Tool</application> window to display the window in <xref
-        linkend="fig-printconf-add"/>.</para>
-    <figure
-      float="0"
-      id="fig-printconf-add">
-      <title>
-        <application>Adding a Printer</application>
-      </title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-add-printer.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>Adding a printer</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>Click <guibutton>Forward</guibutton> to proceed.</para>
-    <para>Enter a unique name for the printer in the <guilabel>Printer Name</guilabel> field. The printer name can contain letters, numbers, dashes (-), and underscores (_); it <emphasis>must not</emphasis> contain any spaces.</para>
-    <para>You can also use the <guilabel>Description</guilabel> and <guilabel>Location</guilabel> fields to further distinguish this printer from others that may be configured on your system. Both of these fields are optional, and may contain spaces.</para>
-    <para>Click <guibutton>Forward</guibutton> to open the <guilabel>New Printer</guilabel> dialog (refer to <xref
-        linkend="fig-printconf-local"/>). If the printer has been automatically detected, the printer model appears in <guilabel>Select Connection</guilabel>. Select the printer model and click <guibutton>Forward</guibutton> to continue.</para>
-    <para>If the device does not automatically appear, select the device to which the printer is connected (such as <guilabel>LPT #1</guilabel> or <guilabel>Serial Port #1</guilabel>) in <guilabel>Select Connection</guilabel>.</para>
-    <figure
-      float="0"
-      id="fig-printconf-local">
-      <title>Adding a Local Printer</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-local.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>Adding a local printer</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>Next, select the printer type. Refer to <xref
-        linkend="s2-printing-select-model"/> for details.</para>
+    The <application>Printer Configuration</application> tool serves for printer configuring, maintenance of printer configuration files, print spool directories and print filters, and printer classes management.
+  </para>
+  
+	<para>
+		The tool is based on the Common Unix Printing System (<acronym>CUPS</acronym>). If you upgraded the system from a previous &MAJOROS; version that used CUPS, the upgrade process preserved the configured printers.
+	</para>
+	
+	<note>
+		<para>
+			You can perform the same and additional operations on printers directly from the CUPS web application or command line. To access the application, in a web browser, go to <ulink url="http://localhost:631/">http://localhost:631/</ulink>. For CUPS manuals refer to the links on the <guilabel>Home</guilabel> tab of the web site.
+		</para>
+	</note>
+
+  <section id="sec-Starting_Printer_Config">
+    <title>Starting the Printer Configuration Tool</title>
+    
+    <para>
+    	With the Printer Configuration tool you can perform various operations on existing printers and set up new printers. However, you can use also CUPS directly (go to <ulink url="http://localhost:631/">http://localhost:631/</ulink> to access CUPS).
+    </para>
+    
+		<para>
+			On the panel, click <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Printing</guimenuitem></menuchoice>, or run the <command>system-config-printer</command> command from the command line to start the tool.
+		</para>
+		
+		<para>
+			The <guilabel>Printer Configuration</guilabel> window depicted in <xref	linkend="fig-printconf-main"/> appears.
+			<figure id="fig-printconf-main">
+				<title>Printer Configuration window</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-main.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Printer Configuration window</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+	 </para>
+<!-- <indexterm significance="normal">
+	 	<primary>CUPS</primary>
+	 </indexterm>-->
+<!-- <indexterm significance="normal">
+		<primary>printer configuration</primary>
+		<secondary>CUPS</secondary>
+	 </indexterm>-->
   </section>
-  <section
-    id="s2-printing-ipp-printer">
-    <title>Adding an IPP Printer</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>networked CUPS (IPP) printer</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>IPP printer</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>adding</secondary>
-      <tertiary>CUPS (IPP) printer</tertiary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>adding</secondary>
-      <tertiary>IPP printer</tertiary>
-    </indexterm>
-    <para>An IPP printer is a printer attached to a different system on the same TCP/IP network. The system this printer is attached to may either be running CUPS or simply configured to use IPP.</para>
-    <para>If a firewall is enabled on the printer server, then the firewall should be configured to allow send / receive connections on the incoming UDP port 631. If a firewall is enabled on the client (the system sending the print request) then the firewall should be configured to allow accept and create connections through port 631.</para>
-    <para>You can add a networked IPP printer by clicking the <guibutton>New Printer</guibutton> button in the main <application> Printer Configuration Tool</application> window to display the window in <xref
-        linkend="fig-printconf-add"/>. Enter the <guilabel>Printer Name</guilabel> (printer names cannot contain spaces and may contain letters, numbers, dashes (-), and underscores (_)), <guilabel>Description</guilabel>, and <guilabel>Location</guilabel> to distinguish this printer from others that you may configure on your system. Click <guibutton>Forward</guibutton> to proceed.</para>
-    <para>In the window shown in <xref
-        linkend="fig-printconf-ipp"/>, enter the hostname of the IPP printer in the <guilabel>Hostname</guilabel> field as well as a unique name for the printer in the <guilabel>Printername</guilabel> field.</para>
-    <figure
-      float="0"
-      id="fig-printconf-ipp">
-      <title>Adding an IPP Printer</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-ipp.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>Networked IPP Printer</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>Click <guibutton>Forward</guibutton> to continue.</para>
-    <para>Next, select the printer type. Refer to <xref
-        linkend="s2-printing-select-model"/> for details.</para>
-  </section>
-  <section
-    id="s2-printing-smb-printer">
-    <title>Adding a Samba (SMB) Printer</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>Samba (SMB) printer</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>adding</secondary>
-      <tertiary>Samba (SMB) printer</tertiary>
-    </indexterm>
-    <para>You can add a Samba (SMB) based printer share by clicking the <guibutton>New Printer</guibutton> button in the main <application> Printer Configuration Tool</application> window to display the window in <xref
-        linkend="fig-printconf-add"/>. Enter a unique name for the printer in the <guilabel>Printer Name</guilabel> field. The printer name can contain letters, numbers, dashes (-), and underscores (_); it <emphasis>must not</emphasis> contain any spaces.</para>
-    <para>You can also use the <guilabel>Description</guilabel> and <guilabel>Location</guilabel> fields to further distinguish this printer from others that may be configured on your system. Both of these fields are optional, and may contain spaces.</para>
-    <figure
-      float="0"
-      id="fig-printconf-smb">
-      <title>Adding a SMB Printer</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-smb.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>SMB Printer</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>As shown in <xref
-        linkend="fig-printconf-smb"/>, available SMB shares are automatically detected and listed in the <guilabel>Share</guilabel> column. Click the arrow (
-			<inlinemediaobject>
+  
+
+		<!-- <bridgehead id="bh-Printer_Driver">Printer Driver</bridgehead>
+			<para>
+				During printer installation you need to provide the printer driver to be used. You can select one of the following options:
+			</para>
+			
+			<variablelist>
+				<varlistentry>
+					<term>Select printer from database</term>
+					<listitem>
+						<para>
+							loads the driver based on the printer model from the built-in driver database
+						</para>
+					</listitem>
+				</varlistentry>
+				
+				<varlistentry>
+					<term>Provide PPD file</term>
+					<listitem>
+						<para>
+							uses a local PPD file
+						</para>
+					</listitem>
+				</varlistentry>
+			
+				<varlistentry>
+					<term>Search for a printer driver to download</term>
+					<listitem>
+						<para>
+							searches Internet for the printer driver
+						</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
+			
+			<bridgehead id="bh-Supported_Network_Protocols">Supported Network Protocols</bridgehead>
+			<para>
+				The Printer Configuration tool supports the following protocol types of print queues:
+			</para>
+			
+			<itemizedlist>
+				<listitem>
+					<para>
+						<guimenuitem>AppSocket/HP JetDirect</guimenuitem> — a printer connected directly to the network through HP JetDirect or Appsocket interface instead of a computer.
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<guimenuitem>Internet Printing Protocol (IPP)</guimenuitem> — a printer that can be accessed over a TCP/IP network with the Internet Printing Protocol (for example, a printer attached to another &MAJOROS; system running CUPS on the network).
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<guimenuitem>Internet Printing Protocol (HTTP)</guimenuitem> — <remark>a printer that can be accessed over a TCP/IP network with HTTP</remark>.
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<guimenuitem>LPD/LPR Host or Printer</guimenuitem> — a printer attached to a different UNIX system that can be accessed over a TCP/IP network (for example, a printer attached to another &MAJOROS; system running LPD on the network).
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<guimenuitem>Windows Printer via SAMBA</guimenuitem> — a printer attached to a different system which is sharing a printer over an SMB network (for example, a printer attached to a Microsoft <trademark	class="trade">Windows</trademark> machine).
+					</para>
+				</listitem>
+			 </itemizedlist> -->
+
+  	
+		<section id="sec-Setting_Printer">
+			<title>Starting Printer Setup</title>
+<!-- <indexterm significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>local printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>local printer</tertiary>
+			</indexterm>-->
+			
+			<para>
+				Printer setup process varies depending on the printer queue type.
+			</para>
+
+			<para>
+				If you are setting up a local printer connected with USB, the printer is discovered and added automatically. You will be prompted to confirm the packages to be installed and provide the root password. Local printers connected with other port types and network printers need to be set up manually.
+			</para>
+
+			<procedure id="proc-Setting_up_Printer">
+				<para>
+					Follow this procedure to start a manual printer setup:
+				</para>
+
+				<step>
+					<para>
+						Start the Printer Configuration tool (refer to <xref linkend="sec-Starting_Printer_Config"/>).
+					</para>
+				</step>
+				<step>
+					<para>
+						Go to <menuchoice><guimenu>Server</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Printer</guimenuitem></menuchoice>.
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						In the <guilabel>Authenticate</guilabel> dialog box, type the root user password and confirm.	
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Select the printer connection type and provide its details in the area on the right (refer to <xref linkend="sec-Defining_Printer_Queue"/>).
+				<!--	<stepalternatives>
+						<step>
+							<para>
+								Serial Port #1
+								<itemizedlist>
+									<listitem>
+										<para>
+											Baud Rate
+										</para>
+									</listitem>
+								
+									<listitem>
+										<para>
+											Parity
+										</para>
+									</listitem>
+									
+									<listitem>
+										<para>
+											Data Bits
+										</para>
+									</listitem>
+									
+									<listitem>
+										<para>
+											Flow Control
+										</para>
+									</listitem>
+								</itemizedlist>
+							</para>
+						</step>
+						
+						<step>
+							<para>
+								Other
+								<itemizedlist>
+									<listitem>
+										<para>
+											URI (Uniform Resource Identifier; for example lpd://192.168.1.1/p1)
+										</para>
+									</listitem>
+								</itemizedlist>
+								-->
+								<figure>
+									<title>Adding a Local Printer</title>
+									<mediaobject>
+										<imageobject>
+											<imagedata
+												fileref="images/print_conf_window.png"
+												format="PNG"
+												scalefit="0"/>
+										</imageobject>
+										<textobject>
+											<para>Adding a local printer</para>
+										</textobject>
+									</mediaobject>
+								</figure>
+							</para>
+					<!-- 	</step>
+					</stepalternatives> -->
+				</step>
+			</procedure>
+		</section>
+
+		<section id="sec-Defining_Printer_Queue">
+		  <title>Adding Printer</title>
+		  <para>
+		  	When setting up printers you need to select the printer connection type and define its parameters (parameters depend on the printer type).
+		  </para>
+		  
+			<section id="sec-Adding_Other_Printer">
+				<title>Adding a Local Printer</title>
+				
+				<para>
+					Follow this procedure to add a local printer connected with other than a serial port:
+				</para>
+				<procedure id="proc-Adding_Other_Printer">
+					<step>
+						<para>
+							Open the <systemitem>New Printer</systemitem> dialog (refer to <xref linkend="sec-Starting_Printer_Config"/>).
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							If the device does not appear automatically, select the devices to which the printer is connected in the list on the left (such as <guilabel>Serial Port #1</guilabel> or <guilabel>Other</guilabel>.
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							On the right, enter the connection properties:
+						<variablelist>
+							<varlistentry>
+							<term>for <guilabel>Other</guilabel></term>
+								<listitem>
+									<para>
+										<guilabel>URI</guilabel> (for example file:/dev/lp0)
+									</para>
+								</listitem>
+							</varlistentry>
+									
+							<varlistentry>
+								<term>for <guilabel>Serial Port</guilabel></term>
+								<listitem>
+									<para>
+										Baud Rate
+									</para>
+									<para>
+										Parity
+									</para>
+									<para>
+										Data Bits
+									</para>
+									<para>
+										Flow Control
+									</para>
+								</listitem>
+							</varlistentry>
+						</variablelist>
+					</para>
+				</step>
+					
+				<step>
+					<para>
+						Click <guibutton>Forward</guibutton>.
+					</para>
+				</step>
+					
+				<step>
+					<para>
+						Select the printer model. Refer to <xref linkend="s1-printing-select-model"/> for details.
+					</para>
+				</step>
+			</procedure>
+		</section>
+
+		<section id="s1-printing-jetdirect-printer">
+			<title>Adding an AppSocket/HP JetDirect Printer</title>
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>JetDirect printer</secondary>
+			</indexterm>-->
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>JetDirect printer</tertiary>
+			</indexterm>-->
+				<para>
+					Follow this procedure to add an AppSocket/HP JetDirect printer:
+				</para>
+				<procedure id="proc-Adding_JetDirect_Printer">
+					<step>
+						<para>
+							Open the <systemitem>New Printer</systemitem> dialog (refer to <xref linkend="sec-Starting_Printer_Config"/>).
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							In the list on the left, select <menuchoice><guimenu>Network Printer</guimenu><guimenuitem>AppSocket/HP JetDirect</guimenuitem></menuchoice>.
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							On the right, enter the connection settings:
+						<variablelist>
+							<varlistentry>
+							<term><guilabel>Hostname</guilabel></term>
+								<listitem>
+									<para>
+										printer hostname or IP address
+									</para>
+								</listitem>
+							</varlistentry>
+									
+							<varlistentry>
+								<term><guilabel>Port Number</guilabel></term>
+								<listitem>
+									<para>
+										printer port listening for print jobs (<literal>9100</literal> by default)
+									</para>
+								</listitem>
+							</varlistentry>
+						</variablelist>
+						
+						<figure	float="0"	id="fig-printconf-jetdirect">
+							<title>Adding a JetDirect Printer</title>
+							<mediaobject>
+								<imageobject>
+									<imagedata
+										fileref="images/printconf-jetdirect.png"
+										format="PNG"
+										scalefit="0"/>
+								</imageobject>
+								<textobject>
+									<para>Adding a JetDirect Printer</para>
+								</textobject>
+							</mediaobject>
+						</figure>
+					</para>
+				</step>
+					
+				<step>
+					<para>
+						Click <guibutton>Forward</guibutton>.
+					</para>
+				</step>
+					
+				<step>
+					<para>
+						Select the printer model. Refer to <xref linkend="s1-printing-select-model"/> for details.
+					</para>
+				</step>
+			</procedure>
+		</section>
+			
+		<section id="s1-printing-ipp-printer">
+			<title>Adding an IPP Printer</title>
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>networked CUPS (IPP) printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>IPP printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>CUPS (IPP) printer</tertiary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>IPP printer</tertiary>
+			</indexterm>-->
+			
+			<para>
+				An IPP printer is a printer attached to a different system on the same TCP/IP network. The system this printer is attached to may either be running CUPS or simply configured to use IPP.
+			</para>
+			
+			<para>
+				If a firewall is enabled on the printer server, then the firewall must be configured to allow send / receive connections on the incoming UDP port 631. If a firewall is enabled on the client (the system sending the print request) then the firewall must allow connection accepting and creating through port 631.
+			</para>
+	<!--  
+			<para>
+				You can add a networked IPP printer by clicking the <guibutton>New Printer</guibutton> button in the main <application> Printer Configuration Tool</application> window to display the window in <xref linkend="fig-printconf-add"/>. Enter the <guilabel>Printer Name</guilabel> (printer names cannot contain spaces and may contain letters, numbers, dashes (-), and underscores (_)), <guilabel>Description</guilabel>, and <guilabel>Location</guilabel> to distinguish this printer from others that you may configure on your system. Click <guibutton>Forward</guibutton> to proceed.
+			</para>
+			-->		
+			<procedure id="proc-Adding_IPP_Printer">
+				<para>
+					Follow this procedure to add an IPP printer:
+				</para>
+				<step>
+					<para>
+						Open the <systemitem>New Printer</systemitem> dialog (refer to <xref linkend="sec-Setting_Printer"/>).
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						In the list of devices on the left, select <guimenu>Network Printer</guimenu> and <guimenuitem>Internet Printing Protocol (ipp)</guimenuitem> or <guimenuitem>Internet Printing Protocol (https)</guimenuitem>.
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						On the right, enter the connection settings:
+						<variablelist>
+							<varlistentry>
+								<term><guilabel>Host</guilabel></term>
+								<listitem>
+									<para>
+										the hostname of the IPP printer
+									</para>
+								</listitem>
+							</varlistentry>
+							
+							<varlistentry>
+								<term><guilabel>Queue</guilabel></term>
+								<listitem>
+									<para>
+										queue name <!-- TODO what is this? also check the VERIFY button -->
+									</para>
+								</listitem>
+							</varlistentry>
+						</variablelist>
+							
+						<figure	float="0"	id="fig-printconf-ipp">
+							<title>Adding an IPP Printer</title>
+							<mediaobject>
+								<imageobject>
+									<imagedata
+										fileref="images/printconf-ipp.png"
+										format="PNG"
+										scalefit="0"/>
+								</imageobject>
+								<textobject>
+									<para>Networked IPP Printer</para>
+								</textobject>
+							</mediaobject>
+						</figure>
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Click <guibutton>Forward</guibutton> to continue.
+					</para>
+				</step>
+
+				<step>
+					<para>
+						Select the printer model. Refer to <xref	linkend="s1-printing-select-model"/> for details.
+					</para>
+				</step>
+			</procedure>
+		</section>
+		
+		<section id="sec-printing-LPDLPR-printer">
+			<title>Adding an LPD/LPR Host or Printer</title>
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>networked CUPS (LPD/LPR) printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>LPD/LPR printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>CUPS (LPD/LPR) printer</tertiary>
+			</indexterm>-->
+			
+<!-- <indexterm
+				significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>LPD/LPR printer</tertiary>
+			</indexterm>-->
+	
+			<procedure id="proc-Adding_HTTPS_Printer">
+				<para>
+					Follow this procedure to add an LPD/LPR host or printer:
+				</para>
+				<step>
+					<para>
+						Open the <systemitem>New Printer</systemitem> dialog (refer to <xref linkend="sec-Setting_Printer"/>).
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						In the list of devices on the left, select <menuchoice><guimenu>Network Printer</guimenu><guimenuitem>LPD/LPR Host or Printer</guimenuitem></menuchoice>.
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						On the right, enter the connection settings:
+						<variablelist>
+							<varlistentry>
+								<term><guilabel>Host</guilabel></term>
+								<listitem>
+									<para>
+										the hostname of the LPD/LPR printer or host
+									</para>
+									<para>
+										Optionally, click <guibutton>Probe</guibutton> to find queues on the LPD host.
+									</para>							
+								</listitem>
+							</varlistentry>
+							
+							<varlistentry>
+								<term><guilabel>Queue</guilabel></term>
+								<listitem>
+									<para>
+										queue name <!-- TODO what is this? also check the VERIFY button -->
+									</para>
+								</listitem>
+							</varlistentry>
+						</variablelist>
+						
+						<figure	float="0"	id="fig-printconf-lpd">
+							<title>Adding an LPD/LPR Printer</title>
+							<mediaobject>
+								<imageobject>
+									<imagedata
+										fileref="images/printconf-lpd.png"
+										format="PNG"
+										scalefit="0"/>
+								</imageobject>
+								<textobject>
+									<para>Adding an LPD/LPR Printer</para>
+								</textobject>
+							</mediaobject>
+						</figure>
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Click <guibutton>Forward</guibutton> to continue.
+					</para>
+				</step>
+
+				<step>
+					<para>
+						Select the printer model. Refer to <xref	linkend="s1-printing-select-model"/> for details.
+					</para>
+				</step>
+			</procedure>
+		</section>
+		
+		<section id="s1-printing-smb-printer">
+			<title>Adding a Samba (SMB) Printer</title>
+<!-- <indexterm significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>Samba (SMB) printer</secondary>
+			</indexterm>-->
+			
+<!-- <indexterm significance="normal">
+				<primary>printer configuration</primary>
+				<secondary>adding</secondary>
+				<tertiary>Samba (SMB) printer</tertiary>
+			</indexterm>-->
+			
+
+			<procedure id="proc-Adding_SMB_Printer">
+				<para>
+					Follow this procedure to add a Samba printer:
+				</para>
+				<step>
+					<para>
+						Open the <systemitem>New Printer</systemitem> dialog (refer to <xref linkend="sec-Setting_Printer"/>).
+					</para>
+				</step>
+			
+				<step>
+					<para>
+						In the list on the left, select <menuchoice><guimenu>Network Printer</guimenu><guimenuitem>Windows Printer via SAMBA</guimenuitem></menuchoice>.
+					</para>
+				</step>
+			
+				<step>
+					<para>
+						Enter the SMB address in the <guilabel>smb://</guilabel> field. Use the format <replaceable>computer name/printer share</replaceable>. In <xref	linkend="fig-printconf-smb"/>, the <replaceable>computer name</replaceable> is <command>dellbox</command> and the <replaceable>printer share</replaceable> is <command>r2</command>.
+						<figure	float="0"	id="fig-printconf-smb">
+							<title>Adding a SMB Printer</title>
+							<mediaobject>
+								<imageobject>
+									<imagedata
+										fileref="images/printconf-smb.png"
+										format="PNG"
+										scalefit="0"/>
+								</imageobject>
+								<textobject>
+									<para>SMB Printer</para>
+								</textobject>
+							</mediaobject>
+						</figure>
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Click <guibutton>Browse</guibutton> to see the available workgroups/domains. To display only queues of a particular host,
+						type in the host name (NetBios name) and click <guibutton>Browse</guibutton>
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Select either of the options:
+					</para>
+					
+					<stepalternatives>
+						<step>
+							<para>
+								<guilabel>Prompt user if authentication is required</guilabel>: username and password are collected from the user when printing a document.
+							</para>
+						</step>
+						
+						<step>
+							<para>
+								<guilabel>Set authentication details now</guilabel>: provide authentication information now so it is not required later. In the <guilabel>Username</guilabel> field, enter the username to access the printer. This user must exist on the SMB system, and the user must have permission to access the printer. The default user name is typically <userinput>guest</userinput> for Windows servers, or <userinput>nobody</userinput> for Samba servers.
+							</para>
+						</step>
+					</stepalternatives>
+				</step>
+				
+				<step>
+					<para>
+						Enter the <guilabel>Password</guilabel> (if required) for the user specified in the <guilabel>Username</guilabel> field.
+						<warning>
+							<title>Warning</title>
+							<para>
+								Samba printer usernames and passwords are stored in the printer server as unencrypted files readable by root and lpd. Thus, other users that have root access to the printer server can view the username and password you use to access the Samba printer.
+							</para>
+							
+							<para>
+								As such, when you choose a username and password to access a Samba printer, it is advisable that you choose a password that is different from what you use to access your local &MAJOROS; system.
+							</para>
+							
+							<para>
+								If there are files shared on the Samba print server, it is recommended that they also use a password different from what is used by the print queue.
+							</para>
+						</warning>
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Click <guibutton>Verify</guibutton> to test the connection. Upon successful verification, a dialog box appears confirming printer share accessibility.
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Click <guibutton>Forward</guibutton>.
+					</para>
+				</step>
+				
+				<step>
+					<para>
+						Select the printer model. Refer to <xref linkend="s1-printing-select-model"/> for details.
+					</para>
+				</step>
+			</procedure>
+		</section>
+	</section>
+		
+	<section id="s1-printing-select-model">
+		<title>Selecting the Printer Model and Finishing</title>
+		
+		<para>
+			Once you have properly selected a printer connection type, the systems attempts to acquire a driver. If the process fails, you can locate or search for the driver resources manually.
+		</para>
+		
+		<procedure id="proc-Selecting_Driver">
+			<para>
+				Follow this procedure to provide the printer driver and finish the installation:
+			</para>
+			<step>
+				<para>
+					In the window displayed after the automatic driver detection has failed, select one of the following options:
+				</para>
+				<stepalternatives>
+					<step>
+						<para>
+							<guilabel>Select a Printer from database</guilabel> — the system chooses a driver based on the selected make of your printer from the list of <guilabel>Makes</guilabel>. If your printer model is not listed, choose <guilabel>Generic</guilabel>.
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							<guilabel>Provide PPD file</guilabel> — the system uses the provided PostScript Printer Description (PPD) file for installation. A PPD file may also be delivered with your printer as being normally provided by the manufacturer. If the PPD file is available, you can choose this option and use the browser bar below the option description to select the PPD file.
+						</para>
+					</step>
+					
+					<step>
+						<para>
+							<guilabel>Search for a printer driver to download</guilabel> — enter the make and model of your printer into the <guilabel>Make and model</guilabel> field to search on OpenPrinting.org for the appropriate packages.
+						</para>
+					</step>
+				</stepalternatives>
+				
+				<figure	float="0"	id="fig-printconf-select-model">
+					<title>Selecting a Printer Brand</title>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/printconf-select-model.png" format="PNG"	scalefit="0"/>
+						</imageobject>
+							
+						<textobject>
+							<para>
+								Selecting a printer brand from the printer database brands.
+							</para>
+						</textobject>
+					</mediaobject>
+				</figure>
+			</step>
+			
+			<step>
+				<para>
+					Depending on your previous choice provide details in the area displayed below:
+					<itemizedlist>
+						<listitem>
+							<para>
+								Printer brand for the <guilabel>Select printer from database</guilabel> option 
+							</para>
+						</listitem>
+					
+						<listitem>
+							<para>
+								PPD file location for the <guilabel>Provide PPD file</guilabel> option
+							</para>
+						</listitem>
+						
+						<listitem>
+							<para>
+								Printer make and model for the <guilabel>Search for a printer driver to download</guilabel> option
+							</para>
+						</listitem>
+					</itemizedlist>
+				</para>
+			</step>
+		
+			<step>
+				<para>
+					Click <guibutton>Forward</guibutton> to continue.
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					If applicable for your option, window shown in <xref linkend="fig-printconf-select-driver"/> appears. Choose the corresponding model in the <guilabel>Models</guilabel> column on the left.
+					
+					<note>
+						<para>
+							On the right, the recommended printed driver is automatically selected; however, you can select another available driver. The print driver processes the data that you want to print into a format the printer can understand. Since a local printer is attached directly to your computer, you need a printer driver to process the data that is sent to the printer.
+						</para>
+					</note>
+					
+					<figure	float="0"	id="fig-printconf-select-driver">
+						<title>Selecting a Printer Model</title>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/printconf-select-driver.png" format="PNG"	scalefit="0"/>
+							</imageobject>
+							
+							<textobject>
+								<para>
+									Selecting a Printer Model with a Driver Menu
+								</para>
+							</textobject>
+						</mediaobject>
+					</figure>
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					Click <guibutton>Forward</guibutton>.
+				</para>
+			</step>
+
+			<step>
+				<para>
+					Under the <systemitem>Describe Printer</systemitem> enter a unique name for the printer in the <guilabel>Printer Name</guilabel> field. The printer name can contain letters, numbers, dashes (-), and underscores (_); it <emphasis>must not</emphasis> contain any spaces. You can also use the <guilabel>Description</guilabel> and <guilabel>Location</guilabel> fields to add further printer information. Both fields are optional, and may contain spaces.
+					<figure id="fig-printconf-add">
+						<title>Printer Setup</title>
+						<mediaobject id="mediaobj-printconf-add-printer">
+							<imageobject>
+								<imagedata fileref="images/printconf-add-printer.png" format="PNG" scalefit="0"/>
+							</imageobject>
+						</mediaobject>
+					</figure>
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					Click <guibutton>Apply</guibutton> to confirm your printer configuration and add the print queue if the settings are correct. Click <guibutton>Back</guibutton> to modify the printer configuration.
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					After the changes are applied, a dialog box appears allowing you to print a test page. Click <guibutton>Yes</guibutton> to print a test page now. Alternatively, you can print a test page also later, refer to <xref linkend="s1-printing-test-page"/> for details.
+				</para>
+			</step>
+		</procedure>
+	</section>
+	
+	<section id="s1-printing-test-page">
+		<title>Printing a Test Page</title>
+<!-- <indexterm
+			significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>test page</secondary>
+		</indexterm>-->
+		<procedure id="proc-Printing_Test_Page">
+			<para>
+				After you have set up a printer or changed a printer configuration, print a test page to make sure the printer is functioning properly:
+			</para>
+			<step>
+				<para>
+					Right-click the printer in the <guilabel>Printing</guilabel> window and click <guimenuitem>Properties</guimenuitem>.
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					In the Properties window, click <guilabel>Settings</guilabel> on the left.
+				</para>
+			</step>
+			
+			<step>
+				<para>
+					On the displayed <guilabel>Settings</guilabel> tab, click the <guibutton>Print Test Page</guibutton> button.
+				</para>
+			</step>
+		</procedure>
+	</section>
+	
+	<section id="s1-printing-edit">
+		<title>Modifying Existing Printers</title>
+<!-- <indexterm
+			significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>delete existing printer</secondary>
+		</indexterm>-->
+		<para>
+			To delete an existing printer, in the <guilabel>Printer Configuration</guilabel> window, select the printer and go to <menuchoice><guimenu>Printer</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>. Confirm the printer deletion. Alternatively, press the <keycap>Delete</keycap> key.
+		</para>
+<!-- <indexterm
+			significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>default printer</secondary>
+		</indexterm>-->
+		<para>
+			To set the default printer, right-click the printer in the printer list and click the <guimenuitem>Set as Default</guimenuitem> button in the context menu.
+		</para>
+		
+		<section>
+			<title>The Settings Page</title>
+			<para>To change printer driver configuration, double-click the corresponding name in the <guilabel>Printer</guilabel> list and click the <guilabel>Settings</guilabel> label on the left to display the <guilabel>Settings</guilabel> page.</para>
+			<para>You can modify printer settings such as make and model, print a test page, change the device location (URI), and more.</para>
+			<figure	float="0"	id="fig-printconf-config1">
+				<title>Settings Page</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-config1.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Settings Page</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		<section>
+			<title>The Policies Page</title>
+			<para>
+				Click the <guilabel>Policies</guilabel> button on the left to change settings in printer state and print output.
+			</para>
+			<para>
+				You can select the printer states, configure the <guilabel>Error Policy</guilabel> of the printer (you can decide to abort the print job, retry, or stop it if an error occurs).</para>
+			<para>
+				You can also create a <firstterm>banner page</firstterm> (a page that describes aspects of the print job such as the originating printer, the username from the which the job originated, and the security status of the document being printed): click the <guilabel>Starting Banner </guilabel> or <guilabel>Ending Banner</guilabel> drop-menu and choose the option that best describes the nature of the print jobs (such as <guilabel>topsecret</guilabel>, <guilabel>classified</guilabel>, or <guilabel>confidential</guilabel>).
+			</para>
+			<section id="sec-Sharing_Printers">
+			  <title>Sharing Printers</title>
+				<para>
+					On the <guilabel>Policies</guilabel> page, you can mark a printer as shared: if a printer is shared, users published on the network can use it. To allow the sharing function for printers, go to <menuchoice><guimenu>Server</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> and select <guilabel>Publish shared printers connected to this system</guilabel>.
+				</para>
+				
+				<para>
+					Finally, make sure that the firewall allows incoming TCP connections to port 631 (that is Network Printing Server (IPP) in
+					system-config-firewall).
+				</para>
+
+			
+			<figure	float="0"	id="fig-printconf-config2">
+				<title>Policies Page</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-config2.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Policies Page</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+
+		</section>
+		
+		<section>
+			<title>The Access Control Page</title>
+			<para>You can change user-level access to the configured printer on the <guilabel>Access Control</guilabel> page. Click the <guilabel>Access Control</guilabel> label on the left to display the page. Select either <guilabel>Allow printing for everyone except these users</guilabel> or <guilabel>Deny printing for everyone except these users</guilabel> and define the user set below: enter the user name in the text box and click the <guibutton>Add</guibutton> button to add the user to the user set.</para>
+			<figure
+				float="0"
+				id="fig-printconf-config3">
+				<title>Access Control Page</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-config3.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Access Control Page</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section>
+			<title>The Printer Options Page</title>
+			<para>The <guilabel>Printer Options</guilabel> page contains various configuration options for the printer media and output, and its content may vary from printer to printer. It contains general printing, paper, quality, and printing size settings.</para>
+			<figure	float="0"	id="fig-printconf-config4">
+				<title>Printer Options Page</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-config4.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Printer Jobs Page</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section>
+		  <title>Job Options Page</title>
+			<para>
+				On the <guilabel>Job Options</guilabel> page, you can detail the printer job options. Click the <guilabel>Job Options</guilabel> label on the left to display the page. Edit the default settings to apply custom job options, such as number of copies, orientation, pages per side,scaling (increase or decrease the size of the printable area, which can be used to fit an oversize print area onto a smaller physical sheet of print medium), detailed text options, and custom job options.
+			</para>
+			<figure	id="fig-printconf-config5">
+				<title>Printer Options Page</title>
+				<mediaobject>
+					<imageobject>
+						<imagedata
+							fileref="images/printconf-config4.png"
+							format="PNG"
+							scalefit="0"/>
+					</imageobject>
+					<textobject>
+						<para>Printer Jobs Page</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section>
+		  <title>Ink/Toner Levels Page</title>
+		  <para>
+		  	The <guilabel>Ink/Toner Levels</guilabel> page contains details on toner status if available and printer status messages. Click the <guilabel>Ink/Toner Levels</guilabel> label on the left to display the page.
+		  </para>
+
+			<figure id="mediaobj-printconf-config6">
+				 <title>Ink/Toner Levels Page</title>
+				 <mediaobject>
+					 <imageobject>
+						 <imagedata fileref="images/printconf-config6.png" format="PNG" scalefit="0" />
+						</imageobject>
+						
+						<textobject>
+							 <para>Ink/Toner Levels Page</para>
+						</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+	</section>
+	
+	<section id="s1-printing-managing">
+		<title>Managing Print Jobs</title>
+<!-- <indexterm
+			significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>managing print jobs</secondary>
+		</indexterm>-->
+		
+		<para>
+			When you send a print job to the printer daemon, such as printing a text file from <application>Emacs</application> or printing an image from <application>GIMP</application>, the print job is added to the print spool queue. The print spool queue is a list of print jobs that have been sent to the printer and information about each print request, such as the status of the request, the job number, and more.
+		</para>
+		
+		<para>
+			During the printing process, the Printer Status icon appears in the <application>Notification Area</application> on the panel. To check the status of a print job, click the Printer Status, which displays a window similar to <xref linkend="fig-gnome-print-manager-list"/>.
+		</para>
+		
+		<figure float="0" id="fig-gnome-print-manager-list">
+			<title>GNOME Print Status</title>
+			<mediaobject>
 				<imageobject>
-					<imagedata
-            fileref="images/arrow.png"
-            format="PNG"/>
-        </imageobject>
-      </inlinemediaobject>
-			 ) beside a Workgroup to expand it. From the expanded list, select a printer.</para>
-    <para>If the printer you are looking for does not appear in the list, enter the SMB address in the <guilabel>smb://</guilabel> field. Use the format <replaceable>computer name/printer share</replaceable>. In <xref
-        linkend="fig-printconf-smb"/>, the <replaceable>computer name</replaceable> is <command>dellbox</command>, while the <replaceable>printer share</replaceable> is <command>r2</command>.</para>
-    <para>In the <guilabel>Username</guilabel> field, enter the username to access the printer. This user must exist on the SMB system, and the user must have permission to access the printer. The default user name is typically <userinput>guest</userinput> for Windows servers, or <userinput>nobody</userinput> for Samba servers.</para>
-    <para>Enter the <guilabel>Password</guilabel> (if required) for the user specified in the <guilabel>Username</guilabel> field.</para>
-    <para>You can then test the connection by clicking <guibutton>Verify</guibutton>. Upon successful verification, a dialog box appears confirming printer share accessibility.</para>
-    <para>Next, select the printer type. Refer to <xref
-        linkend="s2-printing-select-model"/> for details.</para>
-    <warning>
-      <title>Warning</title>
-      <para>Samba printer usernames and passwords are stored in the printer server as unencrypted files readable by root and lpd. Thus, other users that have root access to the printer server can view the username and password you use to access the Samba printer.</para>
-      <para>As such, when you choose a username and password to access a Samba printer, it is advisable that you choose a password that is different from what you use to access your local &MAJOROS; system.</para>
-      <para>If there are files shared on the Samba print server, it is recommended that they also use a password different from what is used by the print queue.</para>
-    </warning>
-  </section>
-  <section
-    id="s2-printing-jetdirect-printer">
-    <title>Adding a JetDirect Printer</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>JetDirect printer</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>adding</secondary>
-      <tertiary>JetDirect printer</tertiary>
-    </indexterm>
-    <para>To add a JetDirect or AppSocket connected printer share, click the <guibutton>New Printer</guibutton> button in the main <application> Printer Configuration Tool</application> window to display the window in <xref
-        linkend="fig-printconf-add"/>. Enter a unique name for the printer in the <guilabel>Printer Name</guilabel> field. The printer name can contain letters, numbers, dashes (-), and underscores (_); it <emphasis>must not</emphasis> contain any spaces.</para>
-    <para>You can also use the <guilabel>Description</guilabel> and <guilabel>Location</guilabel> fields to further distinguish this printer from others that may be configured on your system. Both of these fields are optional, and may contain spaces.</para>
-    <figure
-      float="0"
-      id="fig-printconf-jetdirect">
-      <title>Adding a JetDirect Printer</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-jetdirect.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>Adding a JetDirect Printer</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>Click <guibutton>Forward</guibutton> to continue.</para>
-    <para>Text fields for the following options appear:</para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <guilabel>Hostname</guilabel> — The hostname or IP address of the JetDirect printer.</para>
-      </listitem>
-      <listitem>
-        <para>
-          <guilabel>Port Number</guilabel> — The port on the JetDirect printer that is listening for print jobs. The default port is 9100.</para>
-      </listitem>
-    </itemizedlist>
-    <para>Next, select the printer type. Refer to <xref
-        linkend="s2-printing-select-model"/> for details.</para>
-  </section>
-  <section
-    id="s2-printing-select-model">
-    <title>Selecting the Printer Model and Finishing</title>
-    <para>Once you have properly selected a printer queue type, you can choose either option:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Select a Printer from database - If you select this option, choose the make of your printer from the list of <guilabel>Makes</guilabel>. If your printer make is not listed, choose <guilabel>Generic</guilabel>.</para>
-      </listitem>
-      <listitem>
-        <para>Provide PPD file - A PostScript Printer Description (PPD) file may also be provided with your printer. This file is normally provided by the manufacturer. If you are provided with a PPD file, you can choose this option and use the browser bar below the option description to select the PPD file.</para>
-      </listitem>
-    </itemizedlist>
-    <para>Refer to <xref
-        linkend="fig-printconf-select-model"/>.</para>
-    <figure
-      float="0"
-      id="fig-printconf-select-model">
-      <title>Selecting a Printer Model</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/printconf-select-model.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>Selecting a Printer Model</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>After choosing an option, click <guibutton>Forward</guibutton> to continue. <xref
-        linkend="fig-printconf-select-model"/> appears. You now have to choose the corresponding model and driver for the printer.</para>
-    <para>The recommended printed driver is automatically selected based on the printer model you chose. The print driver processes the data that you want to print into a format the printer can understand. Since a local printer is attached directly to your computer, you need a printer driver to process the data that is sent to the printer.</para>
-    <para>If you have a PPD file for the device (usually provided by the manufacturer), you can select it by choosing <guilabel>Provide PPD file</guilabel>. You can then browse the filesystem for the PPD file by clicking <guibutton>Browse</guibutton>.</para>
-    <section
-      id="s3-printing-confirm">
-      <title>Confirming Printer Configuration</title>
-      <para>The last step is to confirm your printer configuration. Click <guibutton>Apply</guibutton> to add the print queue if the settings are correct. Click <guibutton>Back</guibutton> to modify the printer configuration.</para>
-      <para>After applying the changes, print a test page to ensure the configuration is correct. Refer to <xref
-          linkend="s2-printing-test-page"/> for details.</para>
-    </section>
-  </section>
-  <section
-    id="s2-printing-test-page">
-    <title>Printing a Test Page</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>test page</secondary>
-    </indexterm>
-    <para>After you have configured your printer, you should print a test page to make sure the printer is functioning properly. To print a test page, select the printer that you want to try out from the printer list, then click <guibutton>Print Test Page</guibutton> from the printer's <guilabel>Settings</guilabel> tab.</para>
-    <para>If you change the print driver or modify the driver options, you should print a test page to test the different configuration.</para>
-  </section>
-  <section
-    id="s2-printing-edit">
-    <title>Modifying Existing Printers</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>delete existing printer</secondary>
-    </indexterm>
-    <para>To delete an existing printer, select the printer and click the <guibutton>Delete</guibutton> button on the toolbar. The printer is removed from the printer list once you confirm deletion of the printer configuration.</para>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>default printer</secondary>
-    </indexterm>
-    <para>To set the default printer, select the printer from the printer list and click the <guibutton>Make Default Printer</guibutton> button in the <guilabel>Settings</guilabel> tab.</para>
-    <section>
-      <title>The <guilabel>Settings</guilabel> Tab</title>
-      <para>To change printer driver configuration, click the corresponding name in the <guilabel>Printer</guilabel> list and click the <guilabel>Settings</guilabel> tab.</para>
-      <para>You can modify printer settings such as make and model, make a printer the default, print a test page, change the device location (URI), and more.</para>
-      <figure
-        float="0"
-        id="fig-printconf-config1">
-        <title>Settings Tab</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/printconf-config1.png"
-              format="PNG"
-              scalefit="1"/>
-          </imageobject>
-          <textobject>
-            <para>Settings Tab</para>
-          </textobject>
-        </mediaobject>
-      </figure>
-    </section>
-    <section>
-      <title>The <guilabel>Policies</guilabel> Tab</title>
-      <para>To change settings in print output, click the <guilabel>Policies</guilabel> tab.</para>
-      <para>For example, to create a <firstterm>banner page</firstterm> (a page that describes aspects of the print job such as the originating printer, the username from the which the job originated, and the security status of the document being printed) click the <guilabel>Starting Banner </guilabel> or <guilabel>Ending Banner</guilabel> drop-menu and choose the option that best describes the nature of the print jobs (such as <guilabel>topsecret</guilabel>, <guilabel>classified</guilabel>, or <guilabel>confidential</guilabel>).</para>
-      <figure
-        float="0"
-        id="fig-printconf-config2">
-        <title>Policies Tab</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/printconf-config2.png"
-              format="PNG"
-              scalefit="1"/>
-          </imageobject>
-          <textobject>
-            <para>Policies Tab</para>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>You can also configure the <guilabel>Error Policy</guilabel> of the printer, by choosing an option from the drop-down menu. You can choose to abort the print job, retry, or stop it.</para>
-    </section>
-    <section>
-      <title>The <guilabel>Access Control</guilabel> Tab</title>
-      <para>You can change user-level access to the configured printer by clicking the <guilabel>Access Control</guilabel> tab.</para>
-      <para>Add users using the text box and click the <guibutton>Add</guibutton> button beside it. You can then choose to only allow use of the printer to that subset of users or deny use to those users.</para>
-      <figure
-        float="0"
-        id="fig-printconf-config3">
-        <title>Access Control Tab</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/printconf-config3.png"
-              format="PNG"
-              scalefit="1"/>
-          </imageobject>
-          <textobject>
-            <para>Access Control Tab</para>
-          </textobject>
-        </mediaobject>
-      </figure>
-    </section>
-    <section>
-      <title>The <guilabel>Printer</guilabel> and <guilabel>Job Options</guilabel>Tab</title>
-      <para>The <guilabel>Printer Options</guilabel> tab contains various configuration options for the printer media and output.</para>
-      <figure
-        float="0"
-        id="fig-printconf-config4">
-        <title>Printer Options Tab</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/printconf-config4.png"
-              format="PNG"
-              scalefit="1"/>
-          </imageobject>
-          <textobject>
-            <para>Printer Jobs Tab</para>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <itemizedlist>
-        <listitem>
-          <para>
-            <guilabel>Page Size</guilabel> — Allows the paper size to be selected. The options include US Letter, US Legal, A3, and A4</para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Media Source</guilabel> — set to <guilabel>Automatic</guilabel> by default. Change this option to use paper from a different tray.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Media Type</guilabel> — Allows you to change paper type. Options include: Plain, thick, bond, and transparency.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Resolution</guilabel> — Configure the quality and detail of the printout. Default is 300 dots per inch (dpi).</para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Toner Saving</guilabel> — Choose whether the printer uses less toner to conserve resources.</para>
-        </listitem>
-      </itemizedlist>
-      <para>You can also configure printer job options using the <guilabel>Job Options</guilabel> tab. Use the drop-menu and choose the job options you wish to use, such as <guilabel>Landscape</guilabel> modes (horizontal or vertical printout), <guilabel>copies</guilabel>, or <guilabel>scaling</guilabel> (increase or decrease the size of the printable area, which can be used to fit an oversize print area onto a smaller physical sheet of print medium).</para>
-    </section>
-  </section>
-  <section
-    id="s2-printing-managing">
-    <title>Managing Print Jobs</title>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>managing print jobs</secondary>
-    </indexterm>
-    <para>When you send a print job to the printer daemon, such as printing a text file from <application>Emacs</application> or printing an image from <application>The GIMP</application>, the print job is added to the print spool queue. The print spool queue is a list of print jobs that have been sent to the printer and information about each print request, such as the status of the request, the job number, and more.</para>
-    <para>During the printing process, the Printer Status icon appears in the <application>Notification Area</application> on the panel. To check the status of a print job, double click the Printer Status, which displays a window similar to <xref
-        linkend="fig-gnome-print-manager-list"/>.</para>
-    <figure
-      float="0"
-      id="fig-gnome-print-manager-list">
-      <title>GNOME Print Status</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/gnome-print-queue.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>GNOME Print Status</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>To cancel a specific print job listed in the <application>GNOME Print Status</application>, select it from the list and select <guimenu>Edit</guimenu> &gt; <guimenuitem>Cancel Documents</guimenuitem> from the pulldown menu.</para>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>viewing print spool, command line</secondary>
-    </indexterm>
-    <para>To view the list of print jobs in the print spool from a shell prompt, type the command <command>lpq</command>. The last few lines look similar to the following:</para>
-    <example
-      id="lpq-example">
-      <title>Example of <command>lpq</command> output</title>
-      <screen>
-Rank   Owner/ID              Class  Job Files       Size Time
-active user at localhost+902    A      902 sample.txt  2050 01:20:46
+					<imagedata fileref="images/gnome-print-queue.png" format="PNG" scalefit="0"/>
+				</imageobject>
+				<textobject>
+					<para>GNOME Print Status</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+		
+		<para>
+			To cancel, hold, release, reprint or authenticate a print job, select the job in the <application>GNOME Print Status</application> and on the <guimenu>Job</guimenu> menu, click the respective command.
+		</para>
+		
+<!-- <indexterm significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>viewing print spool, command line</secondary>
+		</indexterm>-->
+		
+		<para>
+			To view the list of print jobs in the print spool from a shell prompt, type the command <command>lpstat -o</command>. The last few lines look similar to the following:
+		</para>
+		
+		<example id="lpq-example">
+			<title>Example of <command>lpstat -o</command> output</title>
+<screen>
+$ lpstat -o
+Charlie-60              twaugh            1024   Tue 08 Feb 2011 16:42:11 GMT
+Aaron-61                twaugh            1024   Tue 08 Feb 2011 16:42:44 GMT
+Ben-62                  root              1024   Tue 08 Feb 2011 16:45:42 GMT
 </screen>
-    </example>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>cancel print job</secondary>
-    </indexterm>
-    <para>If you want to cancel a print job, find the job number of the request with the command <command>lpq</command> and then use the command <command>lprm <replaceable>job number</replaceable>
-      </command>. For example, <command>lprm 902</command> would cancel the print job in <xref
-        linkend="lpq-example"/>. You must have proper permissions to cancel a print job. You can not cancel print jobs that were started by other users unless you are logged in as root on the machine to which the printer is attached.</para>
-    <indexterm
-      significance="normal">
-      <primary>printer configuration</primary>
-      <secondary>printing from the command line</secondary>
-    </indexterm>
-    <indexterm
-      significance="normal">
-      <primary>command line options</primary>
-      <secondary>printing from</secondary>
-    </indexterm>
-    <para>You can also print a file directly from a shell prompt. For example, the command <command>lpr sample.txt</command> prints the text file <filename>sample.txt</filename>. The print filter determines what type of file it is and converts it into a format the printer can understand.</para>
-  </section>
-  <section
-    id="s2-printing-additional-resources">
-    <title>Additional Resources</title>
-    <para>To learn more about printing on &MAJOROS;, refer to the following resources.</para>
-    <section
-      id="s3-printing-installed-docs">
-      <title>Installed Documentation</title>
-      <itemizedlist>
-        <listitem>
-          <para>
-            <command>map lpr</command> — The manual page for the <command>lpr</command> command that allows you to print files from the command line.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <command>man lprm</command> — The manual page for the command line utility to remove print jobs from the print queue.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <command>man mpage</command> — The manual page for the command line utility to print multiple pages on one sheet of paper.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <command>man cupsd</command> — The manual page for the CUPS printer daemon.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <command>man cupsd.conf</command> — The manual page for the CUPS printer daemon configuration file.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <command>man classes.conf</command> — The manual page for the class configuration file for CUPS.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-    <section
-      id="s3-printing-useful-websites">
-      <title>Useful Websites</title>
-      <itemizedlist>
-        <listitem>
-          <para>
-            <ulink
-              url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink> — <citetitle>GNU/Linux Printing</citetitle> contains a large amount of information about printing in Linux.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <ulink
-              url="http://www.cups.org/">http://www.cups.org/</ulink> — Documentation, FAQs, and newsgroups about CUPS.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
+		</example>
+		
+<!-- <indexterm significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>cancel print job</secondary>
+		</indexterm>-->
+		
+		<para>
+			If you want to cancel a print job, find the job number of the request with the command <command>lpstat -o</command> and then use the command <command>cancel <replaceable>job number</replaceable></command>. For example, <command>cancel 60</command> would cancel the print job in <xref linkend="lpq-example"/>. You can not cancel print jobs that were started by other users with the <command>cancel</command> command. However, you can enforce deletion of such job by issuing the <command>cancel -U root <replaceable>job_number</replaceable></command> command. To prevent such cancelling change the printer operation policy to <literal>Authenticated</literal> to force root authentication.
+		</para>
+<!-- <indexterm significance="normal">
+			<primary>printer configuration</primary>
+			<secondary>printing from the command line</secondary>
+		</indexterm>-->
+		
+<!-- <indexterm significance="normal">
+			<primary>command line options</primary>
+			<secondary>printing from</secondary>
+		</indexterm>-->
+		<para>
+			You can also print a file directly from a shell prompt. For example, the command <command>lp sample.txt</command> prints the text file <filename>sample.txt</filename>. The print filter determines what type of file it is and converts it into a format the printer can understand.
+		</para>
+	</section>
+	
+	<section id="s1-printing-additional-resources">
+		<title>Additional Resources</title>
+		
+		<para>To learn more about printing on &MAJOROS;, refer to the following resources:</para>
+		
+		<variablelist>
+			<varlistentry>
+			<term>Installed Documentation</term>
+			<listitem>
+				<para>
+					<command>map lp</command> — The manual page for the lpr command that allows you to print files from the command line.
+				</para>
+
+				<para>
+					<command>man cancel</command> — The manual page for the command line utility to remove print jobs from the print queue.
+				</para>
+
+				<para>
+						<command>man mpage</command> — The manual page for the command line utility to print multiple pages on one sheet of paper.
+				</para>
+				
+				<para>
+					<command>man cupsd</command> — The manual page for the CUPS printer daemon.
+				</para>
+				
+				<para>
+					<command>man cupsd.conf</command> — The manual page for the CUPS printer daemon configuration file.
+				</para>
+				
+				<para>
+					<command>man classes.conf</command> — The manual page for the class configuration file for CUPS.
+				</para>
+				
+				<para>
+					<command>man lpstat</command>  — The manual page for the lpstat command, which displays status information about classe, jobs, and printers.
+				</para>
+			</listitem>
+		</varlistentry>
+	
+		<varlistentry>
+			<term>Useful Websites</term>
+			<listitem>
+				<para>
+					<ulink url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink> — <citetitle>GNU/Linux Printing</citetitle> contains a large amount of information about printing in Linux.
+				</para>
+
+				<para>
+					<ulink url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink> — <citetitle>GNU/Linux Printing</citetitle> contains a large amount of information about printing in Linux.
+				</para>
+			
+				<para>
+					<ulink url="http://www.cups.org/">http://www.cups.org/</ulink> — Documentation, FAQs, and newsgroups about CUPS.
+				</para>
+			</listitem>
+		</varlistentry>
+	</variablelist>
+</section>
+</section>
 </section>
diff --git a/en-US/SSSD.xml b/en-US/SSSD.xml
index 3df4c1a..4b03f36 100644
--- a/en-US/SSSD.xml
+++ b/en-US/SSSD.xml
@@ -1080,6 +1080,17 @@ uid=500(f12server) gid=500(f12server) groups=500(f12server),510(f12tester)
           </itemizedlist>
         </para>
       </formalpara>
+      <note>
+        <title><systemitem>DNS</systemitem> Service Discovery</title>
+          <para>
+            The <systemitem>DNS</systemitem> service discovery feature allows the LDAP back end to automatically find the appropriate <systemitem>DNS</systemitem> servers to connect to using a special <systemitem>DNS</systemitem> query. For more information on the <systemitem>DNS</systemitem> service discovery feature, refer to <xref linkend="sect-SSSD_User_Guide-Configuring_Domains-Configuring_Failover-Using_SRV_Records_with_Failover"/>.
+          </para>
+      </note>
+          
+      <bridgehead></bridgehead>
+      <para>
+        
+      </para>
     </section>
 
     <section id="sect-SSSD_User_Guide-Configuring_Domains-Configuring_a_Microsoft_Active_Directory_Domain">
@@ -1187,6 +1198,7 @@ ldap_group_object_class = group</screen>
     </section>
 
 
+    <!-- MOVE DOWN UNDER KRB5/LDAP and rename to PROXY/KRB5 or PROXY PROXY -->
     <section id="sect-SSSD_User_Guide-Domain_Configuration_Options-Configuring_a_Proxy_Domain">
       <title>Configuring a Proxy Domain</title>
       <indexterm>
@@ -1244,7 +1256,7 @@ ldap_group_object_class = group</screen>
       If the UPN is not available in the identity back end, SSSD will construct a UPN using the format <systemitem class="username">username at krb5_realm</systemitem>.
     </para>
     <para>
-      SSSD assumes that the Kerberos KDC is also a Kerberos kadmin server. However, it is very common for production environments to have multiple, read-only replicas of the KDC, but only a single kadmin server (because password changes and similar procedures are comparitively rare). To manage this type of configuration, you can use the <option>krb5_kpasswd</option> option to specify where your password changing service is running, or if it is running on a non-default port. Refer to the <citetitle>sssd-krb5(5)</citetitle> manual page for more information about this and all Kerberos configuration options.
+      SSSD assumes that the Kerberos KDC is also a Kerberos kadmin server. However, it is very common for production environments to have multiple, read-only replicas of the KDC, but only a single kadmin server (because password changes and similar procedures are comparitively rare). To manage this type of configuration, you can use the <option>krb5_kpasswd</option> option to specify where your password changing service is running, or if it is running on a non-default port. If the <option>krb5_kpasswd</option> option is not defined, SSSD tries to use the Kerberos KDC in order to change the password. Refer to the <citetitle>sssd-krb5(5)</citetitle> manual page for more information about this and all Kerberos configuration options.
     </para>
 
     <formalpara id="form-SSSD_User_Guide-Setting_Up_Kerberos_Authentication-How_to_Set_up_Kerberos_Authentication">
@@ -1272,6 +1284,19 @@ krb5_auth_timeout = 15
 </screen>
 
     <para>This example describes the minimum options that must be configured when using Kerberos authentication. Refer to the <citetitle>sssd-krb5(5)</citetitle> manual page for a full description of all the options that apply to configuring Kerberos authentication.</para>
+    <!-- <bridgehead>Setting up SASL/GSSAPI Authentication</bridgehead>
+    <para>
+    <firstterm>GSSAPI</firstterm> (Generic Security Services Application Programming Interface) is a supported <firstterm>SASL</firstterm> (Simple Authentiction and Security Layer) authentication method. Kerberos is currently the only commonly used GSSAPI implementation. 
+    
+    Thus, an LDAP client and server would use SASL to negotiate GSSAPI as the authentication method (as opposed to plain-text passwords, etc.) and then the GSSAPI plugin for SASL would be invoked on each end to speak Kerberos to one another
+
+    </para> -->
+    <note>
+        <title><systemitem>DNS</systemitem> Service Discovery</title>
+          <para>
+            The <systemitem>DNS</systemitem> service discovery feature allows the Kerberos&#160;5 authentication back end to automatically find the appropriate <systemitem>DNS</systemitem> servers to connect to using a special <systemitem>DNS</systemitem> query. For more information on the <systemitem>DNS</systemitem> service discovery feature, refer to <xref linkend="sect-SSSD_User_Guide-Configuring_Domains-Configuring_Failover-Using_SRV_Records_with_Failover"/>.
+          </para>
+      </note>
   </section>
 
 <!--
diff --git a/en-US/images/gnome-print-manager-list.png b/en-US/images/gnome-print-manager-list.png
index 741dae6..1f4307b 100644
Binary files a/en-US/images/gnome-print-manager-list.png and b/en-US/images/gnome-print-manager-list.png differ
diff --git a/en-US/images/gnome-print-queue.png b/en-US/images/gnome-print-queue.png
index 2c06caf..e05371b 100644
Binary files a/en-US/images/gnome-print-queue.png and b/en-US/images/gnome-print-queue.png differ
diff --git a/en-US/images/print_conf_print-job.png b/en-US/images/print_conf_print-job.png
new file mode 100644
index 0000000..ab73c27
Binary files /dev/null and b/en-US/images/print_conf_print-job.png differ
diff --git a/en-US/images/print_conf_window.png b/en-US/images/print_conf_window.png
new file mode 100644
index 0000000..77c053c
Binary files /dev/null and b/en-US/images/print_conf_window.png differ
diff --git a/en-US/images/printconf-add-printer.png b/en-US/images/printconf-add-printer.png
index 158e531..9a25612 100644
Binary files a/en-US/images/printconf-add-printer.png and b/en-US/images/printconf-add-printer.png differ
diff --git a/en-US/images/printconf-config1.png b/en-US/images/printconf-config1.png
index 8a4e25d..44a18cc 100644
Binary files a/en-US/images/printconf-config1.png and b/en-US/images/printconf-config1.png differ
diff --git a/en-US/images/printconf-config2.png b/en-US/images/printconf-config2.png
index 6a1e6b9..9e05c23 100644
Binary files a/en-US/images/printconf-config2.png and b/en-US/images/printconf-config2.png differ
diff --git a/en-US/images/printconf-config3.png b/en-US/images/printconf-config3.png
index 1c8548e..47e483c 100644
Binary files a/en-US/images/printconf-config3.png and b/en-US/images/printconf-config3.png differ
diff --git a/en-US/images/printconf-config4.png b/en-US/images/printconf-config4.png
index d0d2cff..a2387a8 100644
Binary files a/en-US/images/printconf-config4.png and b/en-US/images/printconf-config4.png differ
diff --git a/en-US/images/printconf-config5.png b/en-US/images/printconf-config5.png
index 3e333b3..9074579 100644
Binary files a/en-US/images/printconf-config5.png and b/en-US/images/printconf-config5.png differ
diff --git a/en-US/images/printconf-config6.png b/en-US/images/printconf-config6.png
new file mode 100644
index 0000000..75f58dc
Binary files /dev/null and b/en-US/images/printconf-config6.png differ
diff --git a/en-US/images/printconf-ipp.png b/en-US/images/printconf-ipp.png
index 296b2a3..367314f 100644
Binary files a/en-US/images/printconf-ipp.png and b/en-US/images/printconf-ipp.png differ
diff --git a/en-US/images/printconf-jetdirect.png b/en-US/images/printconf-jetdirect.png
index 792b8a4..68c408b 100644
Binary files a/en-US/images/printconf-jetdirect.png and b/en-US/images/printconf-jetdirect.png differ
diff --git a/en-US/images/printconf-lpd.png b/en-US/images/printconf-lpd.png
index 0d0b0c3..ba10d17 100644
Binary files a/en-US/images/printconf-lpd.png and b/en-US/images/printconf-lpd.png differ
diff --git a/en-US/images/printconf-select-driver.png b/en-US/images/printconf-select-driver.png
new file mode 100644
index 0000000..6b27ff1
Binary files /dev/null and b/en-US/images/printconf-select-driver.png differ
diff --git a/en-US/images/printconf-select-model.png b/en-US/images/printconf-select-model.png
index e22dd38..a8e49f8 100644
Binary files a/en-US/images/printconf-select-model.png and b/en-US/images/printconf-select-model.png differ
diff --git a/en-US/images/printconf-smb.png b/en-US/images/printconf-smb.png
index 0cf27e4..61a03d6 100644
Binary files a/en-US/images/printconf-smb.png and b/en-US/images/printconf-smb.png differ


More information about the docs-commits mailing list