diff options
author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-03-19 17:57:20 +0000 |
---|---|---|
committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-03-19 17:57:20 +0000 |
commit | 480390dc59325200978ed49a1b26f00a94c91baa (patch) | |
tree | 062c09ac43a080a68cd77af35c77fcac0d938f46 /usr.sbin/lpr | |
parent | fb660b4c0cea9ae33d3d4dac0984c52ed7b6eeb0 (diff) |
Remove hard sentence breaks. Add $OpenBSD$ tags where appropriate. Some other
cleanup along the way.
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/lpc/lpc.8 | 16 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/lpd.8 | 90 | ||||
-rw-r--r-- | usr.sbin/lpr/lpq/lpq.1 | 20 | ||||
-rw-r--r-- | usr.sbin/lpr/lpr/lpr.1 | 53 | ||||
-rw-r--r-- | usr.sbin/lpr/lprm/lprm.1 | 17 | ||||
-rw-r--r-- | usr.sbin/lpr/lptest/lptest.1 | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/pac/pac.8 | 6 |
7 files changed, 127 insertions, 77 deletions
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8 index b2b96b31094..ad9f714a552 100644 --- a/usr.sbin/lpr/lpc/lpc.8 +++ b/usr.sbin/lpr/lpc/lpc.8 @@ -1,3 +1,5 @@ +.\" $OpenBSD: lpc.8,v 1.8 2000/03/19 17:57:06 aaron Exp $ +.\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -69,8 +71,8 @@ will prompt for commands from the standard input. If arguments are supplied, .Nm interprets the first argument as a command and the remaining -arguments as parameters to the command. The standard input -may be redirected causing +arguments as parameters to the command. +The standard input may be redirected causing .Nm to read commands from file. Commands may be abbreviated; @@ -94,8 +96,8 @@ be printed (i.e., do not form a complete printer job) from the specified printer queue(s) on the local machine. .Pp .It Ic disable No {\ all\ |\ printer\ } -Turn the specified printer queues off. This prevents new -printer jobs from being entered into the queue by +Turn the specified printer queues off. +This prevents new printer jobs from being entered into the queue by .Xr lpr . .Pp .It Xo Ic down No {\ all\ |\ printer\ } Ar message @@ -103,7 +105,8 @@ printer jobs from being entered into the queue by .Xc Turn the specified printer queue off, disable printing and put .Em message -in the printer status file. The message doesn't need to be quoted, the +in the printer status file. +The message doesn't need to be quoted, the remaining arguments are treated like .Xr echo 1 . This is normally used to take a printer down and let others know why @@ -144,7 +147,8 @@ printing. Place the jobs in the order listed at the top of the printer queue. .Pp .It Ic up No {\ all\ |\ printer\ } -Enable everything and start a new printer daemon. Undoes the effects of +Enable everything and start a new printer daemon. +Undoes the effects of .Ic down . .El .Sh FILES diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8 index 96c08f8693d..1bf56259249 100644 --- a/usr.sbin/lpr/lpd/lpd.8 +++ b/usr.sbin/lpr/lpd/lpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lpd.8,v 1.9 1999/10/17 19:59:44 aaron Exp $ +.\" $OpenBSD: lpd.8,v 1.10 2000/03/19 17:57:06 aaron Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -47,16 +47,19 @@ 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. It then uses the system calls +prints any files left after a crash. +It then uses the system calls .Xr listen 2 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 The options are as follows: @@ -64,11 +67,12 @@ The options are as follows: .It Fl l Cause .Nm -to log valid requests received from the network. This can be useful -for debugging purposes. +to log valid requests received from the network. +This can be useful for debugging purposes. .El .Pp -Access control is provided by two means. First, all requests must come from +Access control is provided by two means. +First, all requests must come from one of the machines listed in the file .Pa /etc/hosts.equiv or @@ -99,33 +103,40 @@ 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 -on the burst page. +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 .Dq f @@ -135,22 +146,26 @@ 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 -output. +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 Standford. .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. The file contains data produced by +Cifplot File. +The file contains data produced by .Em cifplot . .It v The file contains a raster image. @@ -158,23 +173,31 @@ 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 +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). @@ -194,15 +217,16 @@ skip the file to be printed. 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 -reflect the current status of +file name of the current job being printed. +The second line is updated to reflect the current status of .Nm for the programs .Xr lpq 1 diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1 index 6a2f0cfe450..331d52b9ff6 100644 --- a/usr.sbin/lpr/lpq/lpq.1 +++ b/usr.sbin/lpr/lpq/lpq.1 @@ -1,3 +1,5 @@ +.\" $OpenBSD: lpq.1,v 1.6 2000/03/19 17:57:06 aaron Exp $ +.\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -47,7 +49,7 @@ .Sh DESCRIPTION .Nm lpq examines the spooling area used by -.Xr lpd 8 +.Xr lpd 8 for printing files on the line printer, and reports the status of the specified jobs or all jobs associated with a user. .Nm lpq @@ -61,7 +63,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 @@ -73,12 +76,12 @@ rather than just the specified printer. .El .Pp For each job submitted (i.e., invocation of -.Xr lpr 1 ) +.Xr lpr 1 ) .Nm lpq reports the user's name, current rank in the queue, the names of files comprising the job, the job identifier (a number which may be supplied to -.Xr lprm 1 +.Xr lprm 1 for removing a specific job), and the total size in bytes. Job ordering is dependent on the algorithm used to scan the spooling directory and is supposed @@ -87,7 +90,7 @@ to be (First In First Out). File names comprising a job may be unavailable (when -.Xr lpr 1 +.Xr lpr 1 is used as a sink in a pipeline) in which case the file is indicated as .Dq (standard input) . @@ -96,7 +99,7 @@ If .Nm lpq warns that there is no daemon present (i.e., due to some malfunction), the -.Xr lpc 8 +.Xr lpc 8 command can be used to restart the printer daemon. .Sh ENVIRONMENT If the following environment variable exists, it is used by @@ -132,6 +135,7 @@ may report unreliably. Output formatting is sensitive to the line length of the terminal; this can result 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 82eee40ca59..c395e571cd9 100644 --- a/usr.sbin/lpr/lpr/lpr.1 +++ b/usr.sbin/lpr/lpr/lpr.1 @@ -1,3 +1,5 @@ +.\" $OpenBSD: lpr.1,v 1.3 2000/03/19 17:57:06 aaron Exp $ +.\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -53,10 +55,12 @@ .Sh DESCRIPTION .Nm lpr 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. The spooling daemon will +spooler that the files are not standard text files. +The spooling daemon will use the appropriate filters to print the data accordingly. .Bl -tag -width indent .It Fl c @@ -87,12 +91,12 @@ The files are assumed to contain data from (device independent troff). .It Fl p Use -.Xr pr 1 +.Xr pr 1 to format the files (equivalent to -.Xr print ) . +.Xr print ) . .It Fl t The files are assumed to contain data from -.Xr troff 1 +.Xr troff 1 (cat phototypesetter commands). .It Fl v The files are assumed to contain a raster image for devices like the @@ -103,8 +107,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, -the default printer is used (site dependent), or the value of the +Force output to a specific printer. +Normally, the default printer is used (site dependent), or the value of the environment variable .Ev PRINTER is used. @@ -118,13 +122,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 +.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 @@ -133,19 +139,21 @@ 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 .Pp 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 .Pp -will give three copies of the concatenation of the files. Often -a site will disable this feature to encourage use of a photocopier +will give three copies of the concatenation of the files. +Often a site will disable this feature to encourage use of a photocopier instead. .It Xo .Fl Ns Oo Cm 1234 Oc Ar font @@ -153,7 +161,7 @@ instead. Specifies a .Ar font to be mounted on font position -.Ar i . +.Ar i . The daemon will construct a .Li .railmag @@ -161,13 +169,14 @@ 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 .Pp causes the system name (the name returned by -.Xr hostname 1 ) +.Xr hostname 1 ) to be replaced on the burst page by .Tn EECS , and the file foo.c to be printed. @@ -176,7 +185,7 @@ Job name to print on the burst page. Normally, the first file's name is used. .It Fl T Ar title Title name for -.Xr pr 1 , +.Xr pr 1 , instead of the file name. .It Fl U Ar user User name to print on the burst page, @@ -185,8 +194,8 @@ This option is only honored if the real user ID is daemon (or that specified in the printcap file instead of daemon), and is intended for those instances where print filters wish to requeue jobs. .It Fl i Op numcols -The output is indented. If the next argument -is numeric +The output is indented. +If the next argument is numeric .Pq Ar numcols , it is used as the number of blanks to be printed before each line; otherwise, 8 characters are printed. @@ -257,5 +266,5 @@ Fonts for .Xr troff 1 and .Xr tex -reside on the host with the printer. It is currently not possible to -use local font libraries. +reside on the host with the printer. +It is currently not possible to use local font libraries. diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1 index 7757666c887..6b629e924dc 100644 --- a/usr.sbin/lpr/lprm/lprm.1 +++ b/usr.sbin/lpr/lprm/lprm.1 @@ -1,3 +1,5 @@ +.\" $OpenBSD: lprm.1,v 1.6 2000/03/19 17:57:07 aaron Exp $ +.\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -66,19 +68,21 @@ If a single is given, .Nm lprm will remove all jobs which a user -owns. If the super-user employs this flag, the spool queue will +owns. +If the superuser employs this flag, the spool queue will be emptied entirely. .It Ar user Causes .Nm lprm to attempt to remove any jobs queued belonging to that user -(or users). This form of invoking +(or users). +This form of invoking .Nm lprm -is useful only to the super-user. +is useful only to the superuser. .It Ar job\ \&# A user may dequeue an individual job by specifying its job number. This number may be obtained from the -.Xr lpq 1 +.Xr lpq 1 program, e.g., .Pp .Bd -literal -offset indent @@ -94,7 +98,7 @@ If neither arguments or options are given, .Nm lprm will delete the currently active job if it is owned by the user who invoked -.Nm lprm . +.Nm lprm . .Pp .Nm lprm announces the names of any files it removes and is silent if @@ -102,7 +106,8 @@ there are no jobs in the queue which match the request list. .Pp .Nm lprm 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/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1 index ca69df2fb73..b466ea0de0f 100644 --- a/usr.sbin/lpr/lptest/lptest.1 +++ b/usr.sbin/lpr/lptest/lptest.1 @@ -1,3 +1,5 @@ +.\" $OpenBSD: lptest.1,v 1.3 2000/03/19 17:57:07 aaron Exp $ +.\" .\" Copyright (c) 1985, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8 index 545d1d9b461..d593d46d8a5 100644 --- a/usr.sbin/lpr/pac/pac.8 +++ b/usr.sbin/lpr/pac/pac.8 @@ -1,3 +1,5 @@ +.\" $OpenBSD: pac.8,v 1.4 2000/03/19 17:57:07 aaron Exp $ +.\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -72,8 +74,8 @@ is used. Causes the output to be sorted by cost; usually the output is sorted alphabetically by name. .It Fl m -Causes the host name to be ignored in the accounting file. This -allows for a user on multiple machines to have all of his printing +Causes 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 The value |