minor refomatting (emacs)

diff --git a/ChangeLog b/ChangeLog
index 018d8f836dfd602204705665d0176b36232fde6a..1e991f13e2ac583c77ad7c0d8d95390c6a179432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2006-04-18  Christos Zoulas    <christos@zoulas.com>
+2006-04-18  Christos Zoulas  <christos@zoulas.com>
 
        * amd/opts.c: Add support for optionally specifying the hostname
        to match against the netgroup in the netgrp and netgrpd selectors.

diff --git a/NEWS b/NEWS
index 6d3e124d52165c284b558bcd28bf4262c50c258b..eed764ffc2d121271313a78751c2af648fdb7af1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 *** Notes specific to am-utils version 6.2a2
 
-Add support for specifying the host to match in the mount selectors
-netgrp and netgrpd. Now one can use either netgrp(<group-name>) or
+Add support for specifying the host to match in the mount selectors netgrp
+and netgrpd.  Now one can use either netgrp(<group-name>) or
 netgrp(<group-name>,<host-name>).
 
 Support new mount options for type:=pcfs mounts: longname, nowin95,

diff --git a/amd/opts.c b/amd/opts.c
index cddc993429b4d83a71bf043d941f443c5e53bc88..63e287778899a2b5b314961f9a43b14c0dccb8e3 100644 (file)
--- a/amd/opts.c
+++ b/amd/opts.c
@@ -904,7 +904,6 @@ f_netgrp(char *arg)
   } else {
     nhost = opt_host;
   }
-
   status = innetgr(arg, nhost, NULL, NULL);
   dlog("netgrp = %s status = %d host = %s", arg, status, nhost);
   if (ptr)

diff --git a/doc/am-utils.texi b/doc/am-utils.texi
index 9bec66eec743f9fd9e2841096dbf7fcd23801c9e..398df95d5fd5449b97072721471483561169769d 100644 (file)
--- a/doc/am-utils.texi
+++ b/doc/am-utils.texi
@@ -1792,32 +1792,34 @@ Always evaluates to false.  @i{ARG} is ignored.
 @cindex Mount selector; netgrp
 @cindex Selector; netgrp
 
-The argument @i{ARG} of this selector is a netgroup name followed optionally
-by a comma and a host name. If the host name is not specified, it
-defaults to @code{$@{host@}}. If the host name (short name) is a member
-of the netgroup, this selector evaluates to true. Otherwise it evaluates
-to false.
+The argument @i{ARG} of this selector is a netgroup name followed
+optionally by a comma and a host name.  If the host name is not
+specified, it defaults to @code{$@{host@}}.  If the host name (short
+name) is a member of the netgroup, this selector evaluates to true.
+Otherwise it evaluates to false.
 
 For example, suppose you have a netgroup @samp{ppp-hosts}, and for
-reasons of performance, these have a local @file{/home} partition, while
-all other clients on the faster network can access a shared home
-directory.  A common map to use for both might look like the following:
+reasons of performance, these have a local @file{/home} partition,
+while all other clients on the faster network can access a shared home
+directory.  A common map to use for both might look like the
+following:
 
 @example
 home/*  netgrp(ppp-hosts);type:=link;fs:=/local/$@{key@} \
         !netgrp(ppp-hosts);type:=nfs;rhost:=serv1;rfs:=/remote/$@{key@}
 @end example
 
-A more complex example that takes advantage of the two argument
-netgrp mount selector is given in the following scenario. Suppose
-one wants to mount the local scratch space from a each host under
+A more complex example that takes advantage of the two argument netgrp
+mount selector is given in the following scenario.  Suppose one wants
+to mount the local scratch space from a each host under
 @file{scratch/<hostname>} and some hosts have their scratch space in a
-different path than others. Hosts in the netgroup @samp{apple-hosts}
-have their scratch space in the @file{/apple} path, where hosts
-in the netgroup @samp{cherry-hosts} have their scratch space in the
-@file{/cherry} path. For hosts that are neither in the @samp{apple-hosts}
-or @samp{cherry-hosts} netgroups we want to make a symlink pointing to
-nowhere but provide a descriptive error message in the link destination:
+different path than others.  Hosts in the netgroup @samp{apple-hosts}
+have their scratch space in the @file{/apple} path, where hosts in the
+netgroup @samp{cherry-hosts} have their scratch space in the
+@file{/cherry} path.  For hosts that are neither in the
+@samp{apple-hosts} or @samp{cherry-hosts} netgroups we want to make a
+symlink pointing to nowhere but provide a descriptive error message in
+the link destination:
 
 @example
 scratch/*      netgrp(apple-hosts,$@{/key@});type:=nfs;rhost:=$@{/key@};\
@@ -1837,15 +1839,15 @@ scratch/*       netgrp(apple-hosts,$@{/key@});type:=nfs;rhost:=$@{/key@};\
 @cindex Mount selector; netgrpd
 @cindex Selector; netgrpd
 
-The argument @i{ARG} of this selector is a netgroup name followed optionally
-by a comma and a host name. If the host name is not specified, it
-defaults to @code{$@{hostd@}}. If the host name (fully-qualified name)
-is a member of the netgroup, this selector evaluates to true. Otherwise
-it evaluates to false.
+The argument @i{ARG} of this selector is a netgroup name followed
+optionally by a comma and a host name.  If the host name is not
+specified, it defaults to @code{$@{hostd@}}.  If the host name
+(fully-qualified name) is a member of the netgroup, this selector
+evaluates to true.  Otherwise it evaluates to false.
 
-The @samp{netgrpd} function uses fully-qualified host names
-to match netgroup names, while the @samp{netgrp}
-function (@pxref{netgrp Selector Function}) uses short host names.
+The @samp{netgrpd} function uses fully-qualified host names to match
+netgroup names, while the @samp{netgrp} function (@pxref{netgrp
+Selector Function}) uses short host names.
 
 @c ----------------------------------------------------------------
 @node in_network Selector Function, true Selector Function, netgrpd Selector Function, Selectors