diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index dc6748061..4ed877674 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ntsec.xml (ntsec-mapping-passwdinfo): Drop the word "Note" from
+	a note.
+	(ntsec-mapping-nsswitch): Fix typo.
+
 2015-03-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* faq-programming.xml: Accommodate switch of Cygwin repo to GIT.
diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml
index 0d9c405bf..6dde1cee5 100644
--- a/winsup/doc/ntsec.xml
+++ b/winsup/doc/ntsec.xml
@@ -744,9 +744,9 @@ You want to use a Cygwin username different from your Windows username.
 </para>
 
 <note><para>
-Note: This is only supported via <filename>/etc/passwd</filename>.  A
-Cygwin username maintained in the Windows user databases would require
-very costly (read: slow) search operations.
+This is only supported via <filename>/etc/passwd</filename>.  A Cygwin
+username maintained in the Windows user databases would require very costly
+(read: slow) search operations.
 </para></note>
 </listitem>
 
@@ -876,7 +876,7 @@ file set up to all default values:
   db_enum:  cache builtin
   db_home:  /home/%U
   db_shell: /bin/bash
-  db_gecos: &lt;empty$gt;
+  db_gecos: &lt;empty&gt;
 </screen>
 
 <sect4 id="ntsec-mapping-nsswitch-syntax"><title id="ntsec-mapping-nsswitch-syntax.title">The <filename>/etc/nsswitch.conf</filename> syntax</title>