Merge branch 'content_revision' into 'master'

moved Resource Allocation and Job Execution See merge request !19

Merge branch 'content_revision' into 'master'
567551e7 · Pavel Jirásek · ace26465 · 088c97c0 · 567551e7 · 567551e7
Commit 567551e7 authored 8 years ago by Pavel Jirásek
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/capacity-computing.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/capacity-computing.md
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/capacity.zip
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/capacity.zip
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/job-priority.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/job-priority.md
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/job-submission-and-execution.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/job-submission-and-execution.md
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/introduction.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/introduction.md
--- a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/resources-allocation-policy.md
+++ b/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution/resources-allocation-policy.md
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/capacity-computing.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/capacity-computing.md
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/capacity.zip
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/capacity.zip
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/job-priority.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/job-priority.md
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/job-submission-and-execution.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/job-submission-and-execution.md
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/introduction.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/introduction.md
--- a/docs.it4i/salomon/resource-allocation-and-job-execution/resources-allocation-policy.md
+++ b/docs.it4i/salomon/resource-allocation-and-job-execution/resources-allocation-policy.md
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,12 +33,11 @@ pages:
    - Remote visualization: anselm-cluster-documentation/remote-visualization.md
    - Network: anselm-cluster-documentation/network.md
    - PRACE User Support: anselm-cluster-documentation/prace.md
-  - Anselm Cluster Resource Allocation and Job Execution:
+    - Resource Allocation and Job Execution : anselm-cluster-documentation/resource-allocation-and-job-execution.md
-    - Introduction: anselm-cluster-documentation/resource-allocation-and-job-execution/introduction.md
+    - Job Priority: anselm-cluster-documentation/job-priority.md
-    - Job Priority: anselm-cluster-documentation/resource-allocation-and-job-execution/job-priority.md
+    - Job Submission and Execution: anselm-cluster-documentation/job-submission-and-execution.md
-    - Job Submission and Execution: anselm-cluster-documentation/resource-allocation-and-job-execution/job-submission-and-execution.md
+    - Capacity computing: anselm-cluster-documentation/capacity-computing.md
-    - Capacity computing: anselm-cluster-documentation/resource-allocation-and-job-execution/capacity-computing.md
+    - Resource allocation policy: anselm-cluster-documentation/resources-allocation-policy.md
-    - Resource allocation policy: anselm-cluster-documentation/resource-allocation-and-job-execution/resources-allocation-policy.md
    - Storage: anselm-cluster-documentation/storage.md
  - Anselm Cluster Software:
    - Modules: modules-anselm.md
@@ -119,12 +118,11 @@ pages:
    - Introduction: salomon/network/network.md
    - IB single-plane topology: salomon/network/ib-single-plane-topology.md
    - 7D Enhanced Hypercube: salomon/network/7d-enhanced-hypercube.md
-  - Salomon Cluster Resource Allocation and Job Execution:
+    - Resource Allocation and Job Execution : salomon/resource-allocation-and-job-execution.md
-    - Introduction: salomon/resource-allocation-and-job-execution/introduction.md
+    - Job scheduling: salomon/job-priority.md
-    - Job scheduling: salomon/resource-allocation-and-job-execution/job-priority.md
+    - Job submission and execution: salomon/job-submission-and-execution.md
-    - Job submission and execution: salomon/resource-allocation-and-job-execution/job-submission-and-execution.md
+    - Capacity computing: salomon/capacity-computing.md
-    - Capacity computing: salomon/resource-allocation-and-job-execution/capacity-computing.md
+    - Resources Allocation Policy: salomon/resources-allocation-policy.md
-    - Resources Allocation Policy: salomon/resource-allocation-and-job-execution/resources-allocation-policy.md
    - Storage: salomon/storage.md
  - Salomon Cluster Software:
    - Modules: modules-salomon.md