Adjust whitespace to the structural changes of my previous commit,

translators may ignore this

en_US.ISO8859-1/articles/cups/article.sgml

@@ -60,25 +60,24 @@
   <sect1 id="printing-cups-install">
     <title>Installing the CUPS Print Server</title>
 
-      <para><application>CUPS</application> can be installed from ports
+    <para><application>CUPS</application> can be installed from ports or
-	or by using a precompiled binary package.  To install
+      by using a precompiled binary package.  To install
       <application>CUPS</application> from ports, issue the following
       command from a root terminal:</para>
 
     <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
 
-      <para>To install <application>CUPS</application> using a
+    <para>To install <application>CUPS</application> using a precompiled
-	precompiled binary, issue the following command from a root
+      binary, issue the following command from a root terminal:</para>
-	terminal:</para>
 
     <screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
 
     <para>Other optional, but recommended, ports or packages are
       <filename role="package">print/gutenprint-cups</filename> and
       <filename role="package">print/hplip</filename>, both of which add
-	drivers and utilities for a variety of printers.  Once
+      drivers and utilities for a variety of printers.  Once installed,
-	installed, the <application>CUPS</application> configuration
+      the <application>CUPS</application> configuration files can be
-	files can be found in the directory
+      found in the directory
       <filename>/usr/local/etc/cups</filename>.</para>
   </sect1>
 
@@ -89,17 +88,17 @@
       configure the <application>CUPS</application> server.  First,
       create or modify, as the case may be, the file
       <filename>/etc/devfs.rules</filename> and add the following
-	information to set the proper permissions on all potential
+      information to set the proper permissions on all potential printer
-	printer devices and to associate printers with the <groupname>cups</groupname> user
+      devices and to associate printers with the
-	group:</para>
+      <groupname>cups</groupname> user group:</para>
 
     <programlisting>[system=10]
 add path 'unlpt*' mode 0660 group cups
 add path 'ulpt*' mode 0660 group cups
 add path 'lpt*' mode 0660 group cups</programlisting>
 
-      <para>Next, add two lines to <filename>/etc/rc.conf</filename>
+    <para>Next, add two lines to <filename>/etc/rc.conf</filename> as
-	as follows:</para>
+      follows:</para>
 
     <programlisting>cupsd_enable="YES"
 devfs_system_ruleset="system"</programlisting>
@@ -109,10 +108,10 @@ devfs_system_ruleset="system"</programlisting>
       the local devfs rule created above, respectively.</para>
 
     <para>In order to enable <application>CUPS</application> printing
-	under certain &microsoft.windows; clients, the line below
+      under certain &microsoft.windows; clients, the line below should
-	should be
+      be uncommented in
-	uncommented in <filename>/usr/local/etc/cups/mime.types</filename>
+      <filename>/usr/local/etc/cups/mime.types</filename> and
-	and <filename>/usr/local/etc/cups/mime.convs</filename>:</para>
+      <filename>/usr/local/etc/cups/mime.convs</filename>:</para>
 
     <programlisting>application/octet-stream</programlisting>
 
@@ -123,7 +122,6 @@ devfs_system_ruleset="system"</programlisting>
 
     <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput>
 &prompt.root; <userinput>/usr/local/etc/rc.d/cupsd restart</userinput></screen>
-
   </sect1>
 
   <sect1 id="printing-cups-configuring-printers">
@@ -131,40 +129,40 @@ devfs_system_ruleset="system"</programlisting>
 
     <para>After the <application>CUPS</application> system has been
       installed and configured, the administrator can begin configuring
-	the local printers attached to the
+      the local printers attached to the <application>CUPS</application>
-	<application>CUPS</application> print server.  This part of the
+      print server.  This part of the process is very similar, if not
-	process is very similar, if not identical, to configuring
+      identical, to configuring <application>CUPS</application> printers
-	<application>CUPS</application> printers on other &unix;-based
+      on other &unix;-based operating systems, such as a &linux;
-	operating systems, such as a &linux; distribution.</para>
+      distribution.</para>
 
     <para>The primary means for managing and administering the
       <application>CUPS</application> server is through the web-based
       interface, which can be found by launching a web browser and
       entering <ulink url="http://localhost:631"></ulink> in the
-	browser's URL bar.  If the <application>CUPS</application>
+      browser's URL bar.  If the <application>CUPS</application> server
-	server is on another machine on the network, substitute the
+      is on another machine on the network, substitute the server's
-	server's local <acronym>IP</acronym> addresss for
+      local <acronym>IP</acronym> addresss for
       <hostid>localhost</hostid>.  The <application>CUPS</application>
       web interface is fairly self-explanatory, as there are sections
