Changeset 807 for branches/branch-1.6/docs

Timestamp:

Jan 22, 2017, 5:56:53 PM (8 years ago)

Author:

djay

Message:

Merge trunk into branch-1.6

Location:

branches/branch-1.6

Files:

• . (modified) (1 prop)
• docs/contribute/release.rst (modified) (1 diff)
• docs/install/installation.rst (modified) (1 diff)

branches/branch-1.6/docs/contribute/release.rst

@@ -22 +22 @@
 * Read the documentation and remove outdated parts.
 * Create release candidate as .zip and .tar.bz2  then add them on this
-  `page <http://zoo-project.org/site/Downloads>`_ (by editing this
-  `wiki page <http://zoo-project.org/trac/wiki/Download>`_)
+  `page <http://zoo-project.org/new/Code/Download>`_ (by editing this
+  `wiki page <http://zoo-project.org/trac/wiki/ZooWebSite/2015/Code/Download>`_)
 * Cut a release candidate once you think that everything is in
   order. Announce the release candidate for review for at least 1

branches/branch-1.6/docs/install/installation.rst

@@ -94 +94 @@
 installation directory but, in case you want to store this file in
 another place, then you can use the ``--with-etc-dir`` option so it
-will search for the ``main.cfg``file in the ``sysconfdir`` directory.
+will search for the ``main.cfg`` file in the ``sysconfdir`` directory.
 
 For instance, you can define that the directory to store the