Attachment 16149 Details for Bug 29729 – file.diff

[patch] file.diff

file.diff (text/plain), 10.61 KB, created by John Murphy on 2001-08-15 14:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Murphy

Created: 2001-08-15 14:10:01 UTC

Size: 10.61 KB

patch

obsolete

>--- chapter	Wed Aug 15 03:35:35 2001
>+++ chapter.patched	Wed Aug 15 03:35:35 2001
>@@ -1116,8 +1116,8 @@
> 	    <literal>lp</literal> capability.</para>
> 
> 	  <para>In our running example, let us assume that
>-	    <hostid>rattan</hostid> is on the first parallel port, and
>-	    <hostid>bamboo</hostid> is on a sixth serial port; here are
>+	    <literal>rattan</literal> is on the first parallel port, and
>+	    <literal>bamboo</literal> is on a sixth serial port; here are
> 	    the additions to <filename>/etc/printcap</filename>:</para>
> 
> 	  <programlisting>#
>@@ -1563,7 +1563,7 @@
>                   <term><option>-c</option></term>
> 
>                   <listitem>
>-                    <para>appears if the job's submitted with <command>lpr
>+                    <para>appears if the job is submitted with <command>lpr
>                         -l</command></para>
>                   </listitem>
>                 </varlistentry>
>@@ -1884,7 +1884,7 @@
>         &amp;&amp; exit 0
> else
>     #
>-    #  Plain text or HP/PCL, so just print it directly; print a form
>+    #  Plain text or HP/PCL, so just print it directly; print a form feed
>     #  at the end to eject the last page.
>     #
>     echo $first_line &amp;&amp; cat &amp;&amp; printf "\033&amp;l0H" &amp;&amp; 
>@@ -2538,7 +2538,7 @@
>         <para>By enabling header pages, LPD will produce a <emphasis>long
>             header</emphasis>, a full page of large letters identifying the
>           user, host, and job.  Here is an example (kelly printed the job
>-          named outline from host rose):</para>
>+          named outline from host <hostid>rose</hostid>):</para>
>             
>         <programlisting>      k                   ll       ll
>       k                    l        l
>@@ -2972,13 +2972,14 @@
> 
>         <para>Here is an example.  The host <hostid>rose</hostid> has two
>           printers, <literal>bamboo</literal> and <literal>rattan</literal>.
>-          We will enable users on the host orchid to print to those printers.
>+          We will enable users on the host <hostid>orchid</hostid> to print
>+          to those printers.
>           Here is the <filename>/etc/printcap</filename> file for
>           <hostid>orchid</hostid> (back from section <link
>             linkend="printing-advanced-header-pages-enabling">Enabling Header
>             Pages</link>).  It already had the entry for the printer
>           <literal>teak</literal>; we have added entries for the two printers
>-          on the host rose:</para>
>+          on the host <hostid>rose</hostid>:</para>
> 
>         <programlisting>#
> #  /etc/printcap for host orchid - added (remote) printers on rose
>@@ -3014,17 +3015,18 @@
>               
>         <para>Now, users on <hostid>orchid</hostid> can print to
>           <literal>rattan</literal> and <literal>bamboo</literal>.  If, for
>-          example, a user on orchid typed
>+          example, a user on <hostid>orchid</hostid> typed
>               
>           <screen>&prompt.user; <userinput>lpr -P bamboo -d sushi-review.dvi</userinput></screen>
> 
>-          the LPD system on orchid would copy the job to the spooling
>-          directory <filename>/var/spool/lpd/bamboo</filename> and note that
>-          it was a DVI job.  As soon as the host rose has room in its
>-          <hostid>bamboo</hostid> spooling directory, the two LPDs would
>-          transfer the file to rose.  The file would wait in rose's queue
>-          until it was finally printed.  It would be converted from DVI to
>-          PostScript (since bamboo is a PostScript printer) on rose.</para>
>+          the LPD system on <hostid>orchid</hostid> would copy the job to the spooling
>+          directory <filename>/var/spool/lpd/bamboo</filename> and note that it was a
>+          DVI job.  As soon as the host <hostid>rose</hostid> has room in its
>+          <literal>bamboo</literal> spooling directory, the two LPDs would transfer the
>+          file to <hostid>rose</hostid>.  The file would wait in <hostid>rose</hostid>'s
>+          queue until it was finally printed.  It would be converted from DVI to
>+          PostScript (since <literal>bamboo</literal> is a PostScript printer) on
>+          <hostid>rose</hostid>.</para>
>       </sect3>
>       
>       <sect3 id="printing-advanced-network-net-if">
>@@ -3138,7 +3140,7 @@
>           <filename>/etc/printcap</filename> file for the host
>           <hostid>rose</hostid>.  The printer <literal>rattan</literal> is
>           quite hearty, so we will allow multiple copies, but the laser
>-          printer <literal>bamboo</literal>'s a bit more delicate, so we will
>+          printer <literal>bamboo</literal> is a bit more delicate, so we will
>           disable multiple copies by adding the <literal>sc</literal>
>           capability:</para>
> 
>@@ -3376,9 +3378,9 @@
>                 <filename>minfree</filename> file.</para>
>                     
>               <para>For example, let us add a <filename>minfree</filename>
>-                file for the printer <hostid>bamboo</hostid>.  We examine
>+                file for the printer <literal>bamboo</literal>.  We examine
>                 <filename>/etc/printcap</filename> to find the spooling
>-                directory for this printer; here is <hostid>bamboo</hostid>'s
>+                directory for this printer; here is <literal>bamboo</literal>'s
>                 entry:</para>
>                   
>               <programlisting>bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
>@@ -3387,14 +3389,13 @@
>         :if=/usr/local/libexec/psif:\
>         :df=/usr/local/libexec/psdf:</programlisting>
> 
>-              <para>The spooling directory is the given in the
>-                <literal>sd</literal> capability.  We will make three
>-                megabytes (which is 6144 disk blocks) the amount of free disk
>-                space that must exist on the filesystem for LPD to accept
>-                remote jobs:</para>
>+              <para>The spooling directory is given in the <literal>sd</literal>
>+                capability.  We will make three megabytes (which is 6144 disk blocks)
>+                the amount of free disk space that must exist on the filesystem for
>+                LPD to accept remote jobs:</para>
>                   
>-              <screen>&prompt.root; <userinput>echo 6144 &gt; /var/spool/lpd/bam
>-boo/minfree</userinput></screen>
>+              <screen>&prompt.root; <userinput>echo 6144 &gt; /var/spool/lpd/bamboo/minfree
>+              </userinput></screen>
>             </listitem>
>           </varlistentry>
>           
>@@ -3417,7 +3418,7 @@
>                 giving them accounts on your systems, they can use your
>                 printers from their own departmental systems.  If you would
>                 rather allow them to use <emphasis>only</emphasis> your
>-                printers and not your compute resources, you can give them
>+                printers and not your computer resources, you can give them
>                 <quote>token</quote> accounts, with no home directory and a
>                 useless shell like <filename>/usr/bin/false</filename>.</para>
>             </listitem>
>@@ -3524,8 +3525,8 @@
>         <para>You should use a separate accounting file for each printer, as
>           <command>lpf</command> has no file locking logic built into it, and
>           two <command>lpf</command>s might corrupt each other's entries if
>-          they were to write to the same file at the same time.  A easy way to
>-          insure a separate accounting file for each printer is to use
>+          they were to write to the same file at the same time.  An easy way
>+          to insure a separate accounting file for each printer is to use
>           <literal>af=acct</literal> in <filename>/etc/printcap</filename>.
>           Then, each accounting file will be in the spooling directory for a
>           printer, in a file named <filename>acct</filename>.</para>
>@@ -3821,7 +3822,7 @@
> 
> 	<screen>&prompt.user; <userinput>lpq -P bamboo</userinput></screen>
> 
>-	shows the queue for the printer named <hostid>bamboo</hostid>.  Here
>+	shows the queue for the printer named <literal>bamboo</literal>.  Here
> 	is an example of the output of the <command>lpq</command>
> 	command:</para>
> 	    
>@@ -3845,7 +3846,7 @@
> 	be currently printing that job.  The second job consists of data
> 	passed as the standard input to the &man.lpr.1; command.  The third
> 	  job came from user <username>mary</username>; it is a much larger
>-	  job. The pathname of the files she's trying to print is too long to
>+	  job. The pathname of the file she is trying to print is too long to
> 	  fit, so the &man.lpq.1; command just shows three dots.</para>
> 
>       <para>The very first line of the output from &man.lpq.1; is also useful:
>@@ -3883,7 +3884,7 @@
> 	    
>       <para>To remove the job from a specific printer, add the
> 	<option>-P</option> option.  The following command removes job number
>-	10 from the queue for the printer <hostid>bamboo</hostid>:</para>
>+	10 from the queue for the printer <literal>bamboo</literal>:</para>
> 	    
>       <screen>&prompt.user; <userinput>lprm -P bamboo 10</userinput></screen>
>       
>@@ -4277,7 +4278,7 @@
> 	to get printer status and to restart a hung printer only.</para>
> 
>       <para>Here is a summary of the &man.lpc.8; commands.  Most of the
>-	commands takes a <replaceable>printer-name</replaceable> argument to
>+	commands take a <replaceable>printer-name</replaceable> argument to
> 	tell on which printer to operate.  You can use <literal>all</literal>
> 	for the <replaceable>printer-name</replaceable> to mean all printers
> 	listed in <filename>/etc/printcap</filename>.</para>
>@@ -4289,7 +4290,7 @@
> 
> 	  <listitem>
> 	    <para>Cancel the current job and stop the printer.  Users can
>-	      still submit jobs if the queue's enabled.</para>
>+	      still submit jobs if the queue is enabled.</para>
> 	  </listitem>
> 	</varlistentry>
> 
>@@ -4312,7 +4313,7 @@
> 	      <replaceable>printer-name</replaceable></command></term>
> 	  
> 	  <listitem>
>-	    <para>Disable queuing of new jobs.  If the printer's started, it
>+	    <para>Disable queuing of new jobs.  If the printer is running, it
> 	      will continue to print any jobs remaining in the queue.  The
> 	      superuser (root) can always submit jobs, even to a disabled
> 	      queue.</para>
>@@ -4608,9 +4609,9 @@
> exit 2</programlisting>
> 
> 	      <para>Here is an example <filename>/etc/printcap</filename>
>-		from a host called orchid.  It has a single printer
>+		from a host called <hostid>orchid</hostid>.  It has a single printer
> 		attached to its first parallel port, a Hewlett Packard
>-		LaserJet 3Si named <hostid>teak</hostid>.  It is using the
>+		LaserJet 3Si named <literal>teak</literal>.  It is using the
> 		above script as its text filter:</para>
> 
> 	      <programlisting>#

Actions: View | Diff

Attachments on bug 29729: 16149