Address pull request comments

Remove extra images
Rename wireguard, Wireguard to WireGuard
Fix Step numbering
Fix location of VPN Instances and Peers

source/manual/how-tos/wireguard-client-proton.rst

@@ -17,59 +17,39 @@ Step 1 - Download ProtonVPN configuration
 The configuration is available in the ProtonVPN website.
 The `landing page <https://account.protonvpn.com/dashboard>`__ appears after signing in. 
 Click on Downloads from the left hand panel or go to the `downloads page <https://account.protonvpn.com/downloads>`__ and
-scroll down to the `Wireguard configuration <https://account.protonvpn.com/downloads#wireguard-configuration>`__
+scroll down to the `WireGuard configuration <https://account.protonvpn.com/downloads#wireguard-configuration>`__
 
-The existing Wireguard configurations appear first with their expiration dates and following are the options to generate new ones.
+The existing WireGuard configurations appear first with their expiration dates and following are the options to generate new ones.
 
 .. image:: images/proton_wireguard_configuration.png
    :width: 25%
 
-1.1 Select a name for the generated configuration
--------------------------------------------------
-
-.. image:: images/proton_configuration_name.png
-   :width: 25%
+- Select a name for the generated configuration
 
 .. Note::
-    If one is not provided a unique ID will be generated by ProtonVPN
-
-1.2 Select platform
--------------------------------
-
-Select Router as a platform
-
-.. image:: images/proton_platform_selection.png
-   :width: 25%
-
-1.3 Select VPN options
-----------------------
-
-There are 3 options for NetShield blocker filtering
+    If a name is not provided a unique ID will be generated by ProtonVPN
 
-1.  No filtering
-2.  Block malware
-3.  Block malware, ads and trackers
+- Select Router as a platform
+- Select VPN options
 
-There are also options to enable Moderate NAT, NAT-PMP (Port Forwarding) and VPN accelerator as well. The features are documented in the ProtonVPN website.
+    - There are 3 options for NetShield blocker filtering
 
-.. image:: images/proton_vpn_filter_options.png
-   :width: 25%
-
-1.4 Select a server to connect to
----------------------------------
+      -  No filtering
+      -  Block malware
+      -  Block malware, ads and trackers
 
-ProtonVPN proposes the best server or allows the user to select manually.
+    - There are also options to enable Moderate NAT, NAT-PMP (Port Forwarding) and VPN accelerator as well. The features are documented in the ProtonVPN website.
 
-.. image:: images/proton_server_select_1.png
-   :width: 25%
+- Select a server to connect to
 
-There are 2 main choices:
+    - ProtonVPN proposes the best server or allows the user to select manually.
+    - When selecting manually there are 2 main choices:
 
-1.  Standard vs Secure Core configuration
-2.  Exit country
+      -  Standard vs Secure Core configuration
+      -  Exit country
 
-Pick the one that satisfies your requirements and click on `Create` to generate the configuration.
-Upon successful completion a window like the following will appear on the screen.
+    - Pick the one that satisfies your requirements and click on `Create` to generate the configuration.
+    - Upon successful completion a window like the following will appear on the screen.
 
 .. image:: images/proton_configuration_1.png
    :width: 25%
@@ -124,7 +104,7 @@ The public key will be derived from the private key with the "wg pubkey" command
 Step 3 - Setup WireGuard Instance
 ----------------------------------
 
-- Go to :menuselection:`VPN --> WireGuard --> Instances`
+- Go to :menuselection:`VPN --> WireGuard --> Settings --> Instances`
 - Click **+** to add a new Instance configuration
 - Turn on “advanced mode"
 - Configure the Instance from the downloaded ProtonVPN configuration as follows (if an option is not mentioned below, leave it as the default):
@@ -149,7 +129,7 @@ Step 3 - Setup WireGuard Instance
 Step 4 - Configure the peer
 -------------------------------
 
-- Go to :menuselection:`VPN --> WireGuard --> Peers`
+- Go to :menuselection:`VPN --> WireGuard --> Settings --> Peers`
 - Click **+** to add a new Peer
 - Configure the Peer from the downloaded ProtonVPN configuration as follows (if an option is not mentioned below, leave it as the default):
 
@@ -171,13 +151,13 @@ Step 4 - Configure the peer
     places.
 
 --------------------------
-Step 4 - Turn on WireGuard
+Step 5 - Turn on WireGuard
 --------------------------
 
 Turn on WireGuard under :menuselection:`VPN --> WireGuard --> General` if it is not already on
 
 ----------------------------------------------------
-Step 5 - Configure assignments, gateways and routing
+Step 6 - Configure assignments, gateways and routing
 ----------------------------------------------------
 
 The rest of the steps are mostly the same as described in the how-to on selective routing :doc:`wireguard-selective-routing`
@@ -186,7 +166,7 @@ The rest of the steps are mostly the same as described in the how-to on selectiv
 ProtonVPN DNS leaks
 -------------------
 Since ProtonVPN provides a DNS server an extra firewall rule may be required to route the DNS traffic to the
-Wireguard gateway.
+WireGuard gateway.
 
 - Go to :menuselection:`Firewall --> Rules --> [Name of interface for network in which hosts/network resides, eg LAN for LAN hosts]`
 - Click **Add** to add a new rule
@@ -205,7 +185,7 @@ Wireguard gateway.
      **Destination**              *Select the* :code:`RFC1918_Networks` *Alias you created above in the dropdown*
      **Destination port range**   *DNS - DNS*
      **Description**              *Add one if you wish to*
-     **Gateway**                  *Select the Wireguard gateway created according to the selective routing how-to page (eg* :code:`WAN_ProtonVPN` *)*
+     **Gateway**                  *Select the WireGuard gateway created according to the selective routing how-to page (eg* :code:`WAN_ProtonVPN` *)*
     ============================ ====================================================================================================================
 
 - **Save** the rule, and then click **Apply Changes**