Merge pull request #563 from NethServer/master

Update v7 branch
NethServer · Jan 22, 2021 · c42f694 · c42f694
2 parents be10bb2 + 4c2e1b0
commit c42f694
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: python
 python:
-    - "2.7"
+    - "3.9"
 
 env:
     global:
@@ -12,7 +12,7 @@ env:
 
 install:
     - sudo apt-get install sshpass
-    - pip install -r ${BUILD_DIR}/nscom/requirements.txt -r ${BUILD_DIR}/nsent/requirements.txt sphinx==1.7.4
+    - pip install -r ${BUILD_DIR}/nscom/requirements.txt -r ${BUILD_DIR}/nsent/requirements.txt sphinx==3.2.1
 
 script:
     - pushd ${BUILD_DIR}/

diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -20,12 +20,16 @@ Administrator Manual
 
 .. only:: nsent
 
-    .. sidebar:: Contacts
+    .. sidebar:: See also
 
         Support: `helpdesk.nethesis.it <http://helpdesk.nethesis.it>`_
 
         Official site: `www.nethesis.it <http://www.nethesis.it>`_
 
+        Version 6: `docs.nethserver.org <https://docs.nethserver.org/en/v6/>`_
+
+        Italian: `docs.nethserver.org <https://docs.nethserver.org/it/v7/>`_
+
 .. toctree::
    :maxdepth: 2
    :caption: Release notes