Admin manual (en): refactor index page (again)

NethServer · Jan 27, 2015 · af24131 · af24131
1 parent e6808d6
commit af24131
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -14,8 +14,7 @@ Release notes 6.6
 .. toctree::
    :maxdepth: 2
 
-   changes
-   upgrade
+   release_notes
 
 Installation
 ------------

diff --git a/administrator-manual/en/changes.rst → administrator-manual/en/release_notes.rst b/administrator-manual/en/changes.rst → administrator-manual/en/release_notes.rst
@@ -1,4 +1,7 @@
-=======
+=============
+Release notes
+=============
+
 Changes
 =======
 
@@ -39,3 +42,18 @@ Changes
 
 * If ``nethserver-mail-filter`` and ``nethserver-firewall-base`` are both installed 
   (gateway mode), port 25 is blocked from green and blue zones. See :ref:`email-port25`.
+
+Upgrading from 6.5
+==================
+
+The system upgrade can be done using the shell.
+
+Make sure the system is fully updated: ::
+
+  yum update
+
+Then, start the upgrade: ::
+
+  yum update --releasever=6.6
+
+At the end, reboot the system.
diff --git a/administrator-manual/en/upgrade.rst b/administrator-manual/en/upgrade.rst