* faq-setup.xml (faq.setup.upgrade-mountpoints): New entry.

	* faq-using.xml (faq.using.directory-structure): Align example to
	latest mount output.
	* pathnames.sgml (mount-table): Add note about upgrade helper scripts
	to create /etc/fstab and /etc/fstab.f/${USER}.

4 files changed, 49 insertions, 5 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 57aad4099..f42cc0426 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,5 +1,13 @@
 2009-05-14  Corinna Vinschen  <corinna@vinschen.de>
 
+	* faq-setup.xml (faq.setup.upgrade-mountpoints): New entry.
+	* faq-using.xml (faq.using.directory-structure): Align example to
+	latest mount output.
+	* pathnames.sgml (mount-table): Add note about upgrade helper scripts
+	to create /etc/fstab and /etc/fstab.f/${USER}.
+
+2009-05-14  Corinna Vinschen  <corinna@vinschen.de>
+
 	* new-features.sgml: Add automounting of /, /usr/bin, and /usr/lib.
 	* pathnames.sgml (pathnames-intro): Be more verbose about POSIX and
 	Win32 paths.
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 6f08ba304..9cf55cc1b 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -113,6 +113,23 @@ and that installing the older version will not help improve Cygwin.
 </para>
 </answer></qandaentry>
 
+<qandaentry id="faq.setup.upgrade-mountpoints">
+<question><para>After upgrading from Cygwin 1.5 to Cygwin 1.7 my user mount points disappeared!  How can I get them back?</para></question>
+<answer>
+
+<para>
+When you upgrade an existing older Cygwin installation to Cygwin 1.7, your old
+system mount points (stored in the HKEY_LOCAL_MACHINE branch of your registry)
+are read by a script and the /etc/fstab file is generated from these entries. 
+No such automatism exists for the user mount points formerly stored in the
+HKEY_CURRENT_USER branch of the registry.  There's a bash script for your
+convenience, which creates a user-specific /etc/fstab/${USER} file for you,
+called /bin/copy-user-registry-fstab.  For more information on the new fstab
+files see the User's Guide at
+<ulink url="http://cygwin.com/1.7/cygwin-ug-net/using.html#mount-table">http://cygwin.com/1.7/cygwin-ug-net/using.html#mount-table</ulink>
+</para>
+</answer></qandaentry>
+
 <qandaentry id="faq.setup.virus">
 <question><para>Is Cygwin Setup, or one of the packages, infected with a virus?</para></question>
 <answer>
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 054030f1b..0830ef073 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -751,13 +751,12 @@ look something like this:
 </para>
 <screen>
 	bash$ mount
-	C:\cygwin\bin on /usr/bin type system (binmode)
-	C:\cygwin\lib on /usr/lib type system (binmode)
-	C:\cygwin on / type system (binmode)
+	C:\cygwin\bin on /usr/bin type ntfs (binary,auto)
+	C:\cygwin\lib on /usr/lib type ntfs (binary,auto)
+	C:\cygwin on / type ntfs (binary,auto)
+	C: on /cygdrive/c type ntfs (binary,posix=0,user,noumount,auto)
 </screen>
 
-<para>(Exactly what you see depends on what options you gave to <literal>setup.exe</literal>.)
-</para>
 <para>Note that /bin and /usr/bin point to the same location, as do /lib and
 /usr/lib.  This is intentional, and you should not undo these mounts
 unless you <emphasis>really</emphasis> know what you are doing.
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index 6234ee8f4..313aef37b 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -211,6 +211,26 @@ points will disappear as soon as your last Cygwin process ends.
 See <xref linkend="mount"></xref> and <xref linkend="umount"></xref> for more
 information.</para>
 
+<note><para>
+When you upgrade an existing older Cygwin installation to Cygwin 1.7,
+your old system mount points (stored in the HKEY_LOCAL_MACHINE branch
+of your registry) are read by a script and the <filename>/etc/fstab</filename>
+file is generated from these entries.  Note that entries for
+<filename>/</filename>, <filename>/usr/bin</filename>, and
+<filename>/usr/lib</filename> are <emphasis>never</emphasis> generated.
+</para>
+
+<para>
+The old user mount points in your HKEY_CURRENT_USER branch of the registry
+are not used to generate <filename>/etc/fstab</filename>.  If you want
+to create a user specific <filename>/etc/fstab.d/${USER}</filename> file
+from your old entries, there's a script available which does exactly
+that for you, <filename>bin/copy-user-registry-fstab</filename>.  Just
+start the script and it will create your user specific fstab file.  Stop
+all your Cygwin processes and restart them, and you can simply use your
+old user mount points as before.
+</para></note>
+
 </sect2>
 
 <sect2 id="cygdrive"><title>The cygdrive path prefix</title>