From owner-svn-src-head@FreeBSD.ORG Sun Apr 24 01:11:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B90D106564A; Sun, 24 Apr 2011 01:11:28 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 791F18FC08; Sun, 24 Apr 2011 01:11:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3O1BSl3010960; Sun, 24 Apr 2011 01:11:28 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3O1BSZv010957; Sun, 24 Apr 2011 01:11:28 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201104240111.p3O1BSZv010957@svn.freebsd.org> From: Rick Macklem Date: Sun, 24 Apr 2011 01:11:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220981 - in head/usr.sbin: mountd nfsd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2011 01:11:28 -0000 Author: rmacklem Date: Sun Apr 24 01:11:28 2011 New Revision: 220981 URL: http://svn.freebsd.org/changeset/base/220981 Log: Patch the mountd and nfsd man pages to reflect the recent changes done by r220980 to deprecate the -e option and add the -o option. This is a content change for both man pages. Modified: head/usr.sbin/mountd/mountd.8 head/usr.sbin/nfsd/nfsd.8 Modified: head/usr.sbin/mountd/mountd.8 ============================================================================== --- head/usr.sbin/mountd/mountd.8 Sun Apr 24 00:06:56 2011 (r220980) +++ head/usr.sbin/mountd/mountd.8 Sun Apr 24 01:11:28 2011 (r220981) @@ -28,7 +28,7 @@ .\" @(#)mountd.8 8.4 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd October 20, 2007 +.Dd April 23, 2011 .Dt MOUNTD 8 .Os .Sh NAME @@ -38,7 +38,7 @@ mount requests .Sh SYNOPSIS .Nm -.Op Fl 2delnr +.Op Fl 2delnor .Op Fl h Ar bindip .Op Fl p Ar port .Op Ar exportsfile ... @@ -69,17 +69,8 @@ Output debugging information. will not detach from the controlling terminal and will print debugging messages to stderr. .It Fl e -Forces -.Nm -to try and start the experimental server that includes NFSv4 support in it. -If this flag isn't specified, the experimental server will only be started -if it is linked into the kernel and the regular one isn't. -.br -ie. The kernel is built with the following: -.Bd -literal -offset indent -compact -# options NFSSERVER -options NFSD -.Ed +The new NFS server that includes NFSv4 support is now the default, so this +option is now a no-op and should be considered deprecated. .It Fl h Ar bindip Specify specific IP addresses to bind to for TCP and UDP requests. This option may be specified multiple times. @@ -107,6 +98,9 @@ This should only be specified if there a that require it. It will automatically clear the vfs.nfsrv.nfs_privport sysctl flag, which controls if the kernel will accept NFS requests from reserved ports only. +.It Fl o +This flag forces the system to run the old NFS server, which does not +have NFSv4 support in it. .It Fl p Ar port Force .Nm Modified: head/usr.sbin/nfsd/nfsd.8 ============================================================================== --- head/usr.sbin/nfsd/nfsd.8 Sun Apr 24 00:06:56 2011 (r220980) +++ head/usr.sbin/nfsd/nfsd.8 Sun Apr 24 01:11:28 2011 (r220981) @@ -28,7 +28,7 @@ .\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd April 19, 2011 +.Dd April 23, 2011 .Dt NFSD 8 .Os .Sh NAME @@ -38,7 +38,7 @@ server .Sh SYNOPSIS .Nm -.Op Fl ardute +.Op Fl arduteo .Op Fl n Ar num_servers .Op Fl h Ar bindip .Sh DESCRIPTION @@ -101,17 +101,11 @@ Serve .Tn UDP NFS clients. .It Fl e -Forces -.Nm -to try and start the experimental server that includes NFSv4 support in it. -If this flag isn't specified, the experimental server will only be started -if it is linked into the kernel and the regular one isn't. -.br -ie. The kernel is built with the following: -.Bd -literal -offset indent -compact -# options NFSSERVER -options NFSD -.Ed +The new NFS server that includes NFSv4 support is now the default, so this +option is now a no-op and should be considered deprecated. +.It Fl o +Forces the use of the old NFS server that does not include NFSv4 support +in it. .El .Pp For example,