-	for managing printers and print jobs, authorizing users, and
+      for managing printers and print jobs, authorizing users, and more.
-	more.  Additionally, on the right-hand side of the
+      Additionally, on the right-hand side of the Administration screen
-	Administration screen are several check-boxes allowing easy
+      are several check-boxes allowing easy access to commonly-changed
-	access to commonly-changed settings, such as whether to share
+      settings, such as whether to share published printers connected to
-	published printers connected to the system, whether to allow
+      the system, whether to allow remote administration of the
-	remote administration of the <application>CUPS</application>
+      <application>CUPS</application> server, and whether to allow users
-	server, and whether to allow users additional access and
+      additional access and privileges to the printers and print
-	privileges to the printers and print jobs.</para>
+      jobs.</para>
 
-      <para>Adding a printer is generally as easy as clicking
+    <para>Adding a printer is generally as easy as clicking <quote>Add
-	<quote>Add Printer</quote> at the Administration screen of
+      Printer</quote> at the Administration screen of the
-	the <application>CUPS</application> web interface, or clicking
+      <application>CUPS</application> web interface, or clicking one of
-	one of the <quote>New Printers Found</quote> buttons also
+      the <quote>New Printers Found</quote> buttons also at the
-	at the Administration screen.  When presented with the
+      Administration screen.  When presented with the
-	<quote>Device</quote> drop-down box, simply select the
+      <quote>Device</quote> drop-down box, simply select the desired
-	desired locally-attached printer, and then continue through the
+      locally-attached printer, and then continue through the process.
-	process.  If one has added the
+      If one has added the <filename
-	<filename role="package">print/gutenprint-cups</filename> or
+      role="package">print/gutenprint-cups</filename> or <filename
-	<filename role="package">print/hplip</filename> ports or packages as
+      role="package">print/hplip</filename> ports or packages as
       referenced above, then additional print drivers will be available
       in the subsequent screens that might provide more stability or
       features.</para>
@@ -187,9 +185,9 @@ devfs_system_ruleset="system"</programlisting>
       <para><application>CUPS</application> will also need to be
 	installed on your &unix; clients.  Once
 	<application>CUPS</application> is installed on the clients,
-	  then <application>CUPS</application> printers that are
+	then <application>CUPS</application> printers that are shared
-	  shared across the network are often automatically discovered by
+	across the network are often automatically discovered by the
-	  the printer managers for various desktop environments such as
+	printer managers for various desktop environments such as
 	<application>GNOME</application> or
 	<application>KDE</application>.  Alternatively, one can access
 	the local <application>CUPS</application> interface on the
@@ -197,8 +195,8 @@ devfs_system_ruleset="system"</programlisting>
 	click on <quote>Add Printer</quote> in the Administration
 	section.  When presented with the <quote>Device</quote>
 	drop-down box, simply select the networked
-	  <application>CUPS</application> printer, if it was
+	<application>CUPS</application> printer, if it was automatically
-	  automatically discovered, or select <literal>ipp</literal> or
+	discovered, or select <literal>ipp</literal> or
 	<literal>http</literal> and enter the <acronym>IPP</acronym> or
 	<acronym>HTTP</acronym> <acronym>URI</acronym> of the networked
 	<application>CUPS</application> printer, usually in one of the
@@ -217,8 +215,8 @@ devfs_system_ruleset="system"</programlisting>
 
       <programlisting>ServerName <replaceable>server-ip</replaceable></programlisting>
 
-	<para>In this case, <replaceable>server-ip</replaceable> would be replaced by the local
+      <para>In this case, <replaceable>server-ip</replaceable> would be
-	  <acronym>IP</acronym> address of the
+	replaced by the local <acronym>IP</acronym> address of the
 	<application>CUPS</application> server on the network.</para>
     </sect2>
 
@@ -226,23 +224,21 @@ devfs_system_ruleset="system"</programlisting>
       <title>&windows; Clients</title>
 
       <para>Versions of &windows; prior to XP did not have the
