Changeset 10991

Timestamp:

2019-05-16T22:54:07+02:00 (4 years ago)

Author:

nicolasmartin

Message:

First part of content synchronisation between trunk & 4.0

Location:

NEMO/trunk

Files:

• INSTALL.rst (modified) (3 diffs)
• README.rst (modified) (1 diff)
• doc/rst/README.rst (modified) (1 diff)
• doc/rst/source/_templates/layout.html (modified) (1 diff)
• doc/rst/source/conf.py (modified) (2 diffs)

NEMO/trunk/INSTALL.rst

@@ -104 +104 @@
    .. code:: console
 
-      $ svn co http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5
+      $ svn co https://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5
 
 Download the NEMO source code
@@ -147 +147 @@
 
 All compiler options in NEMO are controlled using files in
-trunk/arch/arch-'my_arch'.fcm where 'my_arch' is the name of the computing
+``./arch/arch-'my_arch'.fcm`` where 'my_arch' is the name of the computing
 architecture.  It is recommended to copy and rename an configuration file from
 an architecture similar to your owns. You will need to set appropriate values
@@ -286 +286 @@
 .. code-block:: sh
 
-        trunk/cfgs/'MYCONFIG'/cpp_'MY_CONFIG'.fcm
+        ./cfgs/'MYCONFIG'/cpp_'MY_CONFIG'.fcm
 
 

NEMO/trunk/README.rst

@@ -1 @@
-:Release:      |version|
-:Date:         |today|
-:SVN revision: |svn_revision|
+:Release:  |release|
+:Date:     |today|
+:SVN rev.: |revision|
 
 NEMO_ for **Nucleus for European Modelling of the Ocean** is a state-of-the-art modelling framework for

NEMO/trunk/doc/rst/README.rst

@@ -42 +42 @@
     $ make livehtml
 
-| In the same time, open the 2 formats of the content to review: the source file and the web page by browsing from `the new guide hosted by your local server <127.0.0.1:8000/NEMO_guide.html>`_.
+| Open in the same time the 2 formats of the content to review: the source file and the web page by browsing from the new guide hosted by your local server on `<http://127.0.0.1:8000/NEMO_guide.html>`_.
 | Start the update, save your changes and verify instantly the HTML export in your browser.
 

NEMO/trunk/doc/rst/source/_templates/layout.html

@@ -12 +12 @@
    <p>Community ocean model for multifarious space and time scales</p>
 
-   <div class="version">{{ release }}</div>
+   <div class="version">{{ version }}</div>
 
    {% include "searchbox.html" %}

NEMO/trunk/doc/rst/source/conf.py

@@ -13 +13 @@
 
 # The short X.Y version
-version = '4.0'
+version = 'trk'
 # The full version, including alpha/beta/rc tags
-release = 'release-4.0'
+release = 'trunk'
 
 
@@ -113 +113 @@
 import subprocess
 revision = subprocess.check_output("svnversion").decode("utf-8")
-rst_prolog = '.. |svn_revision| replace:: %s' % revision
+rst_prolog = '.. |revision| replace:: %s' % revision