- more updates

1 files changed, 20 insertions, 19 deletions

diff --git a/doc/nis-configuration.txt b/doc/nis-configuration.txt
index 3a59c28..4834806 100644
--- a/doc/nis-configuration.txt
+++ b/doc/nis-configuration.txt
@@ -72,7 +72,7 @@ beneath the plugin's entry.  These attributes are recognized:
    converted into NIS map entries can be found.  There is no default
    setting.  If this attribute has more than one value, the resulting
    NIS map will include every entry which can be found by searching
-   under any of the specified entries.
+   under all of the specified entries.
  * nis-secure
    Indicates that the contents of this map should only be visible to
    clients whose queries originated from port numbers below 1024.  The
@@ -81,36 +81,37 @@ beneath the plugin's entry.  These attributes are recognized:
    The filter which is used to select entries for conversion.
  * nis-key-format
    A format specifier which the plugin will use to convert the contents
-   of the directory server entry into the corresponding key in the NIS
-   map.  If this attribute has no or more than one value, it will be
-   ignored.  This can be used to ensure a 1-to-1 mapping between entries
-   in the directory server and a NIS map.
+   of the directory server entry into a key for the NIS map.  If the
+   expression fails to evaluate, or evaluates to more than one value,
+   the entry will be ignored.  This can be used to ensure a 1-to-1
+   mapping between entries in the directory server and a NIS map.
  * nis-keys-format
    A format specifier which the plugin will use to convert the contents
-   of the directory server entry into the corresponding key in the NIS
-   map.  If this attribute has more than one value, the resulting NIS
-   map will include each resulting key with the same corresponding
-   value.  This can be used to allow for an arbitrary number of NIS map
-   entries to be created for a given directory server entry.
+   of the directory server entry into a set of keys for the NIS map.
+   The resulting NIS map will include a key for each value to which the
+   expression evaluates.  This can be used to allow for an arbitrary
+   number of NIS map entries to be created for a given directory server
+   entry.
  * nis-value-format
    A format specifier which the plugin will use to convert the contents
-   of the directory server entry into a corresponding value in the NIS
-   map.
+   of the directory server entry into a NIS map entry's value.  If the
+   entry will have multiple keys, each key will use the same value.
  * nis-values-format
    A format specifier which the plugin will use to convert the contents
-   of the directory server entry into a series of corresponding value in
-   the NIS map.  Typically this will be used in combination with a
-   "nis-keys-format" setting to generate a set of key/value pairs for a
-   single directory server entry.
+   of the directory server entry into values for NIS map entries.
+   Typically this will be used in combination with a "nis-keys-format"
+   setting to generate a set of key/value pairs for a single directory
+   server entry.  If there are fewer values than keys, the values will
+   be reused.
  * nis-disallowed-chars
    A list of characters which, if found in an attribute value, will
    cause that attribute value to be ignored when evaluating keys and
    values.
 
 The nis-filter, nis-key-format, nis-keys-format, nis-value-format, and
-nis-values-format settings all have defaults, for well-known map names,
-which vary based on the name of the NIS map, but the defaults can always
-be overridden.  An example map definition might look like this:
+nis-values-format settings all have defaults which vary based on the
+name of the NIS map, but the defaults can always be overridden.  An
+example map definition might look like this:
 
   dn: nis-domain=example.com+map=email.byname,cn=NIS Server,cn=plugins,cn=config
   objectclass: top