Fix a few typos and try and clearify some statements in the README. Signed-off-by: Ian Kent <raven@xxxxxxxxxx> --- CHANGELOG | 1 + README.amd-maps | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f841eaa..c347fcb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ xx/xx/2016 autofs-5.1.3 - make set_direct_mount_catatonic() more general. - set autofs mounts catatonic at exit. - honor last rw in mount options when doing a bind mount. +- fix typos in README.amd-maps. 15/06/2016 autofs-5.1.2 ======================= diff --git a/README.amd-maps b/README.amd-maps index b31a7db..e79f521 100644 --- a/README.amd-maps +++ b/README.amd-maps @@ -7,7 +7,8 @@ The ability to parse amd format maps has been added to autofs. How to use amd maps in autofs ----------------------------- -To add amd map parsing to autofs new "format" module has been added. +To add amd map parsing to autofs a new "format" module has been added. + To use this new map format module the existing master map syntax is used as described below. @@ -20,7 +21,7 @@ For amd format maps this becomes: /amd/mp file,amd:amd.mp which will use file as the map source and the amd format parser for -the map. But see the section below on configuration below for how to +the map. But see the section below on configuration for how to eliminate the need to specify "map-type,format" in the master map. Configuration sub-system changes @@ -42,18 +43,18 @@ All that's needed to add an existing amd configuration to autofs is to add it below the autofs configuration. Apart from changing the amd "[ global ]" section name to "[ amd ]" nothing else should need to be changed. However, quite a few amd configuration options don't have -meaning within autofs. When these options are seen it should be logged. +meaning within autofs. When these options are seen they are logged. Be aware that, if the an old configuration exists and the configuration hasn't been updated after the installation, changes to the the old configuration will override changes to the new configuration because backward compatibility takes priority over the new implementation. -The amd per-map sections have two functions, to allow per-mount +The amd per-mount sections have two functions, to allow per-mount configuration, as it does in amd, and to allow master map entries to avoid the need to specify the "type,format" part of the master map -entry so they can use the nsswitch map source functionality in the -same way autofs master map entries do. +entry. This allows them to use the nsswitch map source functionality +in the same way autofs master map entries do. If a section for an amd mount is added below the global amd section using the mount point path (as is done in amd.conf) then autofs will @@ -63,7 +64,7 @@ be given in the master map entry the map_name option is not mandatory as it is in amd and will no be used. If a mount point is present in the master map and the source of the -map is nis then it should be sufficient to use (for example): +map is nis then it is sufficient to use (for example): /amd/mp amd.mp -- To unsubscribe from this list: send the line "unsubscribe autofs" in