-	  capability to natively network with
+	capability to natively network with <acronym>IPP</acronym>-based
-	  <acronym>IPP</acronym>-based printers.  However, &windowsxp;
+	printers.  However, &windowsxp; and later versions do have this
-	  and later versions do have this capability.  Therefore, to
+	capability.  Therefore, to add a <application>CUPS</application>
-	  add a <application>CUPS</application> printer in these
+	printer in these versions of &windows; is quite easy.
-	  versions of &windows; is quite easy.  Generally, the &windows;
+	Generally, the &windows; administrator will run the &windows;
-	  administrator will run the &windows;
 	<literal>Add Printer</literal> wizard, select <literal>Network
-	    Printer</literal> and then enter the <acronym>URI</acronym>
+	  Printer</literal> and then enter the <acronym>URI</acronym> in
-	  in the following syntax:</para>
+	the following syntax:</para>
 
       <programlisting>http://<replaceable>server-name-or-ip</replaceable>:631/printers/<replaceable>printername</replaceable></programlisting>
 
       <para>If one has an older version of &windows; without native
-	  <acronym>IPP</acronym> printing support, then the general
+	<acronym>IPP</acronym> printing support, then the general means
-	  means of connecting to a <application>CUPS</application>
+	of connecting to a <application>CUPS</application> printer is to
-	  printer is to use
+	use <filename role="package">net/samba3</filename> and
-	  <filename role="package">net/samba3</filename> and
 	<application>CUPS</application> together, which is a topic
 	outside the scope of this chapter.</para>
     </sect2>
@@ -252,18 +248,17 @@ devfs_system_ruleset="system"</programlisting>
     <title>CUPS Troubleshooting</title>
 
     <para>Difficulties with <application>CUPS</application> often lies
-	in permissions.  First, double check the &man.devfs.8;
+      in permissions.  First, double check the &man.devfs.8; permissions
-	permissions as outlined above.  Next, check the actual
+      as outlined above.  Next, check the actual permissions of the
-	permissions of the devices created in the file system.  It is
+      devices created in the file system.  It is also helpful to make
-	also helpful to make sure your user is a member of the
+      sure your user is a member of the <groupname>cups</groupname>
-	<groupname>cups</groupname> group.  If the permissions check boxes
+      group.  If the permissions check boxes in the Administration
-	in the Administration section of the
+      section of the <application>CUPS</application> web interface do
-	<application>CUPS</application> web interface do not seem to be
+      not seem to be working, another fix might be to manually backup
-	working, another fix might be to manually backup the main
+      the main <application>CUPS</application> configuration file
-	<application>CUPS</application> configuration file located at
+      located at <filename>/usr/local/etc/cups/cupsd.conf</filename> and
-	<filename>/usr/local/etc/cups/cupsd.conf</filename> and edit the
+      edit the various configuration options and try different
-	various configuration options and try different combinations of
+      combinations of configuration options.  One sample
-	configuration options.  One sample
       <filename>/usr/local/etc/cups/cupsd.conf</filename> to test is
       listed below.  Please note that this sample
       <filename>cupsd.conf</filename> file sacrifices security for
@@ -360,22 +355,23 @@ CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default&gt;
       primary printing system, then one may choose to optionally add
       certain knobs to <filename>/etc/make.conf</filename> that will
       emphasize <application>CUPS</application> over other printing
-	options.  Some of these <quote>knobs</quote> that one may want to add
+      options.  Some of these <quote>knobs</quote> that one may want to
-	are:</para>
+      add are:</para>
 
     <programlisting>WITH_CUPS=YES
 CUPS_OVERWRITE_BASE=YES
 WITHOUT_LPR=YES</programlisting>
 
     <para>The first knob, <makevar>WITH_CUPS</makevar>, adds
-	<application>CUPS</application> support to ports where
+      <application>CUPS</application> support to ports where applicable.
-	applicable.  The second knob, <makevar>CUPS_OVERWRITE_BASE</makevar>, will fix
+      The second knob, <makevar>CUPS_OVERWRITE_BASE</makevar>, will fix
       certain symlinks and paths that would otherwise apply to the
-	default &os; printing system, <application>LPR</application>,
+      default &os; printing system, <application>LPR</application>, and
-	and will prevent these fixes from being reverted upon the next
+      will prevent these fixes from being reverted upon the next
-	<maketarget>buildworld</maketarget> system upgrade.  The third knob, <makevar>WITHOUT_LPR</makevar>, will
+      <maketarget>buildworld</maketarget> system upgrade.  The third
-	prevent <application>LPR</application> support from being added
+      knob, <makevar>WITHOUT_LPR</makevar>, will prevent
-	to ports where applicable.</para>
+      <application>LPR</application> support from being added to ports
+      where applicable.</para>
   </sect1>
 </article>