diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md
index 5ec98277637f1cc3b497e357eeb04f35b5f5b3ec..e2d83a559056c8bd6f2843595668831dc0366dd5 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md
+++ b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md
@@ -4,7 +4,7 @@ Accessing the Clusters
The IT4Innovations clusters are accessed by SSH protocol via login nodes.
!!! Note "Note"
- Read more on [Accessing the Salomon Cluster](../../salomon/accessing-the-cluster/accessing-the-cluster/)r or [Accessing the Anselm Cluster](../../anselm-cluster-documentation/shell-and-data-access.md/) pages.
+ Read more on [Accessing the Salomon Cluster](../../salomon/shell-and-data-access.md) or [Accessing the Anselm Cluster](../../anselm-cluster-documentation/shell-and-data-access.md) pages.
PuTTY
-----
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
index d7a68490d7d8d6a4db8ab94b3e9400a0f8036d65..77aead0c22cf77ab00ef617460da849337683069 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
+++ b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
@@ -32,7 +32,7 @@ PuTTY - how to connect to the IT4Innovations cluster
----------------------------------------------------
- Run PuTTY
-- Enter Host name and Save session fields with [Login address](../../../salomon/accessing-the-cluster/accessing-the-cluster/) and browse Connection - > SSH -> Auth menu. The *Host Name* input may be in the format **"username@clustername.it4i.cz"** so you don't have to type your login each time.In this example we will connect to the Salomon cluster using **"salomon.it4i.cz"**.
+- Enter Host name and Save session fields with [Login address](../../../salomon/shell-and-data-access.md) and browse Connection - > SSH -> Auth menu. The *Host Name* input may be in the format **"username@clustername.it4i.cz"** so you don't have to type your login each time.In this example we will connect to the Salomon cluster using **"salomon.it4i.cz"**.
diff --git a/docs.it4i/salomon/accessing-the-cluster/outgoing-connections.md b/docs.it4i/salomon/outgoing-connections.md
similarity index 100%
rename from docs.it4i/salomon/accessing-the-cluster/outgoing-connections.md
rename to docs.it4i/salomon/outgoing-connections.md
diff --git a/docs.it4i/salomon/accessing-the-cluster/accessing-the-cluster.md b/docs.it4i/salomon/shell-and-data-access.md
similarity index 51%
rename from docs.it4i/salomon/accessing-the-cluster/accessing-the-cluster.md
rename to docs.it4i/salomon/shell-and-data-access.md
index 6b2f6e9910ce5f815ae74c56fbabf781c2092920..69d613e8715b8624db59f12cddcc5014c8ab13d3 100644
--- a/docs.it4i/salomon/accessing-the-cluster/accessing-the-cluster.md
+++ b/docs.it4i/salomon/shell-and-data-access.md
@@ -1,4 +1,4 @@
-Shell access and data transfer
+Shell access, data transfer and outgoing connections
==============================
Interactive Login
@@ -108,3 +108,84 @@ $ man sshfs
On Windows, use [WinSCP client](http://winscp.net/eng/download.php) to transfer the data. The [win-sshfs client](http://code.google.com/p/win-sshfs/) provides a way to mount the Salomon filesystems directly as an external disc.
More information about the shared file systems is available [here](storage/storage/).
+
+Connection restrictions
+-----------------------
+Outgoing connections, from Salomon Cluster login nodes to the outside world, are restricted to following ports:
+
+|Port|Protocol|
+|---|---|
+|22|ssh|
+|80|http|
+|443|https|
+|9418|git|
+
+!!! Note "Note"
+ Please use **ssh port forwarding** and proxy servers to connect from Salomon to all other remote ports.
+
+Outgoing connections, from Salomon Cluster compute nodes are restricted to the internal network. Direct connections form compute nodes to outside world are cut.
+
+Port forwarding
+---------------
+
+### Port forwarding from login nodes
+
+!!! Note "Note"
+ Port forwarding allows an application running on Salomon to connect to arbitrary remote host and port.
+
+It works by tunneling the connection from Salomon back to users workstation and forwarding from the workstation to the remote host.
+
+Pick some unused port on Salomon login node (for example 6000) and establish the port forwarding:
+
+```bash
+local $ ssh -R 6000:remote.host.com:1234 salomon.it4i.cz
+```
+
+In this example, we establish port forwarding between port 6000 on Salomon and port 1234 on the remote.host.com. By accessing localhost:6000 on Salomon, an application will see response of remote.host.com:1234. The traffic will run via users local workstation.
+
+Port forwarding may be done **using PuTTY** as well. On the PuTTY Configuration screen, load your Salomon configuration first. Then go to Connection->SSH->Tunnels to set up the port forwarding. Click Remote radio button. Insert 6000 to Source port textbox. Insert remote.host.com:1234. Click Add button, then Open.
+
+Port forwarding may be established directly to the remote host. However, this requires that user has ssh access to remote.host.com
+
+```bash
+$ ssh -L 6000:localhost:1234 remote.host.com
+```
+
+Note: Port number 6000 is chosen as an example only. Pick any free port.
+
+### Port forwarding from compute nodes
+
+Remote port forwarding from compute nodes allows applications running on the compute nodes to access hosts outside Salomon Cluster.
+
+First, establish the remote port forwarding form the login node, as [described above](outgoing-connections/#port-forwarding-from-login-nodes).
+
+Second, invoke port forwarding from the compute node to the login node. Insert following line into your jobscript or interactive shell
+
+```bash
+$ ssh -TN -f -L 6000:localhost:6000 login1
+```
+
+In this example, we assume that port forwarding from login1:6000 to remote.host.com:1234 has been established beforehand. By accessing localhost:6000, an application running on a compute node will see response of remote.host.com:1234
+
+### Using proxy servers
+
+Port forwarding is static, each single port is mapped to a particular port on remote host. Connection to other remote host, requires new forward.
+
+!!! Note "Note"
+ Applications with inbuilt proxy support, experience unlimited access to remote hosts, via single proxy server.
+
+To establish local proxy server on your workstation, install and run SOCKS proxy server software. On Linux, sshd demon provides the functionality. To establish SOCKS proxy server listening on port 1080 run:
+
+```bash
+local $ ssh -D 1080 localhost
+```
+
+On Windows, install and run the free, open source [Sock Puppet](http://sockspuppet.com/) server.
+
+Once the proxy server is running, establish ssh port forwarding from Salomon to the proxy server, port 1080, exactly as [described above](outgoing-connections/#port-forwarding-from-login-nodes).
+
+```bash
+local $ ssh -R 6000:localhost:1080 salomon.it4i.cz
+```
+
+Now, configure the applications proxy settings to **localhost:6000**. Use port forwarding to access the [proxy server from compute nodes](outgoing-connections/#port-forwarding-from-compute-nodes) as well .
diff --git a/docs.it4i/salomon/accessing-the-cluster/vpn-access.md b/docs.it4i/salomon/vpn-access.md
similarity index 100%
rename from docs.it4i/salomon/accessing-the-cluster/vpn-access.md
rename to docs.it4i/salomon/vpn-access.md
diff --git a/mkdocs.yml b/mkdocs.yml
index a70a696b61737b22006966b5deb20b9be47985a5..895775aedaab9d7483cc449d5037e2dc8eed52e6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -113,12 +113,10 @@ pages:
- PRACE User Support: salomon/prace.md
- Environment and Modules: salomon/environment-and-modules.md
- Hardware Overview: salomon/hardware-overview.md
+ - Shell and Data Access: salomon/shell-and-data-access.md
+ - VPN Access: salomon/vpn-access.md
- Compute Nodes: salomon/compute-nodes.md
- List of modules: salomon/list_of_modules.md
- - Salomon Cluster Access:
- - Outgoing connections: salomon/accessing-the-cluster/outgoing-connections.md
- - VPN Access: salomon/accessing-the-cluster/vpn-access.md
- - Accessing the Cluster: salomon/accessing-the-cluster/accessing-the-cluster.md
- Salomon Cluster Network:
- Introduction: salomon/network/network.md
- IB single-plane topology: salomon/network/ib-single-plane-topology.md