From 7affa38c60d5740ee593fee962b066eb34031cf4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 15 Dec 2014 16:50:00 -0500
Subject: touch up man pages

---
 .gitignore              | 17 +++++------------
 configure.ac            |  2 +-
 man/nslcd.8.xml.in      |  4 ++--
 man/nslcd.conf.5.xml.in | 37 -------------------------------------
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index 22b5af2..017fea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,18 +50,11 @@ stamp-*
 /test-driver
 
 # /man/
-/man/chsh.ldap.1
-/man/chsh.ldap.1.html
-/man/getent.ldap.1
-/man/getent.ldap.1.html
-/man/nslcd.8
-/man/nslcd.8.html
-/man/nslcd.conf.5
-/man/nslcd.conf.5.html
-/man/pam_ldap.8
-/man/pam_ldap.8.html
-/man/pynslcd.8
-/man/pynslcd.8.html
+/man/*.1
+/man/*.5
+/man/*.8
+/man/*.html
+/man/*.xml
 
 # /nslcd/
 /nslcd/nslcd
diff --git a/configure.ac b/configure.ac
index 49d6bd6..5b01caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ AM_PROG_AR
 
 # checks for tool to convert docbook to man
 genman="no"
-AC_PATH_PROGS(DOCBOOK2X_MAN, docbook2x-man)
+AC_PATH_PROGS(DOCBOOK2X_MAN, docbook2x-man docbook2man)
 AC_MSG_CHECKING([for tool to (re)generate man pages])
 if test "x${DOCBOOK2X_MAN}" != x
 then
diff --git a/man/nslcd.8.xml.in b/man/nslcd.8.xml.in
index 536de29..4e4e521 100644
--- a/man/nslcd.8.xml.in
+++ b/man/nslcd.8.xml.in
@@ -43,7 +43,7 @@
 
  <refnamediv id="name">
   <refname>nslcd</refname>
-  <refpurpose>local LDAP name service daemon</refpurpose>
+  <refpurpose>name service LDAP connection daemon</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv id="synopsis">
@@ -135,7 +135,7 @@
  <refsect1 id="files">
   <title>Files</title>
   <para>
-   <filename>/etc/nslcd.conf</filename> - the configuration file
+   <filename>@NSLCD_CONF_PATH@</filename> - the configuration file
    (see <citerefentry><refentrytitle>nslcd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
   </para>
  </refsect1>
diff --git a/man/nslcd.conf.5.xml.in b/man/nslcd.conf.5.xml.in
index eefc0b7..b660aa1 100644
--- a/man/nslcd.conf.5.xml.in
+++ b/man/nslcd.conf.5.xml.in
@@ -224,43 +224,6 @@
      </listitem>
     </varlistentry>
 
-    <varlistentry id="pam_authz_search"> <!-- since 0.7.4 -->
-     <term><option>pam_authz_search</option>
-           <replaceable>FILTER</replaceable></term>
-     <listitem>
-      <para>
-       This option allows flexible fine tuning of the authorisation check that
-       should be performed. The search filter specified is executed and
-       if any entries match, access is granted, otherwise access is denied.
-      </para>
-      <para>
-       The search filter can contain the following variable references:
-         <literal>$username</literal>, <literal>$service</literal>,
-         <literal>$ruser</literal>, <literal>$rhost</literal>,
-         <literal>$tty</literal>, <literal>$hostname</literal>,
-         <literal>$fqdn</literal>, <!-- since 0.8.1 -->
-         <literal>$dn</literal>, and <literal>$uid</literal>.
-       These references are substituted in the search filter using the
-       same syntax as described in the section on attribute mapping
-       expressions below.
-      </para>
-      <para>
-       For example, to check that the user has a proper <literal>authorizedService</literal>
-       value if the attribute is present (this almost emulates the
-       <option>pam_check_service_attr</option> option in PADL's pam_ldap):
-       <literallayout><literal>(&amp;(objectClass=posixAccount)(uid=$username)(|(authorizedService=$service)(!(authorizedService=*))))</literal></literallayout>
-      </para>
-      <para>
-       The <option>pam_check_host_attr</option> option can be emulated with:
-       <literallayout><literal>(&amp;(objectClass=posixAccount)(uid=$username)(|(host=$hostname)(host=$fqdn)(host=\\*)))</literal></literallayout>
-      </para>
-      <para> <!-- since 0.8.9 -->
-       This option may be specified multiple times and all specified searches
-       should at least return one entry for access to be granted.
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="pam_password_prohibit_message"> <!-- since 0.8.11 -->
      <term><option>pam_password_prohibit_message</option>
            "<replaceable>MESSAGE</replaceable>"</term>
-- 
cgit v1.2.2