diff --git a/ChangeLog b/ChangeLog
index eedfaa098b..62af96b4e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-03-23 13:45  Ulrich Drepper  <drepper@cygnus.com>
+
+	* manual/nss.texi: The database is not called network but networks.
+	Reported by Herbert Xu <herbert@gondor.apana.org.au>.
+
 1998-03-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* configure.in: Correct test for compiler version.
diff --git a/configure b/configure
index 0ad1a0c5eb..a689644a65 100755
--- a/configure
+++ b/configure
@@ -1699,7 +1699,7 @@ if test "$cc_is_recent" != "ok"; then
 *** You need at least egcs 1.0.2 or GNU CC 2.8.1 to compile glibc.
 " 1>&2
 fi
-+
+
 # Test if LD_LIBRARY_PATH contains the notation for the current directory
 # since this would lead to problems installing/building glibc.
 # LD_LIBRARY_PATH contains the current directory if one of the following
@@ -1711,7 +1711,7 @@ echo $ac_n "checking LD_LIBRARY_PATH variable""... $ac_c" 1>&6
 echo "configure:1712: checking LD_LIBRARY_PATH variable" >&5
 case ${LD_LIBRARY_PATH} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
-    ld_library_path_setting="contains current path"
+    ld_library_path_setting="contains current directory"
     ;;
   *)
     ld_library_path_setting="ok"
diff --git a/configure.in b/configure.in
index 1fc18f74a7..1b85727856 100644
--- a/configure.in
+++ b/configure.in
@@ -485,7 +485,7 @@ if test "$cc_is_recent" != "ok"; then
 *** You need at least egcs 1.0.2 or GNU CC 2.8.1 to compile glibc.
 ])
 fi
-+
+
 # Test if LD_LIBRARY_PATH contains the notation for the current directory
 # since this would lead to problems installing/building glibc.
 # LD_LIBRARY_PATH contains the current directory if one of the following
@@ -497,7 +497,7 @@ AC_MSG_CHECKING(LD_LIBRARY_PATH variable)
 changequote(,)dnl
 case ${LD_LIBRARY_PATH} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
-    ld_library_path_setting="contains current path"
+    ld_library_path_setting="contains current directory"
     ;;
   *)
     ld_library_path_setting="ok"
diff --git a/manual/nss.texi b/manual/nss.texi
index 0ed50afe7a..a5dd635fd5 100644
--- a/manual/nss.texi
+++ b/manual/nss.texi
@@ -61,7 +61,7 @@ The databases available in the NSS are
 @cindex group
 @cindex hosts
 @cindex netgroup
-@cindex network
+@cindex networks
 @cindex protocols
 @cindex passwd
 @cindex rpc
@@ -80,7 +80,7 @@ Groups of users, @pxref{Group Database}.
 Host names and numbers, @pxref{Host Names}.
 @item netgroup
 Network wide list of host and users, @pxref{Netgroup Database}.
-@item network
+@item networks
 Network names and numbers, @pxref{Networks Database}.
 @item protocols
 Network protocols, @pxref{Protocols Database}.
@@ -265,7 +265,7 @@ be possible to get the system running even if the file is corrupted or
 missing.
 
 @cindex default value, and NSS
-For the @code{hosts} and @code{network} databases the default value is
+For the @code{hosts} and @code{networks} databases the default value is
 @code{dns [!UNAVAIL=return] files}.  I.e., the system is prepared for
 the DNS service not to be available but if it is available the answer it
 returns is ultimative.
@@ -601,7 +601,7 @@ information from one call to another.
 
 As explained above this function could also have an additional last
 argument.  This depends on the database used; it happens only for
-@code{host} and @code{network}.
+@code{host} and @code{networks}.
 
 The function shall return @code{NSS_STATUS_SUCCESS} as long as their are
 more entries.  When the last entry was read it should return
@@ -628,7 +628,7 @@ The implementation of this function should honour the @var{stayopen}
 flag set by the @code{set@var{DB}ent} function whenever this makes sense.
 
 Again, this function takes an additional last argument for the
-@code{host} and @code{network} database.
+@code{host} and @code{networks} database.
 
 The return value should as always follow the rules given above
 (@pxref{NSS Modules Interface}).