From: Ben Hutchings Date: Wed, 7 Sep 2011 02:55:30 +0000 (+0100) Subject: nfs.man: escape ' nroff for proper rendering, thanks to Simon Paillard (Closes: ... X-Git-Tag: debian/1%1.2.5-1~12 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e9ce0a846a8b751c974535b662651c5ff4ae8abf;p=nfs-utils.git nfs.man: escape ' nroff for proper rendering, thanks to Simon Paillard (Closes: #636278) --- diff --git a/debian/changelog b/debian/changelog index 4842035..7458446 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low + [ Luk Claes ] * nfs-kernel-server-default: Add comment about how to disable NFSv4 + [ Ben Hutchings ] + * nfs.man: escape ' nroff for proper rendering, thanks to Simon Paillard + (Closes: #636278) + -- Luk Claes Sat, 06 Aug 2011 07:38:48 +0200 nfs-utils (1:1.2.4-1) unstable; urgency=low diff --git a/debian/patches/23-nfs.man-escape-nroff-for-proper-rendering.patch b/debian/patches/23-nfs.man-escape-nroff-for-proper-rendering.patch new file mode 100644 index 0000000..a3b3d6b --- /dev/null +++ b/debian/patches/23-nfs.man-escape-nroff-for-proper-rendering.patch @@ -0,0 +1,25 @@ +>From 09a8a502769a110703bf7424037728d987f50f57 Mon Sep 17 00:00:00 2001 +From: Simon Paillard +Date: Tue, 2 Aug 2011 00:13:31 +0200 +Subject: [PATCH] nfs.man: escape ' nroff for proper rendering + +--- + utils/mount/nfs.man | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man +index be91a25..639c931 100644 +--- a/utils/mount/nfs.man ++++ b/utils/mount/nfs.man +@@ -753,7 +753,7 @@ is specified, the client assumes that POSIX locks are local and uses NLM + sideband protocol to lock files when flock locks are used. + .IP + To support legacy flock behavior similar to that of NFS clients < 2.6.12, use +-'local_lock=flock'. This option is required when exporting NFS mounts via ++\'local_lock=flock\'. This option is required when exporting NFS mounts via + Samba as Samba maps Windows share mode locks as flock. Since NFS clients > + 2.6.12 implement flock by emulating POSIX locks, this will result in + conflicting locks. +-- +1.7.2.5 + diff --git a/debian/patches/series b/debian/patches/series index 04e7c5e..a2d9cd8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 19-exports.man-Fix-comment-syntax.patch 20-nfs.man-Fix-fstab-example.patch 22-start-statd-Use-bash.patch +23-nfs.man-escape-nroff-for-proper-rendering.patch