diff --git a/docs/Misc/How-to-setup-Torguard-for-port-forwarding.md b/docs/Misc/How-to-setup-Torguard-for-port-forwarding.md
index 8fb8b2a83..fa25b851f 100644
--- a/docs/Misc/How-to-setup-Torguard-for-port-forwarding.md
+++ b/docs/Misc/How-to-setup-Torguard-for-port-forwarding.md
@@ -1,30 +1,20 @@
# Setup TorGuard for port forwarding
-!!! note
+These are our supported and recommended settings, if you would like to choose others please keep that in mind.
- These settings are a recommendation if you want to choose other settings be my guest.
+If you want to support me, please use this [referral link](https://torguard.net/aff.php?aff=5575){:target="_blank" rel="noopener noreferrer"} and enter the following discount code:
- If you want to support me, please use this [referral link](https://torguard.net/aff.php?aff=5575){:target="_blank" rel="noopener noreferrer"} and enter the following discount code:
+Get 50% Off ALL Plans (Anonymous VPN, Anonymous VPN Pro, Anonymous VPN Premium)
- Get 50% Off ALL Plans (Anonymous VPN, Anonymous VPN Pro, Anonymous VPN Premium)
-
- ```
- TRaSH-Guides-2024
- ```
-
- [](https://torguard.net/aff.php?aff=5575){:target="_blank" rel="noopener noreferrer"}
-
- !!! bug ""
-
- As of 13 March Torguard Settles Piracy Lawsuit and has agreed to use commercially reasonable efforts to block BitTorrent traffic on its servers in the US using firewall technology. :bangbang:
-
- I Talked to several people and they are still able to use Torguard for Torrents, Perhaps because the connection is encrypted. And others just selected a server in another country.
+```none
+TRaSH-Guides-2024
+```
- !!! warning "If the US server doesn't work for you use another country"
+[](https://torguard.net/aff.php?aff=5575){:target="_blank" rel="noopener noreferrer"}
- [Source Torguard](https://torguard.net/blog/why-torguard-is-blocking-bittorrent-on-us-servers/){:target="_blank" rel="noopener noreferrer"}.
+!!! bug "As of 13 March 2022 Torguard Settles Piracy Lawsuit and has agreed to use commercially reasonable efforts to block BitTorrent traffic on its servers in the US using firewall technology. :bangbang:
I Talked to several people and they are still able to use Torguard for Torrents, Perhaps because the connection is encrypted. And others just selected a server in another country.
- [Source Torguard](https://torguard.net/blog/why-torguard-is-blocking-bittorrent-on-us-servers/){:target="_blank" rel="noopener noreferrer"}.
- [Source Torrentfreak](https://torrentfreak.com/torguard-settles-piracy-lawsuit-and-agrees-to-block-torrent-traffic-on-u-s-servers-220314/){:target="_blank" rel="noopener noreferrer"}."
- [Source Torrentfreak](https://torrentfreak.com/torguard-settles-piracy-lawsuit-and-agrees-to-block-torrent-traffic-on-u-s-servers-220314/){:target="_blank" rel="noopener noreferrer"}.
+!!! warning "If servers in the United States are not working for you, please try another country"
---
@@ -73,46 +63,34 @@ Then we're going to select which server we're going to use,
For the best speed it's recommended to choose the one nearest to your location.
-!!! tip ""
-
- Sometimes you get better speeds if you use one of your neighboring countries.
+!!! tip "Sometimes you will have better speeds if you choose a neighboring country."
!!! warning "If the US server doesn't work for you use another country"
-Let's use for this example: `USA Miami` and copy/paste the Hostname `us-fl.torguard.org`.
+For this example, let's use: `Netherlands Amsterdam` and copy/paste the hostname `nl.torguard.org`.
-!!! tip
-
- Also check if your chosen server supports OpenVPN or Wireguard depending what you want to use.
+!!! tip "Also check if your selected server supports Wireguard"
### Get your VPN IP
Open a cmd window or something equal and type:
```bash
- ping us-fl.torguard.org
+ ping nl.torguard.org
```
You will then get the IP of the server.
Remember that for later use.
-??? success "Example - [Click to show/hide]"
-
- 
+
---
## How to setup Port forwarding
-!!! note
-
- This section will consist of 2 parts depending if you want to use OVPN or WireGuard so make sure you choose your preferred VPN Tunnel type.
-
-### Port Forward Request
-
-From your Client Area go to your [My Services](https://torguard.net/clientarea.php?action=products){:target="\_blank" rel="noopener noreferrer"}.
+From your `Client Area` dashboard, go to [`My Services`](https://torguard.net/clientarea.php?action=products){:target="\_blank" rel="noopener noreferrer"}.
Then click on `Manage` and select `Port Forward Request`.
@@ -122,73 +100,34 @@ Then click on `Manage` and select `Port Forward Request`.
-### VPN Tunnel Type
-
-Choose your preferred VPN Tunnel type.
-
-#### OVPN Request Port Forward
-
-??? abstract "OVPN Request Port Forward"
-
- 
-
- 1. That's the `IP` we found earlier.
- 1. Select `UDP`.
- 1. Select a `Port/Auth` I personally use `995|SHA1`.
- 1. Select the `Protocol` `TCP`.
- 1. I suggest to use a high `Port` number 10.000+ or a game port you don't use, don't use the default torrent ports 6881- 6889
- (This is also the port you will use in your torrent client).
- 1. Click on the `+` sign and do the same with the `UDP` `Protocol`.
- 1. Then click on `Submit Request`.
-
- If everything went according to plan you will see something like this.
-
- 
-
- You will also receive a e-mail with the ports you forwarded.
-
- !!! Note
-
- Normally it doesn't take more then a few seconds/minutes to get the ports approved if it takes longer or you get `PENDING` I suggest to ping the server again (or choose another sever) and you often get a new IP and retry it again with the new IP.
-
-#### WireGuard Request Port Forward
-
-??? abstract "WireGuard Request Port Forward - [Click to show/hide]"
-
- 
-
- 1. That's the `IP` we found earlier.
- 1. Select `UDP`. (:bangbang: **KEEP THIS ON UDP FOR WireGuard** :bangbang:)
- 1. Select a `Port/Auth` and select `WireGuard`.
- 1. Select the `Protocol` `TCP`.
- 1. I suggest to use a high `Port` number 10.000+ or a game port you don't use, don't use the default torrent ports 6881- 6889
- (This is also the port you will use in your torrent client).
- 1. Click on the `+` sign and do the same with the `UDP` `Protocol`.
- 1. Then click on `Submit Request`.
+### Port Forward Request
- !!! warning "WARNING"
+
- :bangbang: DON'T CHANGE OPTION 2 `UDP` to `TCP` :bangbang:
+1. That's the `IP` we found earlier.
+1. Select `UDP`. (:bangbang: **KEEP THIS ON UDP FOR WireGuard** :bangbang:)
+1. Select `Port/Auth` and select `WireGuard`.
+1. Select the `Protocol` `TCP`.
+1. I suggest to use a high `Port` number 10000+ or a game port you don't use, don't use the default torrent ports 6881- 6889
+ (This is also the port you will use in your torrent client).
+1. Click on the `+` sign, and do the same with the `UDP` `Protocol`.
+1. Then click on `Submit Request`.
- If everything went according to plan you will see something like this.
+!!! warning ":bangbang: DON'T CHANGE OPTION 2 `UDP` to `TCP` :bangbang:"
- 
+If everything succeeds, you will see the following.
- You will also receive a e-mail with the ports you forwarded.
+
- !!! Note
+You will also receive a e-mail with the ports you forwarded.
- Normally it doesn't take more then a few seconds/minutes to get the ports approved if it takes longer or you get `PENDING` I suggest to ping the server again (or choose another sever) and you often get a new IP and retry it again with the new IP.
+!!! Note "Normally it takes only a short while for the ports to be approved, if it takes longer or you get `PENDING` I suggest pinging the server again (or choose another server) to attempt to get a new IP. You can then retry the process with the new IP."
---
## How to create the config file
-!!! note
-
- This section will consist of 2 parts depending if you want to use OVPN or WireGuard so make sure you choose your preferred VPN Tunnel type.
-
-From your Client Area go to your [Config Generator](https://torguard.net/tgconf.php?action=vpn-openvpnconfig){:target="\_blank" rel="noopener noreferrer"}.
+From your `Client Area` dashboard, go to your [`Config Generator`](https://torguard.net/tgconf.php?action=vpn-openvpnconfig){:target="\_blank" rel="noopener noreferrer"}.
`Tools` > `Config Generator`
@@ -198,48 +137,25 @@ From your Client Area go to your [Config Generator](https://torguard.net/tgconf.
### Config Generator
-Choose your preferred VPN Tunnel type.
+
-#### OVPN Config Generator
+1. Choose `WireGuard`.
+1. Choose from the dropdown box the `IP` we got earlier and used for the port forwarding.
+1. Add your `VPN Username`.
+1. Only Change this if you know what you're doing :bangbang:
+1. [Optional] Choose you preferred DNS Server
+1. Only Change this if you know what you're doing :bangbang:
+1. Click on `Generate Config`
-??? abstract "OVPN Config Generator - [Click to show/hide]"
+This will generate a `.conf` file for you to download named with a random number.
- 
+Rename the `.conf` file you just downloaded to `wg0.conf` and copy it to the wireguard folder of your VPN torrent client.
- 1. Keep this on `Default`.
- 1. Choose `OpenVPN`.
- 1. Choose the `IP` we got earlier and used for the port forwarding.
- 1. Choose `UDP`.
- 1. Choose `995|SHA1` or what you selected during the port forwarding.
- 1. Choose `AES-128-GCM`.
- 1. Choose `2.4 and above`.
- 1. Check `Require TLS 1.2`
- 1. Click on `Generate Config`,
-
- Now you will download a `.conf` file with a random number.
-
- Rename the extension from `*.conf` to `*.ovpn` and copy it to your openvpn folder of your VPN torrent client.
-
-#### WireGuard Config Generator
-
-??? abstract "WireGuard Config Generator - [Click to show/hide]"
-
- 
-
- 1. Choose `WireGuard`.
- 1. Choose the `IP` we got earlier and used for the port forwarding.
- 1. Add your `VPN Username`.
- 1. Only Change this if you know what you're doing :bangbang:
- 1. Click on `Generate Config`
-
- Now you will download a `.conf` file with a random number.
-
- Rename the file from `*.conf` to `wg0.conf` and copy it to your wireguard folder of your VPN torrent client.
-
----
+## Torrent client port forwarding setup
-Thanks:
+Follow the torrent client's guides on how to set up port forwarding.
-A big Thanks to [mrhotio](https://github.com/mrhotio) for his excellent instructions on how to setup WireGuard for TorGuard.
+- [qBittorrent](/Downloaders/qBittorrent/Port-forwarding/){:target="\_blank" rel="noopener noreferrer"}
+- [Deluge](/Downloaders/Deluge/Port-Forwarding/){:target="\_blank" rel="noopener noreferrer"}
-{! include-markdown "../../includes/support.md" !}
+--8<-- "includes/support.md"
diff --git a/docs/Misc/images/torguard/cmd-ping.png b/docs/Misc/images/torguard/cmd-ping.png
index dd4651cfe..73dd0b64c 100644
Binary files a/docs/Misc/images/torguard/cmd-ping.png and b/docs/Misc/images/torguard/cmd-ping.png differ
diff --git a/docs/Misc/images/torguard/config-generator-wireguard.png b/docs/Misc/images/torguard/config-generator-wireguard.png
index cd3496141..26e8d9849 100644
Binary files a/docs/Misc/images/torguard/config-generator-wireguard.png and b/docs/Misc/images/torguard/config-generator-wireguard.png differ
diff --git a/docs/Misc/images/torguard/globalvpnnetwork-list.png b/docs/Misc/images/torguard/globalvpnnetwork-list.png
index de55a737f..549adc1ea 100644
Binary files a/docs/Misc/images/torguard/globalvpnnetwork-list.png and b/docs/Misc/images/torguard/globalvpnnetwork-list.png differ
diff --git a/docs/Misc/images/torguard/request-new-pfw-wireguard.png b/docs/Misc/images/torguard/request-new-pfw-wireguard.png
index ef312bb5c..9302fe62a 100644
Binary files a/docs/Misc/images/torguard/request-new-pfw-wireguard.png and b/docs/Misc/images/torguard/request-new-pfw-wireguard.png differ
diff --git a/docs/Misc/images/torguard/servers-globalvpnnetwork.png b/docs/Misc/images/torguard/servers-globalvpnnetwork.png
index 182df56e1..308ae8c6e 100644
Binary files a/docs/Misc/images/torguard/servers-globalvpnnetwork.png and b/docs/Misc/images/torguard/servers-globalvpnnetwork.png differ
diff --git a/docs/Misc/images/torguard/status.png b/docs/Misc/images/torguard/status.png
index 368d5d244..3df1e1873 100644
Binary files a/docs/Misc/images/torguard/status.png and b/docs/Misc/images/torguard/status.png differ