From: Joseph Myers <joseph@codesourcery.com>
Date: Sun, 19 Feb 2012 01:46:08 +0000 (+0000)
Subject: Correct list of services in example NSS configuration file.
X-Git-Tag: glibc-2.16-tps~979
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16d2c6310370afe735f3a5cd0869b03a52c0acff;p=thirdparty%2Fglibc.git

Correct list of services in example NSS configuration file.
---

diff --git a/ChangeLog b/ChangeLog
index ff945330b21..7aee191f335 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 da8861c0daf..10ef6da2edc 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 3deb9f0b5b1..962758329be 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.