help: update preferences navigation to v40

Closes #1263

8 files changed, 78 insertions, 37 deletions

diff --git a/help/C/data-cookies.page b/help/C/data-cookies.page
index e8678936a..fa5897725 100644
--- a/help/C/data-cookies.page
+++ b/help/C/data-cookies.page
@@ -7,6 +7,7 @@
     <link type="guide" xref="index#privacy"/>
     <revision pkgversion="3.12" date="2014-01-28" status="final"/>
     <revision pkgversion="3.33" date="2019-04-08" status="final"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="final"/>
 
     <credit type="author copyright">
       <name>Ekaterina Gerasimova</name>
@@ -18,6 +19,11 @@
       <email its:translate="no">baptistem@gnome.org</email>
       <years>2014</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -35,22 +41,18 @@
   <steps>
     <item>
       <p>Press the menu button in the top-right corner of the window and select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Stored Data</gui><gui style="button">Manage
-      Cookies</gui></guiseq>.</p>
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Privacy</gui><gui style="button">Clear Personal
+      Data</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select the cookies that you want to delete.</p>
+      <p>Select the cookies that you want to delete. You can tick only a few
+      domains or tick Cookies to select all domains at once.</p>
     </item>
     <item>
-      <p>Press <gui style="button">-</gui> button or press
-      <key>Delete</key>.</p>
+      <p>Press <gui style="button">Clear Data</gui>.</p>
     </item>
   </steps>
 
-  <p>You can also delete all of your cookies using the
-  <gui style="button">Clear All</gui> button.</p>
-
-
   <note style="important">
     <p>If you wish to delete the cookies a website has stored, you probably also
     wish to delete <link xref="data-personal-data">other data stored by that website</link>.</p>
diff --git a/help/C/data-passwords.page b/help/C/data-passwords.page
index 3f0ec986c..e27e0659a 100644
--- a/help/C/data-passwords.page
+++ b/help/C/data-passwords.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.10" date="2013-10-21" status="review"/>
     <revision pkgversion="3.12" date="2014-01-28" status="candidate"/>
     <revision pkgversion="3.33" date="2019-04-08" status="candidate"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="candidate"/>
 
     <credit type="author copyright">
       <name>Aruna Sankaranarayanan</name>
@@ -26,6 +27,11 @@
       <email its:translate="no">baptistem@gnome.org</email>
       <years>2014</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -38,8 +44,7 @@
   every time that you want to log into a website.</p>
 
   <p>Press the menu button in the top-right corner of the window and select
-  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Stored Data</gui><gui style="button">Manage
-  Passwords</gui></guiseq> to see your saved passwords.</p>
+  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Privacy</gui><gui style="button">Passwords</gui></guiseq> to see your saved passwords.</p>
 
   <!-- Talk about managing passwords, updating them, etc. -->
 
@@ -51,18 +56,19 @@
   <steps>
     <item>
       <p>Press the menu button in the top-right corner of the window and select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Stored Data</gui>
-      <gui style="button">Manage Passwords</gui></guiseq>.</p>
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Privacy</gui>
+      <gui style="button">Passwords</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Enter the address of the website at the top of the window.</p>
+      <p>Click on the search button at the top right and enter the address
+      of the website.</p>
     </item>
     <item>
-      <p>Click on the username for the password which you want to delete.</p>
+      <p>Click on the item to unfold its details.</p>
     </item>
     <item>
-      <p>Press the <gui style="button">-</gui> button to remove the saved
-      password or press the <key>Delete</key> key.</p>
+      <p>Press <gui style="button">Remove Password</gui> to remove the
+      saved password.</p>
     </item>
   </steps>
 
diff --git a/help/C/data-personal-data.page b/help/C/data-personal-data.page
index e34279e17..a6d0bca35 100644
--- a/help/C/data-personal-data.page
+++ b/help/C/data-personal-data.page
@@ -6,12 +6,18 @@
   <info>
     <link type="guide" xref="index#privacy"/>
     <revision pkgversion="3.33" date="2019-04-08" status="candidate"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="candidate"/>
 
     <credit type="author copyright">
       <name>Michael Catanzaro</name>
       <email its:translate="no">mcatanzaro@gnome.org</email>
       <years>2019</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -30,15 +36,15 @@
   <steps>
     <item>
       <p>Press the menu button in the top-right corner of the window and select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Stored Data</gui><gui style="button">Manage
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Privacy</gui><gui style="button">Clear
       Personal Data</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select the types of stored data you wish to delete and the time period
-      from which you wish to delete it.</p>
+      <p>Select the types of stored data you wish to delete and optionally
+      limit the delete action to selected domains.</p>
     </item>
     <item>
-      <p>Press <gui style="button">Clear</gui>.</p>
+      <p>Press <gui style="button">Clear Data</gui>.</p>
     </item>
   </steps>
 </page>
diff --git a/help/C/pref-cookies.page b/help/C/pref-cookies.page
index 4bc1187b6..58b18e8e3 100644
--- a/help/C/pref-cookies.page
+++ b/help/C/pref-cookies.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.10" date="2013-07-02" status="candidate"/>
     <revision pkgversion="3.12" date="2014-01-28" status="final"/>
     <revision pkgversion="3.33" date="2019-04-08" status="final"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="outdated"/>
 
     <credit type="author copyright">
       <name>Ekaterina Gerasimova</name>
