From 0aea7e667641f075a3efe63b9a35e79e47b82c3d Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Fri, 21 Jun 2013 20:58:11 -0400
Subject: [PATCH] Fix manpage formatting of the "allowed" configuration
 parameter.

---
 NEWS          |  4 +++-
 doc/pwmd.html | 16 ++++++++--------
 doc/pwmd.texi | 16 ++++++++--------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index c707cdf4..2db70a32 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PWMD v3.0.2
 The "allowed" configuration parameter now works in a data file section
 and is a list of local user or group names allowed to open the data
 file. The OPEN, CLEARCACHE and CACHETIMEOUT commands make use of
-this. This also adds a deny flag to a user or group name.
+this. This also adds a deny flag '-' to a user or group name.
 
 Fixed the cache timer to expire deferred cache entries. No longer need
 to wait for the next OPEN or SAVE command.
@@ -11,6 +11,8 @@ to wait for the next OPEN or SAVE command.
 Make use of the --no-passphrase option for non-PKI data files. This
 adds the --no-passphrase option to the PASSWD command.
 
+Show a backtrace on SIGABRT.
+
 
 PWMD v3.0.1
 -----------
diff --git a/doc/pwmd.html b/doc/pwmd.html
index 4e30de84..6472de03 100644
--- a/doc/pwmd.html
+++ b/doc/pwmd.html
@@ -342,19 +342,19 @@ to the socket. Groups should be prefixed with a &lsquo;<samp>@</samp>&rsquo;. Wh
 only the invoking user may connect. A username or group name may also be
 prefixed with a <tt class="key">-</tt> to prevent access to a specific user or group
 in the list. The order of the list is important since a user may be of
-multiple groups. For example:
-</p>
-<div class="example">
-<pre class="example">allowed=-@primary,username
-</pre></div>
-
-<p>would deny all users in group <code>primary</code> but allow <code>username</code>
-who is a member of <code>primary</code>.
+multiple groups.
 </p>
 <p>This parameter may also be specified in a filename section to allow or
 deny a local user to <code>OPEN</code> (see <a href="#OPEN">OPEN</a>) a data file and has the
 same default to allow only the invoking user.
 </p>
+<p>The following example would deny all users in group <code>primary</code> but
+allow <code>username</code> who is a member of <code>primary</code>:
+</p>
+<div class="example">
+<pre class="example">allowed=-@primary,username
+</pre></div>
+
 </dd>
 <dt>&lsquo;<samp>disable_mlockall = boolean</samp>&rsquo;</dt>
 <dd><p>When set to <var>false</var>, <cite>mlockall(2)</cite> will be called on startup.  This
diff --git a/doc/pwmd.texi b/doc/pwmd.texi
index 9edbaa46..b4f58337 100644
--- a/doc/pwmd.texi
+++ b/doc/pwmd.texi
@@ -286,19 +286,19 @@ to the socket. Groups should be prefixed with a @samp{@@}. When not specified
 only the invoking user may connect. A username or group name may also be
 prefixed with a @key{-} to prevent access to a specific user or group
 in the list. The order of the list is important since a user may be of
-multiple groups. For example:
-
-@example
-allowed=-@@primary,username
-@end example
-
-would deny all users in group @code{primary} but allow @code{username}
-who is a member of @code{primary}.
+multiple groups.
 
 This parameter may also be specified in a filename section to allow or
 deny a local user to @code{OPEN} (@pxref{OPEN}) a data file and has the
 same default to allow only the invoking user.
 
+The following example would deny all users in group @code{primary} but
+allow @code{username} who is a member of @code{primary}:
+
+@example
+allowed=-@@primary,username
+@end example
+
 @item disable_mlockall = boolean
 When set to @var{false}, @cite{mlockall(2)} will be called on startup.  This
 will use more physical memory but may also be more secure since no swapping to
-- 
2.11.4.GIT