From 1391f2b2543bcbedd43a44778dbd266c9e7a92e9 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 8 Dec 2014 10:55:03 +0000
Subject: [PATCH] 	* faq-setup.xml (faq.setup.upgrade-mountpoints):
 Remove. 	* pathnames.xml (pathnames-mount-ex): Remove note about
 1.5->1.7 	registry mount point updates.

---
 winsup/doc/ChangeLog     |  8 ++++++++
 winsup/doc/faq-setup.xml | 17 -----------------
 winsup/doc/pathnames.xml | 21 ---------------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 2fb5ea7a4..b256125f2 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-07  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-setup.xml (faq.setup.upgrade-mountpoints): Remove.
+	* pathnames.xml (pathnames-mount-ex): Remove note about 1.5->1.7
+	registry mount point updates.
+
+2014-12-06  Corinna Vinschen  <corinna@vinschen.de>
+
 2014-12-06  Corinna Vinschen  <corinna@vinschen.de>
 
 	* posix.xml (std-solaris): Point to libtirpc for xdr functions.
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index b8ec06195..4aa94edfb 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -156,23 +156,6 @@ 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/cygwin-ug-net/using.html#mount-table">http://cygwin.com/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/pathnames.xml b/winsup/doc/pathnames.xml
index 412c98f43..00eb133e7 100644
--- a/winsup/doc/pathnames.xml
+++ b/winsup/doc/pathnames.xml
@@ -256,27 +256,6 @@ 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 role='bold'>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="unc-paths"><title>UNC paths</title>