diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-07-02 23:13:00 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-07-02 23:13:00 +0000 |
commit | 07bfccd71e05867cb46c11ea07ec0027794972b3 (patch) | |
tree | 502f17eb951b74c914af346cd4dbff252350c082 /usr.sbin/lpr | |
parent | 2ac2784f0c53b69968c131cd068d27cdbacca99f (diff) |
Mechanically kill hard sentence breaks.
Notes
Notes:
svn path=/head/; revision=131500
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/chkprintcap/chkprintcap.8 | 9 | ||||
-rw-r--r-- | usr.sbin/lpr/lp/lp.1 | 9 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/lpd.8 | 72 | ||||
-rw-r--r-- | usr.sbin/lpr/lpq/lpq.1 | 11 | ||||
-rw-r--r-- | usr.sbin/lpr/lpr/lpr.1 | 20 | ||||
-rw-r--r-- | usr.sbin/lpr/lpr/printcap.5 | 33 | ||||
-rw-r--r-- | usr.sbin/lpr/lprm/lprm.1 | 9 | ||||
-rw-r--r-- | usr.sbin/lpr/pac/pac.8 | 3 |
8 files changed, 110 insertions, 56 deletions
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8 index e026662d6445..c2524a159c70 100644 --- a/usr.sbin/lpr/chkprintcap/chkprintcap.8 +++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8 @@ -64,7 +64,8 @@ capability). The .Nm utility exits with a status equal to the number of errors encountered before -processing stopped. (In some cases, processing can stop before the +processing stopped. +(In some cases, processing can stop before the entire file is scanned.) .Pp If the @@ -89,8 +90,10 @@ The utility was written by .An Garrett A. Wollman Aq wollman@lcs.mit.edu . .Sh BUGS -Not enough sanity-checking is done. At a minimum, the ownership and -mode of the spool directories should also be checked. Other +Not enough sanity-checking is done. +At a minimum, the ownership and +mode of the spool directories should also be checked. +Other parameters whose value could cause .Xr lpd 8 to fail should be diagnosed. diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1 index 0269971f5ba4..8ed842d55e57 100644 --- a/usr.sbin/lpr/lp/lp.1 +++ b/usr.sbin/lpr/lp/lp.1 @@ -51,7 +51,8 @@ The .Nm utility is a front-end to the print spooler as required by the .St -p1003.2 -specification. It effectively invokes +specification. +It effectively invokes .Xr lpr 1 with the proper set of arguments. .Pp @@ -63,7 +64,8 @@ The following options are available: Make the .Nm command exit only after further access to any of the input files is no -longer required. The application can then safely delete or modify the +longer required. +The application can then safely delete or modify the files without affecting the output operation. .It Fl d Ar dest Specify a particular printer. @@ -112,6 +114,7 @@ command has been written by .Sh BUGS The .St -p1003.2 -specification does not provide any means to print non-text files. It +specification does not provide any means to print non-text files. +It rather requires the files to be printed to be text files limited to reasonable line lengths and printable characters. diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8 index 55c6c33e79f5..5d6e2cd033a9 100644 --- a/usr.sbin/lpr/lpd/lpd.8 +++ b/usr.sbin/lpr/lpd/lpd.8 @@ -49,7 +49,8 @@ utility is the line printer daemon (spool area handler) and is normally invoked at boot time from the .Xr rc 8 -file. It makes a single pass through the +file. +It makes a single pass through the .Xr printcap 5 file to find out about the existing printers and prints any files left after a crash. @@ -59,7 +60,8 @@ and .Xr accept 2 to receive requests to print files in the queue, transfer files to the spooling area, display the queue, -or remove jobs from the queue. In each case, it forks a child to handle +or remove jobs from the queue. +In each case, it forks a child to handle the request so the parent can continue to listen for more requests. .Pp Available options: @@ -169,33 +171,41 @@ for files beginning with Lines in each .Em cf file specify files to be printed or non-printing actions to be -performed. Each such line begins with a key character +performed. +Each such line begins with a key character to specify what to do with the remainder of the line. .Bl -tag -width Ds .It J -Job Name. String to be used for the job name on the burst page. +Job Name. +String to be used for the job name on the burst page. .It C -Classification. String to be used for the classification line +Classification. +String to be used for the classification line on the burst page. .It L -Literal. The line contains identification info from +Literal. +The line contains identification info from the password file and causes the banner page to be printed. .It T -Title. String to be used as the title for +Title. +String to be used as the title for .Xr pr 1 . .It H -Host Name. Name of the machine where +Host Name. +Name of the machine where .Xr lpr 1 was invoked. .It P -Person. Login name of the person who invoked +Person. +Login name of the person who invoked .Xr lpr 1 . This is used to verify ownership by .Xr lprm 1 . .It M Send mail to the specified user when the current print job completes. .It f -Formatted File. Name of a file to print which is already formatted. +Formatted File. +Name of a file to print which is already formatted. .It l Like ``f'' but passes control characters and does not make page breaks. .It p @@ -203,19 +213,23 @@ Name of a file to print using .Xr pr 1 as a filter. .It t -Troff File. The file contains +Troff File. +The file contains .Xr troff 1 output (cat phototypesetter commands). .It n -Ditroff File. The file contains device independent troff +Ditroff File. +The file contains device independent troff output. .It r -DVI File. The file contains +DVI File. +The file contains .Tn Tex l output DVI format from Stanford. .It g -Graph File. The file contains data produced by +Graph File. +The file contains data produced by .Xr plot 3 . .It c Cifplot File. @@ -227,29 +241,37 @@ The file contains a raster image. The file contains text data with FORTRAN carriage control characters. .It \&1 -Troff Font R. Name of the font file to use instead of the default. +Troff Font R. +Name of the font file to use instead of the default. .It \&2 -Troff Font I. Name of the font file to use instead of the default. +Troff Font I. +Name of the font file to use instead of the default. .It \&3 -Troff Font B. Name of the font file to use instead of the default. +Troff Font B. +Name of the font file to use instead of the default. .It \&4 -Troff Font S. Name of the font file to use instead of the default. +Troff Font S. +Name of the font file to use instead of the default. .It W Width. Changes the page width (in characters) used by .Xr pr 1 and the text filters. .It I -Indent. The number of characters to indent the output by (in ASCII). +Indent. +The number of characters to indent the output by (in ASCII). .It U -Unlink. Name of file to remove upon completion of printing. +Unlink. +Name of file to remove upon completion of printing. .It N -File name. The name of the file which is being printed, or a blank +File name. +The name of the file which is being printed, or a blank for the standard input (when .Xr lpr 1 is invoked in a pipeline). .It Z -Locale. String to be used as the locale for +Locale. +String to be used as the locale for .Xr pr 1 . .El .Pp @@ -269,14 +291,16 @@ The utility uses .Xr flock 2 to provide exclusive access to the lock file and to prevent multiple -daemons from becoming active simultaneously. If the daemon should be killed +daemons from becoming active simultaneously. +If the daemon should be killed or die unexpectedly, the lock file need not be removed. The lock file is kept in a readable .Tn ASCII form and contains two lines. The first is the process id of the daemon and the second is the control -file name of the current job being printed. The second line is updated to +file name of the current job being printed. +The second line is updated to reflect the current status of .Nm for the programs diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1 index 170e9e2d0624..c297ab19c0aa 100644 --- a/usr.sbin/lpr/lpq/lpq.1 +++ b/usr.sbin/lpr/lpq/lpq.1 @@ -65,7 +65,8 @@ Specify a particular printer, otherwise the default line printer is used (or the value of the .Ev PRINTER variable in the -environment). All other arguments supplied are interpreted as user +environment). +All other arguments supplied are interpreted as user names or job numbers to filter out only those jobs of interest. .It Fl l Information about each of the files comprising the job entry @@ -76,7 +77,7 @@ Report on the local queues for all printers, rather than just the specified printer. .El .Pp -For each job submitted (i.e. invocation of +For each job submitted (i.e., invocation of .Xr lpr 1 ) .Nm reports the user's name, current rank in the queue, the @@ -97,7 +98,7 @@ is indicated as ``(standard input)''. .Pp If .Nm -warns that there is no daemon present (i.e. due to some malfunction), +warns that there is no daemon present (i.e., due to some malfunction), the .Xr lpc 8 command can be used to restart the printer daemon. @@ -136,5 +137,7 @@ may report unreliably. Output formatting is sensitive to the line length of the terminal; this can results in widely spaced columns. .Sh DIAGNOSTICS -Unable to open various files. The lock file being malformed. Garbage +Unable to open various files. +The lock file being malformed. +Garbage files when there is no daemon active, but files in the spooling directory. diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1 index 241848563d83..1b72b9c384d8 100644 --- a/usr.sbin/lpr/lpr/lpr.1 +++ b/usr.sbin/lpr/lpr/lpr.1 @@ -57,7 +57,8 @@ The .Nm utility uses a spooling daemon to print the named files when facilities -become available. If no names appear, the standard input is assumed. +become available. +If no names appear, the standard input is assumed. .Pp The following single letter options are used to notify the line printer spooler that the files are not standard text files. @@ -118,7 +119,8 @@ These options apply to the handling of the print job: .Bl -tag -width indent .It Fl P -Force output to a specific printer. Normally, +Force output to a specific printer. +Normally, the default printer is used (site dependent), or the value of the environment variable .Ev PRINTER @@ -133,13 +135,15 @@ printing (with the .Fl s option). .It Fl s -Use symbolic links. Usually files are copied to the spool directory. +Use symbolic links. +Usually files are copied to the spool directory. The .Fl s option will use .Xr symlink 2 to link data files rather than trying to copy them so large files can be -printed. This means the files should +printed. +This means the files should not be modified or removed until they have been printed. .El .Pp @@ -148,12 +152,13 @@ The remaining options apply to copies, the page display, and headers: .It Fl \&# Ns Ar num The quantity .Ar num -is the number of copies desired of each file named. For example, +is the number of copies desired of each file named. +For example, .Bd -literal -offset indent lpr \-#3 foo.c bar.c more.c .Ed would result in 3 copies of the file foo.c, followed by 3 copies -of the file bar.c, etc. On the other hand, +of the file bar.c, etc.\& On the other hand, .Bd -literal -offset indent cat foo.c bar.c more.c \&| lpr \-#3 .Ed @@ -177,7 +182,8 @@ file referencing the font pathname. .It Fl C Ar class Job classification -to use on the burst page. For example, +to use on the burst page. +For example, .Bd -literal -offset indent lpr \-C EECS foo.c .Ed diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5 index dd3750aca979..1ea6fea53ba1 100644 --- a/usr.sbin/lpr/lpr/printcap.5 +++ b/usr.sbin/lpr/lpr/printcap.5 @@ -47,11 +47,14 @@ function is a simplified version of the .Xr termcap 5 data base -used to describe line printers. The spooling system accesses the +used to describe line printers. +The spooling system accesses the .Nm file every time it is used, allowing dynamic -addition and deletion of printers. Each entry in the data base -is used to describe one printer. This data base may not be +addition and deletion of printers. +Each entry in the data base +is used to describe one printer. +This data base may not be substituted for, as is possible for .Xr termcap 5 , because it may allow accounting to be bypassed. @@ -60,7 +63,8 @@ The default printer is normally .Em lp , though the environment variable .Ev PRINTER -may be used to override this. Each spooling utility supports an option, +may be used to override this. +Each spooling utility supports an option, .Fl P Ar printer , to allow explicit naming of a destination printer. .Pp @@ -309,9 +313,12 @@ or .Cm of . If both are specified, .Cm of -is ignored. Both filters behave the same except that they are passed -different arguments as above. Specifically, the output filter is -terminated and restarted for each file transmitted. This is necessary +is ignored. +Both filters behave the same except that they are passed +different arguments as above. +Specifically, the output filter is +terminated and restarted for each file transmitted. +This is necessary in order to pass the resulting size to the remote .Xr lpd 8 . .Pp @@ -362,13 +369,16 @@ on the given .Sh TRANSFER STATISTICS When a print job is transfered to a remote machine (which might be another unix box, or may be a network printer), it may be useful -to keep statistics on each transfer. The +to keep statistics on each transfer. +The .Cm sr and .Cm ss options indicate filenames that lpd should use to store such -statistics. A statistics line is written for each datafile of a -job as the file is successfully transferred. The format of the +statistics. +A statistics line is written for each datafile of a +job as the file is successfully transferred. +The format of the line is the same for both the sending and receiving side of a transfer. .Pp @@ -381,7 +391,8 @@ print job as it arrived on the server. Statistics on datafiles being sent might be used as a minimal accounting record, when you want to know who sent which jobs to a remote printer, when they were sent, and how large (in bytes) the -files were. This will not give include any idea of how many pages +files were. +This will not give include any idea of how many pages were printed, because there is no standard way to get that information back from a remote (network) printer in this case. .Sh LOGGING diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1 index 04cfbe0b6091..89d2a598b4d9 100644 --- a/usr.sbin/lpr/lprm/lprm.1 +++ b/usr.sbin/lpr/lprm/lprm.1 @@ -68,13 +68,15 @@ If a single is given, .Nm will remove all jobs which a user -owns. If the super-user employs this flag, the spool queue will +owns. +If the super-user employs this flag, the spool queue will be emptied entirely. .It Ar user Cause .Nm to attempt to remove any jobs queued belonging to that user -(or users). This form of invoking +(or users). +This form of invoking .Nm is useful only to the super-user. .It Ar job\ \&# @@ -106,7 +108,8 @@ there are no jobs in the queue which match the request list. The .Nm utility will kill off an active daemon, if necessary, before removing -any spooling files. If a daemon is killed, a new one is +any spooling files. +If a daemon is killed, a new one is automatically restarted upon completion of file removals. .Sh ENVIRONMENT If the following environment variable exists, it is utilized by diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8 index 2d7bfe70e23b..1cd482495811 100644 --- a/usr.sbin/lpr/pac/pac.8 +++ b/usr.sbin/lpr/pac/pac.8 @@ -67,7 +67,8 @@ is used. Cause the output to be sorted by cost; usually the output is sorted alphabetically by name. .It Fl m -Cause the host name to be ignored in the accounting file. This +Cause the host name to be ignored in the accounting file. +This allows for a user on multiple machines to have all of his printing charges grouped together. .It Fl p Ns Ar price |