From 56d5a57e5fdf3ba796a332c631ef28ecc9bcf869 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri, 1 Jul 2022 15:21:38 +0100
Subject: [PATCH] Update FAQs which are out of date on the details of setup UI

---
 winsup/doc/faq-setup.xml | 11 ++++++-----
 winsup/doc/faq-using.xml | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index ce1069616..da9fce534 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -518,10 +518,11 @@ getpwnam(3), disregarding <literal>HOME</literal>.
 <question><para>How do I uninstall individual packages?</para></question>
 <answer>
 
-<para>Run the Cygwin Setup program as you would to install packages.  In the list of
-packages to install, browse the relevant category or click on the
-``View'' button to get a full listing.  Click on the cycle glyph until
-the action reads ``Uninstall''.  Proceed by clicking ``Next''.
+<para>Run the Cygwin Setup program as you would to install packages.  In the
+``Select packages to install'' dialog, choose ``Up To Date'' in the
+<literal>View</literal> drop-down menu, and locate the package.  Choose the
+``Uninstall'' action from the drop-down menu in the ``New'' column. Proceed by
+clicking ``Next''.
 </para>
 </answer></qandaentry>
 
@@ -688,7 +689,7 @@ files, reinstall the "<literal>cygwin</literal>" package using the Cygwin Setup
 this purpose.  See <ulink url="http://rsync.samba.org/"/>,
 <ulink url="http://www.gnu.org/software/wget/"/> for utilities that can do this for you.
 For more information on setting up a custom Cygwin package server, see
-the <ulink url="https://sourceware.org/cygwin-apps/setup.html">Cygwin Setup program page</ulink>.
+the <ulink url="https://cygwin.com/package-server.html.html">Cygwin Package Server page</ulink>.
 
 </para>
 </answer></qandaentry>
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 7b9bbe1c1..ea5f5a797 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -15,13 +15,13 @@
 <para>To repair the damage, you must run the Cygwin Setup program again, and re-install the
 package which provides the missing DLL package.
 </para>
-<para>If you already installed the package at one point, the Cygwin Setup program won't
-show the option to install the package by default.  In the
-``Select packages to install'' dialog, click on the <literal>Full/Part</literal>
-button.  This lists all packages, even those that are already
-installed.  Scroll down to locate the missing package, for instance
-<literal>libncurses8</literal>.  Click on the ``cycle'' glyph until it says
-``Reinstall''.  Continue with the installation.
+<para>If you already installed the package at one point, the Cygwin Setup
+program won't show the option to install the package by default.  In the
+``Select packages to install'' dialog, choose ``Full'' in the
+<literal>View</literal> drop-down menu.  This lists all packages, even those
+that are already installed.  Scroll down to locate the missing package, for
+instance <literal>libncurses8</literal>.  Choose the ``Reinstall'' action from
+the drop-down menu in the ``New'' column.  Continue with the installation.
 </para>
 <para>For a detailed explanation of the general problem, and how to extend
 it to other missing DLLs and identify their containing packages, see