From a4f6f0876941954cd0421b9e3457eba343a25249 Mon Sep 17 00:00:00 2001
From: Marko Myllynen <myllynen@redhat.com>
Date: Mon, 2 May 2016 14:03:59 +0300
Subject: [PATCH] nsswitch.conf.5: Document group merging

Document the recently merged glibc group merge support.

https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ced8f8933673f4efda1d666d26a1a949602035ed
https://sourceware.org/glibc/wiki/Proposals/GroupMerging
---
 man5/nsswitch.conf.5 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5
index b99f9fdbc..1e0ec3ce9 100644
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
@@ -204,6 +204,8 @@ where
 .B return
 |
 .B continue
+|
+.B merge
 .RE
 .LP
 The ! negates the test, matching all possible results except the
@@ -257,6 +259,16 @@ without affecting the search result.
 .TP
 .B continue
 Call the next lookup function.
+.TP
+.B merge
+.I [SUCCESS=merge]
+is used between two database entries.
+When a group is located in the first of the two group entries,
+processing will continue on to the next one.
+If the group is also found in the next entry (and the group name and GID
+are an exact match), the member list of the second entry will be added
+to the group object to be returned.
+Available since glibc 2.24.
 .RE
 .SS Compatibility mode (compat)
 The NSS "compat" service is similar to "files" except that it