@@ -20,6 +21,11 @@
       <email its:translate="no">mdhill@gnome.org</email>
       <years></years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -37,7 +43,7 @@
   <steps>
     <item>
       <p>Press the menu button in the top-right corner of the window and select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Stored Data</gui></guiseq>.</p>
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Privacy</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select whether you want to accept cookies from all websites, accept
diff --git a/help/C/pref-css.page b/help/C/pref-css.page
index 0c3e2f446..48b65e157 100644
--- a/help/C/pref-css.page
+++ b/help/C/pref-css.page
@@ -8,6 +8,7 @@
     <link type="guide" xref="pref"/>
     <revision pkgversion="3.10" date="2013-07-06" status="candidate"/>
     <revision pkgversion="3.33" date="2019-04-08" status="candidate"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="candidate"/>
 
     <credit type="author copyright">
       <name>Gordon Hill</name>
@@ -19,6 +20,11 @@
       <email its:translate="no">kittykat3756@gmail.com</email>
       <years>2013</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -34,17 +40,17 @@
   <steps>
     <item>
       <p>Open the menu at the top-right of the window, then select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Fonts &amp; Style</gui></guiseq>.</p>
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Appearance</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Press <gui style="button">Edit Stylesheet</gui>.</p>
+      <p>Under the Style section, switch <gui>Use Custom Stylesheet</gui> to on.</p>
     </item>
     <item>
-      <p>Your default text editor will open. Add your custom CSS and save
-      the file.</p>
+      <p>Click on the pen icon.</p>
     </item>
     <item>
-      <p>Tick the <gui>Use custom stylesheet</gui> checkbox.</p>
+      <p>Your default text editor will open. Add your custom CSS and save
+      the file.</p>
     </item>
   </steps>
 
diff --git a/help/C/pref-downloads.page b/help/C/pref-downloads.page
index d3d7e6d38..d1caf8b2e 100644
--- a/help/C/pref-downloads.page
+++ b/help/C/pref-downloads.page
@@ -9,12 +9,18 @@
     <revision pkgversion="3.10" date="2013-07-06" status="review"/>
     <revision pkgversion="3.12" date="2014-01-28" status="candidate"/>
     <revision pkgversion="3.33" date="2019-04-08" status="candidate"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="candidate"/>
 
     <credit type="author copyright">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756@gmail.com</email>
       <years>2013</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 <!--    <credit type="copyright editor">
       <name></name>
       <email its:translate="no"></email>
@@ -44,7 +50,7 @@
     </item>
     <item>
       <p>If you want to choose which directory to use each time you download
-      a file, tick the <gui>Always ask where to download files</gui> checkbox.</p>
+      a file, switch <gui>Ask on download</gui> to on.</p>
     </item>
   </steps>
 
diff --git a/help/C/pref-font.page b/help/C/pref-font.page
index bf460bd50..b7dcad198 100644
--- a/help/C/pref-font.page
+++ b/help/C/pref-font.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.10" date="2013-07-06" status="candidate"/>
     <revision pkgversion="3.12" date="2014-01-28" status="final"/>
     <revision pkgversion="3.33" date="2019-04-08" status="final"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="final"/>
 
     <credit type="author copyright">
       <name>Gordon Hill</name>
@@ -20,6 +21,11 @@
       <email its:translate="no">kittykat3756@gmail.com</email>
       <years>2013</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -36,10 +42,10 @@
   <steps>
     <item>
       <p>Open the menu at the top-right of the window, then select
-      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Fonts &amp; Style</gui></guiseq>.</p>
+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Appearance</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Untick the <gui>Use system fonts</gui> checkbox.</p>
+      <p>Switch <gui>Use Custom Fonts</gui> to on.</p>
     </item>
     <item>
       <p>Click on the font to open the font chooser dialog, where you can
diff --git a/help/C/pref-passwords.page b/help/C/pref-passwords.page
index 5b2738db3..5135bef8e 100644
--- a/help/C/pref-passwords.page
+++ b/help/C/pref-passwords.page
@@ -9,12 +9,18 @@
     <revision pkgversion="3.10" date="2013-07-06" status="review"/>
     <revision pkgversion="3.10" date="2013-07-06" status="candidate"/>
     <revision pkgversion="3.33" date="2019-04-08" status="candidate"/>
+    <revision pkgversion="40.alpha" date="2021-01-12" status="candidate"/>
 
     <credit type="author copyright">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756@gmail.com</email>
       <years>2013</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Federico Bruni</name>
+      <email its:translate="no">fede@inventati.org</email>
+      <years>2021</years>
+    </credit>
 <!--    <credit type="copyright editor">
       <name></name>
       <email its:translate="no"></email>
@@ -36,15 +42,12 @@
     <item>
       <p>Press the menu button in the top-right corner of the window and select
       <guiseq><gui style="menuitem">Preferences</gui>
-      <gui style="tab">Stored Data</gui></guiseq>.</p>
-    </item>
-    <item>
-      <p>The <gui style="checkbox">Remember passwords</gui> checkbox will be
-      ticked if your preferences are set to save passwords. Untick it to stop
-      <app>Web</app> remembering passwords.</p>
+      <gui style="tab">Privacy</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Press <gui style="button">Close</gui>.</p>
+      <p>The <gui style="button">Remember Passwords</gui> switch will be
+      on if your preferences are set to save passwords. Switch it off to
+      stop <app>Web</app> remembering passwords.</p>
     </item>
   </steps>