From 3fce2d8a2b6d7ff0d15f7eb71f880aa7595f9151 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 14 Jan 2015 11:23:29 +0000
Subject: [PATCH] 	* ntsec.xml (ntsec-mapping-nsswitch-passwd): Document
 /path %H wildcard. 	(ntsec-mapping-nsswitch-home): Disable text explaining
 how the home 	directory is fetched from the homeDrive attribute.

---
 winsup/doc/ChangeLog |  6 ++++++
 winsup/doc/ntsec.xml | 24 +++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index ebc437b28..b220d5bca 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-14  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ntsec.xml (ntsec-mapping-nsswitch-passwd): Document /path %H wildcard.
+	(ntsec-mapping-nsswitch-home): Disable text explaining how the home
+	directory is fetched from the homeDrive attribute.
+
 2015-01-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwinenv.xml (cygwinenv-removed-options): Accommodate list of
diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml
index 389a7875c..42fd83791 100644
--- a/winsup/doc/ntsec.xml
+++ b/winsup/doc/ntsec.xml
@@ -1395,6 +1395,17 @@ definition.
 		  <term><literal>%D</literal></term>
 		  <listitem>Windows domain in NetBIOS style.</listitem>
 		</varlistentry>
+	        <varlistentry>
+		  <term><literal>%H</literal></term>
+		  <listitem>Windows home directory in POSIX style.  Note that,
+			    for the <literal>db_home:</literal> setting, this
+			    only makes sense right after the preceeding slash,
+			    as in
+<screen>
+db_home:  /%H/cygwin
+</screen>
+		  </listitem>
+		</varlistentry>
 	        <varlistentry>
 		  <term><literal>%_</literal></term>
 		  <listitem>Since space and TAB characters are used to separate
@@ -1434,13 +1445,16 @@ of each schema when used with <literal>db_home:</literal>
     <term><literal>windows</literal></term>
     <listitem>The user's home directory is set to the same directory which is
 	      used as Windows home directory.  This is the
+<!--
 	      <literal>homeDrive</literal> AD attribute if set, or the
 	      <literal>homeDirectory</literal> AD attribute if
-	      <literal>homeDrive</literal> is not set.  For SAM accounts,
-	      this is equivalent to the "Home folder" setting in SAM.
-	      If both attributes are unset, Cygwin falls back to the user's
-	      local profile directory, typically something along the lines
-	      of <filename>C:\Users\$USERNAME</filename>.  Of course, the
+	      <literal>homeDrive</literal> is not set.
+-->
+	      <literal>homeDirectory</literal> AD attribute.
+	      For SAM accounts, this is equivalent to the "Home folder" setting
+	      in SAM.  If both attributes are unset, Cygwin falls back to the
+	      user's local profile directory, typically something along the
+	      lines of <filename>C:\Users\$USERNAME</filename>.  Of course, the
 	      Windows directory is converted to POSIX-style by Cygwin.
 	      </listitem>
   </varlistentry>