Clarify that Files and Disks are applications (#15669)

wiki/src/contribute/how/documentation/style_guide.mdwn

@@ -27,21 +27,37 @@
   See [[!wikipedia Decimal_separator#Digit_grouping]] and [[!wikipedia
   ISO_31-0#Numbers]].
 
-- **<i>Files</i>**, **<i>Disks</i>**, etc.
+<a id="gnome_application"></a>
 
-  To refer to GNOME applications:
+- **GNOME applications: <i>Files</i>, <i>Disks</i>, etc.**
 
-  - Use their short name as it appears in the menus when giving
-    instructions to be executed inside Tails.
+  GNOME applications that have a common noun as their name (like
+  <span class="application">Files</span> or
+  <span class="application">Disks</span> can be confusing when referred
+  to in the documentation.
 
-    *For example*:
+  Make sure to clarify that you are referring to an application (and
+  not, for example a set of files or disks):
+
+  - *For example*:
+    - In the title of sections
+    - When first referring to the application in a section
+
+  - *Use*:
+    - The <span class="application">Files</span> browser
+    - The <span class="application">Disks</span> utility
+
+  Otherwise, use their short name as it appears in the menus when giving
+  instructions to be executed inside Tails.
+
+  - *For example*:
     - Open */live/persistence/TailsData_unlocked/dotfiles* in *Files*.
 
-  - Prepend "*GNOME*" when giving instructions to be executed outside of
-    Tails.
+  Prepend "*GNOME*" when giving instructions to be executed outside of
+  Tails.
 
-    *For example*:
-    - Install GNOME Disks in Debian.
+  - *For example*:
+    - Install <span class="application">GNOME Disks</span> in Debian.
 
 - **graphics card**
 

wiki/src/doc/encryption_and_privacy/veracrypt.mdwn

@@ -86,15 +86,15 @@ Unlocking a file container
 
 <a id="container-files"></a>
 
-Using <span class="application">Files</span>
---------------------------------------------
+Using the <span class="application">Files</span> browser
+--------------------------------------------------------
 
 If your file container requires keyfiles to unlock, use
-<span class="application">Disks</span> instead. See the [[Using
-<span class="application">Disks</span>|veracrypt#containers-disks]] section
+the <span class="application">Disks</span> utility instead. See the [[Using
+the <span class="application">Disks</span> utility|veracrypt#containers-disks]] section
 below.
 
-1. To start <span class="application">Files</span>, choose
+1. To start the <span class="application">Files</span> browser, choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
      <span class="guisubmenu">Accessories</span>&nbsp;▸
@@ -127,10 +127,10 @@ below.
 
 <a id="container-disks"></a>
 
-Using <span class="application">Disks</span>
---------------------------------------------
+Using the <span class="application">Disks</span> utility
+--------------------------------------------------------
 
-1. To start <span class="application">Disks</span>, choose
+1. To start the <span class="application">Disks</span> utility, choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
      <span class="guisubmenu">Utilities</span>&nbsp;▸
@@ -186,8 +186,8 @@ Using <span class="application">Disks</span>
    button to mount the volume.
 
 1. Click on the <span class="filename">*/media/amnesia/*</span> link in
-   the right pane to open the volume in
-   <span class="application">Files</span>.
+   the right pane to open the volume in the
+   <span class="application">Files</span> browser.
 
 1. Your volume opens in <span class="application">Files</span>.
 
@@ -197,7 +197,7 @@ Closing a file container
 1. Click on the <span class="button">[[!img lib/media-eject.png
    alt="Eject" class="symbolic" link="no"]]</span> button on the label
    of the volume corresponding to your file container in the sidebar of
-   <span class="application">Files</span>.
+   the <span class="application">Files</span> browser.
 
    [[!img eject-container.png link="no" alt=""]]
 
@@ -206,15 +206,15 @@ Unlocking a partition
 
 <a id="partition-files"></a>
 
-Using <span class="application">Files</span>
---------------------------------------------
+Using the <span class="application">Files</span> browser
+--------------------------------------------------------
 
 If your partition requires keyfiles to unlock or is on an internal hard disk,
-use <span class="application">Disks</span> instead. See the [[Using
-<span class="application">Disks</span>|veracrypt#partition-disks]]
+use the <span class="application">Disks</span> utility instead. See the [[Using
+the <span class="application">Disks</span> utility|veracrypt#partition-disks]]
 section below.
 
-1. To start <span class="application">Files</span>, choose
+1. To start the <span class="application">Files</span> browser, choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
      <span class="guisubmenu">Accessories</span>&nbsp;▸
@@ -236,8 +236,8 @@ section below.
 
 <a id="partition-disks"></a>
 
-Using <span class="application">Disks</span>
---------------------------------------------
+Using the <span class="application">Disks</span> utility
+--------------------------------------------------------
 
 1. If your partition is on an internal hard disk, [[set up an administration
    password|doc/first_steps/startup_options/administration_password]] when
@@ -245,7 +245,7 @@ Using <span class="application">Disks</span>
    
    Otherwise, plug in the USB stick or the hard disk which has the partition.
 
-1. To start <span class="application">Disks</span>, choose
+1. To start the <span class="application">Disks</span> utility, choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
      <span class="guisubmenu">Utilities</span>&nbsp;▸
@@ -279,8 +279,8 @@ Using <span class="application">Disks</span>
    button to mount the volume.
 
 1. Click on the <span class="filename">*/media/amnesia/*</span> link in
-   the right pane to open the volume in
-   <span class="application">Files</span>.
+   the right pane to open the volume in the
+   <span class="application">Files</span> browser.
 
 1. Your volume opens in <span class="application">Files</span>.
 
@@ -290,6 +290,6 @@ Closing a partition
 1. Click on the <span class="button">[[!img lib/media-eject.png
    alt="Eject" class="symbolic" link="no"]]</span> button on the label
    of the volume corresponding to your file container in the sidebar of
-   <span class="application">Files</span>.
+   the <span class="application">Files</span> browser.
 
    [[!img eject-partition.png link="no" alt=""]]