Fix the nfsv4 man page to reflect the changes related to

making the new NFS client and server the default.
This is a content change.

usr.sbin/nfsd/nfsv4.4

@@ -24,14 +24,14 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2011
+.Dd May 15, 2011
 .Dt NFSV4 4
 .Os
 .Sh NAME
 .Nm NFSv4
 .Nd NFS Version 4 Protocol
 .Sh DESCRIPTION
-The experimental NFS client and server provides support for the
+The NFS client and server provides support for the
 .Tn NFSv4
 specification; see
 .%T "Network File System (NFS) Version 4 Protocol RFC 3530" .
@@ -153,27 +153,11 @@ with RPCSEC_GSS (sec=krb5, krb5i, krb5p), only names and KerberosV tickets
 will go on the wire.
 .Sh SERVER SETUP
 .Pp
-To set up the experimental NFS server that supports
+To set up the NFS server that supports
 .Nm ,
-you will need to either build a kernel with:
+you will need to either set the variables in
-.sp
+.Xr rc.conf 5
-.Bd -literal -offset indent -compact
+as follows:
-options	NFSD
-.Ed
-and not
-.Bd -literal -offset indent -compact
-options	NFSSERVER
-.Ed
-.sp
-or start
-.Xr mountd 8
-and
-.Xr nfsd 8
-with the ``-e'' option to force use of the experimental server.
-The
-.Xr nfsuserd 8
-daemon must also be running.
-This will occur if
 .sp
 .Bd -literal -offset indent -compact
 nfs_server_enable="YES"
@@ -181,8 +165,14 @@ nfsv4_server_enable="YES"
 nfsuserd_enable="YES"
 .Ed
 .sp
-are set in
+or start
-.Xr rc.conf 5 .
+.Xr mountd 8
+and
+.Xr nfsd 8
+without the ``-o'' option, which would force use of the old server.
+The
+.Xr nfsuserd 8
+daemon must also be running.
 .Pp
 You will also need to add at least one ``V4:'' line to the
 .Xr exports 5
@@ -196,7 +186,7 @@ there are a couple of
 .Xr sysctl 8
 variables that you can change, which might improve performance.
 .Bl -tag -width Ds
-.It Cm vfs.newnfs.issue_delegations
+.It Cm vfs.nfsd.issue_delegations
 when set non-zero, allows the server to issue Open Delegations to
 clients.
 These delegations permit the client to manipulate the file
@@ -208,7 +198,7 @@ This can only be enabled when the file systems being exported to
 clients are not being accessed locally on the server and, if being
 accessed via NFS Version 2 or 3 clients, these clients cannot be
 using the NLM.
-.It Cm vfs.newnfs.enable_locallocks
+.It Cm vfs.nfsd.enable_locallocks
 can be set to 0 to disable acquisition of local byte range locks.
 Disabling local locking can only be done if neither local accesses
 to the exported file systems nor the NLM is operating on them.
@@ -217,7 +207,7 @@ to the exported file systems nor the NLM is operating on them.
 Note that Samba server access would be considered ``local access'' for the above
 discussion.
 .Pp
-To build a kernel with the experimental
+To build a kernel with the NFS server that supports
 .Nm
 linked into it, the
 .sp
@@ -235,7 +225,9 @@ To do an
 mount, specify the ``nfsv4'' option on the
 .Xr mount_nfs 8
 command line.
-This will force use of the experimental client plus set ``tcp'' and
+This will force use of the client that supports
+.Nm
+plus set ``tcp'' and
 .Nm .
 .Pp
 The
@@ -269,16 +261,16 @@ To get callbacks to work when behind a NAT gateway, a port for the callback
 service will need to be set up on the NAT gateway and then the address
 of the NAT gateway (host IP plus port#) will need to be set by assigning the
 .Xr sysctl 8
-variable vfs.newnfs.callback_addr to a string of the form:
+variable vfs.nfs.callback_addr to a string of the form:
 .sp
 N.N.N.N.N.N
 .sp
 where the first 4 Ns are the host IP address and the last two are the
 port# in network byte order (all decimal #s in the range 0-255).
 .Pp
-To build a kernel with the experimental
+To build a kernel with the client that supports
 .Nm
-client linked into it, the option
+linked into it, the option
 .sp
 .Bd -literal -offset indent -compact
 options	NFSCL