nfs.man: Fix syntax errors and improve tabulation

diff --git a/debian/changelog b/debian/changelog
index a6fa187f92d74176748b8218c698de0c3f65cf9d..495a4fc7b85cc3e4a9e11def4f8effafeae36c1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ nfs-utils (1:1.2.3-3) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * statd.man, nfsiostat.man: Fix syntax errors, thanks to Simon Paillard
   * exports.man: Fix syntax errors
+  * nfs.man: Fix syntax errors and improve tabulation
 
  -- Luk Claes <luk@debian.org>  Wed, 13 Apr 2011 22:54:50 +0200
 

diff --git a/debian/patches/20-nfs.man-Fix-fstab-example.patch b/debian/patches/20-nfs.man-Fix-fstab-example.patch
new file mode 100644 (file)
index 0000000..effafd5
--- /dev/null
+++ b/debian/patches/20-nfs.man-Fix-fstab-example.patch
@@ -0,0 +1,88 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: [PATCH] nfs.man: Fix macro use for fstab examples
+
+The groff macros for filling (word-wrapping) and tabulation control are
+lower-case, but are written in upper-case here and so have been ignored.
+
+Change the .NF and .FI lines to lower-case.
+
+Change the .TA lines to lower-case and fix the tab stops to work both
+on a terminal and in Postscript output.
+
+Delete the .SP line where .sp would be redundant.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+
+--- a/utils/mount/nfs.man
++++ b/utils/mount/nfs.man
+@@ -46,11 +46,10 @@
+ The fifth and sixth fields on each line are not used
+ by NFS, thus conventionally each contain the digit zero. For example:
+ .P
+-.SP
+-.NF
+-.TA 2.5i +0.75i +0.75i +1.0i
++.nf
++.ta 8n +14n +14n +9n +20n
+       server:path     /mountpoint     fstype  option,option,...       0 0
+-.FI
++.fi
+ .P
+ The server's hostname and export pathname
+ are separated by a colon, while
+@@ -857,40 +856,40 @@
+ file causes the mount command to negotiate
+ reasonable defaults for NFS behavior.
+ .P
+-.NF
+-.TA 2.5i +0.7i +0.7i +.7i
++.nf
++.ta 8n +16n +6n +6n +30n
+       server:/export  /mnt    nfs     defaults        0 0
+-.FI
++.fi
+ .P
+ Here is an example from an /etc/fstab file for an NFS version 2 mount over UDP.
+ .P
+-.NF
+-.TA 2.5i +0.7i +0.7i +.7i
++.nf
++.ta 8n +16n +6n +6n +30n
+       server:/export  /mnt    nfs     nfsvers=2,proto=udp     0 0
+-.FI
++.fi
+ .P
+ Try this example to mount using NFS version 4 over TCP
+ with Kerberos 5 mutual authentication.
+ .P
+-.NF
+-.TA 2.5i +0.7i +0.7i +.7i
++.nf
++.ta 8n +16n +6n +6n +30n
+       server:/export  /mnt    nfs4    sec=krb5        0 0
+-.FI
++.fi
+ .P
+ This example can be used to mount /usr over NFS.
+ .P
+-.NF
+-.TA 2.5i +0.7i +0.7i +.7i
++.nf
++.ta 8n +16n +6n +6n +30n
+       server:/export  /usr    nfs     ro,nolock,nocto,actimeo=3600    0 0
+-.FI
++.fi
+ .P
+ This example shows how to mount an NFS server
+ using a raw IPv6 link-local address.
+ .P
+-.NF
+-.TA 2.5i +0.7i +0.7i +.7i
++.nf
++.ta 8n +40n +5n +4n +9n
+       [fe80::215:c5ff:fb3e:e2b1%eth0]:/export /mnt    nfs     defaults        0 0
+-.FI
++.fi
+ .SH "TRANSPORT METHODS"
+ NFS clients send requests to NFS servers via
+ Remote Procedure Calls, or

diff --git a/debian/patches/series b/debian/patches/series
index 534045df041d7dc8790e3db9c17b7250e5f7fb94..8057a7095c501d27ae7775a92276403e726df9c8 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 17-Fix-statd.8-manpage-syntax-visible.patch
 18-Fix-nfsiostat.8-manpage-syntax-missing-.I.patch
 19-exports.man-Fix-comment-syntax.patch
+20-nfs.man-Fix-fstab-example.patch