aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-02-19 01:46:08 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-19 01:46:08 +0000
commit16d2c6310370afe735f3a5cd0869b03a52c0acff (patch)
tree3cba58b01b94184928e03750a43df0e533c9469a
parentcd837b09b5f1cf4ce8bca27049899258fed83a4e (diff)
downloadglibc-16d2c6310370afe735f3a5cd0869b03a52c0acff.tar
glibc-16d2c6310370afe735f3a5cd0869b03a52c0acff.tar.gz
glibc-16d2c6310370afe735f3a5cd0869b03a52c0acff.tar.bz2
glibc-16d2c6310370afe735f3a5cd0869b03a52c0acff.zip
Correct list of services in example NSS configuration file.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--manual/nss.texi5
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ff945330b2..7aee191f33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-19 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #13704]
+ * manual/nss.texi (Services in the NSS configuration): Correct
+ list of services in example configuration file.
+
2012-02-19 Nick Bowler <nbowler@draconx.ca>
[BZ #11322]
diff --git a/NEWS b/NEWS
index da8861c0da..10ef6da2ed 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Version 2.16
174, 350, 411, 3335, 4026, 4596, 4822, 5077, 5805, 5993, 6884, 6907, 9902,
10140, 10210, 11322, 11494, 12047, 13058, 13525, 13526, 13527, 13528,
13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555,
- 13559, 13583, 13618
+ 13559, 13583, 13618, 13704
* ISO C11 support:
diff --git a/manual/nss.texi b/manual/nss.texi
index 3deb9f0b5b..962758329b 100644
--- a/manual/nss.texi
+++ b/manual/nss.texi
@@ -138,8 +138,9 @@ the reaction on lookup result like @code{[NOTFOUND=return]}.
@node Services in the NSS configuration, Actions in the NSS configuration, NSS Configuration File, NSS Configuration File
@subsection Services in the NSS configuration File
-The above example file mentions four different services: @code{files},
-@code{db}, @code{nis}, and @code{nisplus}. This does not mean these
+The above example file mentions five different services: @code{files},
+@code{db}, @code{dns}, @code{nis}, and @code{nisplus}. This does not
+mean these
services are available on all sites and it does also not mean these are
all the services which will ever be available.