diff --git a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md
index 7a0c3fdd757cd3483c3dc200ba5e72b33fb9681c..f7ef0e127199ef1a1373f7c26558799703d45a0b 100644
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md
@@ -1,7 +1,7 @@
Resource Allocation and Job Execution
=====================================
-To run a [job](../introduction/), [computational resources](../introduction/) for this particular job must be allocated. This is done via the PBS Pro job workload manager software, which efficiently distributes workloads across the supercomputer. Extensive informations about PBS Pro can be found in the [official documentation here](../../pbspro-documentation/sitemap/), especially in the PBS Pro User's Guide.
+To run a [job](../introduction/), [computational resources](../introduction/) for this particular job must be allocated. This is done via the PBS Pro job workload manager software, which efficiently distributes workloads across the supercomputer. Extensive informations about PBS Pro can be found in the [official documentation here](../pbspro-documentation/pbspro/), especially in the PBS Pro User's Guide.
Resources Allocation Policy
---------------------------
diff --git a/docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md b/docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md
index c8060b67d0e8f9393e2bebc1f890fe88dd271a98..72fd68b2380189a12e9c414095cd0e5920059db0 100644
--- a/docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md
+++ b/docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md
@@ -5,6 +5,9 @@ Resources Allocation Policy
---------------------------
The resources are allocated to the job in a fairshare fashion, subject to constraints set by the queue and resources available to the Project. The Fairshare at Anselm ensures that individual users may consume approximately equal amount of resources per week. Detailed information in the [Job scheduling](job-priority/) section. The resources are accessible via several queues for queueing the jobs. The queues provide prioritized and exclusive access to the computational resources. Following table provides the queue partitioning overview:
+!!! Note "Note"
+ Check the queue status at https://extranet.it4i.cz/anselm/
+
|queue |active project |project resources |nodes|min ncpus|priority|authorization|walltime |
| --- | --- | --- | --- | --- | --- | --- | --- |
|<strong>qexp</strong> |no |none required |2 reserved, 31 totalincluding MIC, GPU and FAT nodes |1 |<em>150</em> |no |1h |
diff --git a/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md b/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md
index 6c7d72dd05496809c4ce078750d7fe65962b63ab..2163cb123727be1031a7a394ebe7f53f36321bae 100644
--- a/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md
+++ b/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md
@@ -1,7 +1,7 @@
-Shell access, data transfer, outgoing connections and GUI
+Accessing the Cluster
==============================
-Interactive Login
+Shell Access
-----------------
The Anselm cluster is accessed by SSH protocol via login nodes login1 and login2 at address anselm.it4i.cz. The login nodes may be addressed specifically, by prepending the login node name to the address.
@@ -203,3 +203,8 @@ Graphical User Interface
- The [X Window system](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
- The [Virtual Network Computing](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
+
+VPN Access
+----------
+
+- Access to IT4Innovations internal resources via [VPN](../get-started-with-it4innovations/vpn-access/).
diff --git a/docs.it4i/salomon/7d-enhanced-hypercube.md b/docs.it4i/salomon/7d-enhanced-hypercube.md
index 68133c69ec293cd5c5ae91c1d38f72bf2124db6d..8de69013bc23e66ab20b144b9d2932c908781763 100644
--- a/docs.it4i/salomon/7d-enhanced-hypercube.md
+++ b/docs.it4i/salomon/7d-enhanced-hypercube.md
@@ -6,7 +6,7 @@
|Node type|Count|Short name|Long name|Rack|
-|---|---|
+|---|---|---|---|---|
|M-Cell compute nodes w/o accelerator|576|cns1 -cns576|r1i0n0 - r4i7n17|1-4|
|compute nodes MIC accelerated|432|cns577 - cns1008|r21u01n577 - r37u31n1008|21-38|
diff --git a/docs.it4i/salomon/compute-nodes.md b/docs.it4i/salomon/compute-nodes.md
index 8c4ed9298fbaf20183e04fdcb1bbcf5edc09d31a..c6e17ebeab19cb021744455290cf05852a1fdfc0 100644
--- a/docs.it4i/salomon/compute-nodes.md
+++ b/docs.it4i/salomon/compute-nodes.md
@@ -6,7 +6,7 @@ Nodes Configuration
Salomon is cluster of x86-64 Intel based nodes. The cluster contains two types of compute nodes of the same processor type and memory size.
Compute nodes with MIC accelerator **contains two Intel Xeon Phi 7120P accelerators.**
-[More about schematic representation of the Salomon cluster compute nodes IB topology](network-1/ib-single-plane-topology/).
+[More about schematic representation of the Salomon cluster compute nodes IB topology](ib-single-plane-topology/).
###Compute Nodes Without Accelerator
@@ -47,7 +47,7 @@ Compute nodes with MIC accelerator **contains two Intel Xeon Phi 7120P accelerat
### Compute Nodes Summary
|Node type |Count |Memory |Cores |
- | --- | --- |
+ | --- | --- | --- | --- |
|Nodes without accelerator |576 |128GB |24 @ 2.5Ghz |
|Nodes with MIC accelerator |432 |128GB<p>32GB\ |<p>24 @ 2.5Ghz<p>61 @ 1.238GHz\ |
|UV2000 SMP node |1 |3328GB\ |<p>112 @ 3.3GHz\ |
diff --git a/docs.it4i/salomon/resource-allocation-and-job-execution.md b/docs.it4i/salomon/resource-allocation-and-job-execution.md
index d4b62ec69124e9bad9f061a5f79df35190400cc0..562a07636c2d54b22783e7f51b19c61d3996717b 100644
--- a/docs.it4i/salomon/resource-allocation-and-job-execution.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution.md
@@ -1,7 +1,7 @@
Resource Allocation and Job Execution
=====================================
-To run a [job](job-submission-and-execution/), [computational resources](resources-allocation-policy/) for this particular job must be allocated. This is done via the PBS Pro job workload manager software, which efficiently distributes workloads across the supercomputer. Extensive informations about PBS Pro can be found in the [official documentation here](../../pbspro-documentation/), especially in the [PBS Pro User's Guide](../../pbspro-documentation/).
+To run a [job](job-submission-and-execution/), [computational resources](resources-allocation-policy/) for this particular job must be allocated. This is done via the PBS Pro job workload manager software, which efficiently distributes workloads across the supercomputer. Extensive informations about PBS Pro can be found in the [official documentation here](../pbspro-documentation/pbspro/), especially in the PBS Pro User's Guide.
Resources Allocation Policy
---------------------------
diff --git a/docs.it4i/salomon/resources-allocation-policy.md b/docs.it4i/salomon/resources-allocation-policy.md
index fa7f188a8a773b278748b9290cba550fde9a7c2b..7c4462b59198787955704deeaa8d2343e587791b 100644
--- a/docs.it4i/salomon/resources-allocation-policy.md
+++ b/docs.it4i/salomon/resources-allocation-policy.md
@@ -5,6 +5,9 @@ Resources Allocation Policy
---------------------------
The resources are allocated to the job in a fairshare fashion, subject to constraints set by the queue and resources available to the Project. The Fairshare at Anselm ensures that individual users may consume approximately equal amount of resources per week. Detailed information in the [Job scheduling](job-priority/) section. The resources are accessible via several queues for queueing the jobs. The queues provide prioritized and exclusive access to the computational resources. Following table provides the queue partitioning overview:
+!!! Note "Note"
+ Check the queue status at https://extranet.it4i.cz/rsweb/salomon/
+
|queue |active project |project resources |nodes|min ncpus |priority|authorization|walltime |
| --- | --- |--- |--- |--- |--- |--- |--- |
|**qexe** Express queue|no |none required |32 nodes, max 8 per user |24 |150 |no |1 / 1h |
diff --git a/docs.it4i/salomon/shell-and-data-access.md b/docs.it4i/salomon/shell-and-data-access.md
index 4fec408023611cbba3a15656c1bc6fc046008c73..f0b470ca185189205467a0eae348d048ab09210b 100644
--- a/docs.it4i/salomon/shell-and-data-access.md
+++ b/docs.it4i/salomon/shell-and-data-access.md
@@ -1,7 +1,7 @@
-Shell access, data transfer, outgoing connections and GUI
+Accessing the Cluster
==============================
-Interactive Login
+Shell Access
-----------------
The Salomon cluster is accessed by SSH protocol via login nodes login1, login2, login3 and login4 at address salomon.it4i.cz. The login nodes may be addressed specifically, by prepending the login node name to the address.
@@ -196,3 +196,8 @@ Graphical User Interface
- The [X Window system](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
- The [Virtual Network Computing](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
+
+VPN Access
+----------
+
+- Access to IT4Innovations internal resources via [VPN](../get-started-with-it4innovations/vpn-access/).
diff --git a/mkdocs.yml b/mkdocs.yml
index 519ad11829759615dd6862528931b196204e4672..a30e45ca58e5901108dd21114fd2095457c179bb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -31,7 +31,6 @@ pages:
- Remote visualization: anselm-cluster-documentation/remote-visualization.md
- Network: anselm-cluster-documentation/network.md
- PRACE User Support: anselm-cluster-documentation/prace.md
- - Resource Allocation and Job Execution : anselm-cluster-documentation/resource-allocation-and-job-execution.md
- Resource allocation policy: anselm-cluster-documentation/resources-allocation-policy.md
- Job Priority: anselm-cluster-documentation/job-priority.md
- Job Submission and Execution: anselm-cluster-documentation/job-submission-and-execution.md
@@ -115,7 +114,6 @@ pages:
- Salomon Cluster Network: salomon/network.md
- IB single-plane topology: salomon/ib-single-plane-topology.md
- 7D Enhanced Hypercube: salomon/7d-enhanced-hypercube.md
- - Resource Allocation and Job Execution : salomon/resource-allocation-and-job-execution.md
- Resources Allocation Policy: salomon/resources-allocation-policy.md
- Job scheduling: salomon/job-priority.md
- Job submission and execution: salomon/job-submission-and-execution.md