diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 91f03b83c..6e38ac0be 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-20  Corinna Vinschen  <corinna@vinschen.de>
+
+	* pathnames.sgml (pathnames-intro): Remove paragraph on UNC paths.
+	Try to be clearer on POSIX vs. Win32 paths.
+	(unc-paths): New section.
+	(cygdrive): Fix a few SGML qualifiers.
+	* setup-net.sgml: Move ntsec section from here...
+	* using.sgml: ..to here.
+
 2012-07-18  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* new-features.sgml (ov-new1.7.16): Document getmntent_r.
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index e2a031581..3a4769e9e 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -2,12 +2,12 @@
 
 <sect2 id="pathnames-intro"><title>Introduction</title>
 
-<para>Cygwin supports both Win32- and POSIX-style paths.  Directory
+<para>Cygwin supports both POSIX- and Win32-style paths.  Directory
 delimiters may be either forward slashes or backslashes.  Paths using
-backslashes are always handled as Win32 paths.  POSIX paths must only
-use forward slashes as delimiter, otherwise they are treated as Win32
-paths and file access might fail in surprising ways.  UNC pathnames
-(starting with two slashes and a network name) are also supported.</para>
+backslashes or starting with a drive letter are always handled as
+Win32 paths.  POSIX paths must only use forward slashes as delimiter,
+otherwise they are treated as Win32 paths and file access might fail
+in surprising ways.</para>
 
 <note><para>The usage of Win32 paths, though possible, is deprecated,
 since it circumvents important internal path handling mechanisms. 
@@ -269,11 +269,27 @@ old user mount points as before.
 
 </sect2>
 
+<sect2 id="unc-paths"><title>UNC paths</title>
+
+<para>Apart from the unified POSIX tree starting at the <filename>/</filename>
+directory, UNC pathnames starting with two slashes and a server name
+(<filename>//machine/share/...</filename>) are supported as well.
+They are handled as POSIX paths if only containing forward slashes.  There's
+also a virtual directory <filename>//</filename> which allows to enumerate
+the fileservers known to the local machine with <command>ls</command>.
+Same goes for the UNC paths of the type <filename>//machine</filename>,
+which allow to enumerate the shares provided by the server
+<literal>machine</literal>. For often used UNC paths it makes sense to
+add them to the mount table (see <xref linkend="mount-table"></xref> so
+they are included in the unified POSIX path tree.</para>
+
+</sect2>
+
 <sect2 id="cygdrive"><title>The cygdrive path prefix</title>
 
 <para>As already outlined in <xref linkend="ov-hi-files"></xref>, you can
 access arbitary drives on your system by using the cygdrive path prefix.
-The default value for this prefix is <literal>/cygdrive</literal>, and
+The default value for this prefix is <filename>/cygdrive</filename>, and
 a path to any drive can be constructed by using the cygdrive prefix and
 appending the drive letter as subdirectory, like this:</para>
 
@@ -287,7 +303,7 @@ appending the drive letter as subdirectory, like this:</para>
 on a system are subsumed.  The mount options of the cygdrive prefix is
 used for all file access through the cygdrive prefixed drives.  For instance,
 assuming the cygdrive mount options are <literal>binary,posix=0</literal>,
-then any file <literal>/cygdrive/x/file</literal> will be opened in
+then any file <filename>/cygdrive/x/file</filename> will be opened in
 binary mode by default (mount option <literal>binary</literal>), and the case
 of the filename doesn't matter (mount option <literal>posix=0</literal>).
 </para>
diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml
index 889f1e0fb..4694eb330 100644
--- a/winsup/doc/setup-net.sgml
+++ b/winsup/doc/setup-net.sgml
@@ -260,6 +260,5 @@ Problems with Cygwin</ulink>.
 DOCTOOL-INSERT-setup-env
 DOCTOOL-INSERT-setup-maxmem
 DOCTOOL-INSERT-setup-locale
-DOCTOOL-INSERT-ntsec
 DOCTOOL-INSERT-setup-files
 </chapter>
diff --git a/winsup/doc/using.sgml b/winsup/doc/using.sgml
index 4678cff93..4a802e6c8 100644
--- a/winsup/doc/using.sgml
+++ b/winsup/doc/using.sgml
@@ -14,6 +14,8 @@ DOCTOOL-INSERT-using-specialnames
 
 DOCTOOL-INSERT-using-cygwinenv
 
+DOCTOOL-INSERT-ntsec
+
 DOCTOOL-INSERT-using-cygserver
 
 DOCTOOL-INSERT-using-utils