Index: stable/8/usr.bin/pr/pr.1 =================================================================== --- stable/8/usr.bin/pr/pr.1 (revision 244071) +++ stable/8/usr.bin/pr/pr.1 (revision 244072) @@ -1,395 +1,393 @@ .\" Copyright (c) 1991 Keith Muller. .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Keith Muller of the University of California, San Diego. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)pr.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" .Dd July 3, 2004 .Dt PR 1 .Os .Sh NAME .Nm pr .Nd print files .Sh SYNOPSIS .Nm .Bk -words .Op Ar \&+page .Ek .Bk -words .Op Fl Ar column .Ek .Op Fl adFfmprt .Bk -words .Oo .Op Fl e .Op Ar char .Op Ar gap .Oc .Ek .Bk -words .Op Fl L Ar locale .Ek .Bk -words .Op Fl h Ar header .Ek .Bk -words .Oo .Op Fl i .Op Ar char .Op Ar gap .Oc .Ek .Bk -words .Op Fl l Ar lines .Ek .Bk -words .Op Fl o Ar offset .Ek .Bk -words .Oo .Op Fl s .Op Ar char .Oc .Ek .Bk -words .Oo .Op Fl n .Op Ar char .Op Ar width .Oc .Ek .Bk -words .Op Fl w Ar width .Ek .Op - .Op Ar .Sh DESCRIPTION The .Nm utility is a printing and pagination filter for text files. When multiple input files are specified, each is read, formatted, and written to standard output. By default, the input is separated into 66-line pages, each with .Bl -bullet .It A 5-line header with the page number, date, time, and the pathname of the file. .It A 5-line trailer consisting of blank lines. .El .Pp If standard output is associated with a terminal, diagnostic messages are suppressed until the .Nm utility has completed processing. .Pp When multiple column output is specified, text columns are of equal width. By default text columns are separated by at least one .Em . Input lines that do not fit into a text column are truncated. Lines are not truncated under single column output. .Sh OPTIONS In the following option descriptions, column, lines, offset, page, and width are positive decimal integers and gap is a nonnegative decimal integer. .Bl -tag -width 4n .It Ar \&+page Begin output at page number .Ar page of the formatted input. .It Fl Ar column Produce output that is .Ar columns wide (default is 1) that is written vertically down each column in the order in which the text is received from the input file. The options .Fl e and .Fl i are assumed. This option should not be used with .Fl m . When used with .Fl t , the minimum number of lines is used to display the output. (To columnify and reshape text files more generally and without additional formatting, see the .Xr rs 1 utility.) .It Fl a Modify the effect of the .Fl column option so that the columns are filled across the page in a round-robin order (e.g., when column is 2, the first input line heads column 1, the second heads column 2, the third is the second line in column 1, etc.). This option requires the use of the .Fl column option. .It Fl d Produce output that is double spaced. An extra .Em character is output following every .Em found in the input. .It Fl e Xo .Op Ar char Ns .Op Ar gap .Xc Expand each input .Em to the next greater column position specified by the formula .Ar n*gap+1 , where .Em n is an integer > 0. If .Ar gap is zero or is omitted the default is 8. All .Em characters in the input are expanded into the appropriate number of .Em s . If any nondigit character, .Ar char , is specified, it is used as the input tab character. .It Fl F Use a .Em character for new pages, instead of the default behavior that uses a sequence of .Em characters. .It Fl f Same as .Fl F but pause before beginning the first page if standard output is a terminal. .It Fl h Ar header Use the string .Ar header to replace the .Ar file name in the header line. .It Fl i Xo .Op Ar char Ns .Op Ar gap .Xc In output, replace multiple .Em s with .Em s whenever two or more adjacent .Em s reach column positions .Ar gap+1 , .Ar 2*gap+1 , etc. If .Ar gap is zero or omitted, default .Em settings at every eighth column position is used. If any nondigit character, .Ar char , is specified, it is used as the output .Em character. .It Fl L Ar locale Use .Ar locale specified as argument instead of one found in environment. Use "C" to reset locale to default. .It Fl l Ar lines Override the 66 line default and reset the page length to .Ar lines . If .Ar lines is not greater than the sum of both the header and trailer depths (in lines), the .Nm utility suppresses output of both the header and trailer, as if the .Fl t option were in effect. .It Fl m Merge the contents of multiple files. One line from each file specified by a file operand is written side by side into text columns of equal fixed widths, in terms of the number of column positions. The number of text columns depends on the number of file operands successfully opened. The maximum number of files merged depends on page width and the per process open file limit. The options .Fl e and .Fl i are assumed. .It Fl n Xo .Op Ar char Ns .Op Ar width .Xc Provide .Ar width digit line numbering. The default for .Ar width , if not specified, is 5. The number occupies the first .Ar width column positions of each text column or each line of .Fl m output. If .Ar char (any nondigit character) is given, it is appended to the line number to separate it from whatever follows. The default for .Ar char is a .Em . Line numbers longer than .Ar width columns are truncated. .It Fl o Ar offset Each line of output is preceded by .Ar offset .Em s . If the .Fl o option is not specified, the default is zero. The space taken is in addition to the output line width. .It Fl p Pause before each page if the standard output is a terminal. .Nm will write an alert character to standard error and wait for a carriage return to be read on the terminal. .It Fl r Write no diagnostic reports on failure to open a file. .It Fl s Ar char Separate text columns by the single character .Ar char instead of by the appropriate number of .Em s (default for .Ar char is the .Em character). .It Fl t Print neither the five-line identifying header nor the five-line trailer usually supplied for each page. Quit printing after the last line of each file without spacing to the end of the page. .It Fl w Ar width Set the width of the line to .Ar width column positions for multiple text-column output only. If the .Fl w option is not specified and the .Fl s option is not specified, the default width is 72. If the .Fl w option is not specified and the .Fl s option is specified, the default width is 512. .It Ar file A pathname of a file to be printed. If no .Ar file operands are specified, or if a .Ar file operand is .Sq Fl , the standard input is used. The standard input is used only if no .Ar file operands are specified, or if a .Ar file operand is .Sq Fl . .El .Pp The .Fl s option does not allow the option letter to be separated from its argument, and the options .Fl e , .Fl i , and .Fl n require that both arguments, if present, not be separated from the option letter. .Sh EXIT STATUS -The -.Nm -utility exits 0 on success, and 1 if an error occurs. +.Ex -std .Sh DIAGNOSTICS If .Nm receives an interrupt while printing to a terminal, it flushes all accumulated error messages to the screen before terminating. .Pp Error messages are written to standard error during the printing process (if output is redirected) or after all successful file printing is complete (when printing to a terminal). .Sh SEE ALSO .Xr cat 1 , .Xr more 1 , .Xr rs 1 .Sh STANDARDS The .Nm utility is .St -p1003.1-2001 compatible. .Sh HISTORY A .Nm command appeared in .At v1 . .Sh BUGS The .Nm utility does not recognize multibyte characters. Index: stable/8/usr.bin/pr =================================================================== --- stable/8/usr.bin/pr (revision 244071) +++ stable/8/usr.bin/pr (revision 244072) Property changes on: stable/8/usr.bin/pr ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,5 ## Merged /user/luigi/ipfw3-r8/usr.bin/pr:r204833-205419 Merged /vendor/resolver/dist/usr.bin/pr:r1540-186085 Merged /head/sys/usr.bin/pr:r196863 Merged /head/usr.bin/pr:r196879,198020,198480,198483,198897,199747,199799,199821-199822,200068,200171,200182,200275,200295,200359,201217,201225,203376,203384,203711,204195,205992,207842,207844,208320,212770,213738,213814,216591,223132,223152,223947,224271,224641,226396,227006,227755,228857,230555,234206,234772,236338,236346,236365,240605,243238 Merged /stable/9/usr.bin/pr:r237100,241364 Index: stable/8/usr.sbin/nfscbd/nfscbd.8 =================================================================== --- stable/8/usr.sbin/nfscbd/nfscbd.8 (revision 244071) +++ stable/8/usr.sbin/nfscbd/nfscbd.8 (revision 244072) @@ -1,87 +1,85 @@ .\" Copyright (c) 2009 Rick Macklem, University of Guelph .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\" .Dd April 25, 2009 .Dt NFSCBD 8 .Os .Sh NAME .Nm nfscbd .Tn NFSv4 client side callback daemon .Sh SYNOPSIS .Nm nfscbd .Op Fl p Ar port_number .Op Fl P Ar client_principal .Sh DESCRIPTION .Nm runs on a client using .Tn NFSv4 to handle callback requests from the NFSv4 server. If no .Nm is running, NFSv4 mounts will still work, but the server will never issue Open Delegations to the client. .Pp One callback server and one master server are always started. .Pp The following options are available: .Bl -tag -width Ds .It Fl p Ar port_number Specifies what port# the callback server should use. .It Fl P Ar client_principal Specifies the host based principal name to be used as the target for callbacks over RPCSEC_GSS. For KerberosV, it must be in the client's default keytab file. This client_principal should be the same one specified by the .Cm gssname argument being used by nfsv4 mounts. If you do not specify this argument, callbacks will still work over AUTH_SYS, which is what many extant servers use even for RPCSEC_GSS mounts, as of 2009. .El .Pp For example, .Dq Li "nfscbd -p 7654 -P root" starts the daemon to handle callbacks on port# 7654 and is using the host based principal root@. as the callback target. .Pp .Nm listens for service requests at the port defined by NFSV4_CBPORT in /usr/include/fs/nfs/nfs.h, unless .Fl p has been specified. For more information on what callbacks and Open Delegations do, see .%T "Network File System (NFS) Version 4 Protocol" , RFC3530 . -.Pp -The -.Nm -utility exits 0 on success or >0 if an error occurred. +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr nfsv4 4 , .Xr mount_nfs 8 .Sh HISTORY First introduced with the experimental nfs client for NFSv4 support in 2009. Index: stable/8/usr.sbin/nfscbd =================================================================== --- stable/8/usr.sbin/nfscbd (revision 244071) +++ stable/8/usr.sbin/nfscbd (revision 244072) Property changes on: stable/8/usr.sbin/nfscbd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/nfscbd:r243238