From 6c77e3b501573679464272f484a140598ed78faf Mon Sep 17 00:00:00 2001
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 24 Apr 2011 01:11:28 +0000
Subject: [PATCH] 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.

---
 usr.sbin/mountd/mountd.8 | 20 +++++++-------------
 usr.sbin/nfsd/nfsd.8     | 20 +++++++-------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index 17527fdcd85e..2bc670c92dda 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -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 are clients such as PC's,
 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
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index 8c63954120e4..ea99640df574 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -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,