Merge branch 'develop' of ssh://git.ecmwf.int/ecflow/ecflow into develop

ecmwf · Dec 30, 2021 · 58ce9c6 · 58ce9c6
2 parents ce263d6 + 3f2a3a2
commit 58ce9c6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Doc/misc/Release-Anouncement.txt b/Doc/misc/Release-Anouncement.txt
@@ -48,7 +48,7 @@ or:
   ecflow_client --complete
 
 Please see:
-   https://software.ecmwf.int/wiki/display/ECFLOW/Release+process
+   https://confluence.ecmwf.int/display/ECFLOW/Release+process
 
 for further details.
 
@@ -57,7 +57,7 @@ Documentation
 
 The online documentation and tutorial are accessible from:
 
-   http://software.ecmwf.int/wiki/display/ECFLOW/Home
+   https://confluence.ecmwf.int/display/ECFLOW/ecflow+home
 
 Tar file
 ======================================================================

diff --git a/Doc/misc/Release-Process.txt b/Doc/misc/Release-Process.txt
@@ -59,7 +59,7 @@ Process
 
 0/ Update Documentation
 
-  - https://software.ecmwf.int/wiki/display/ECFLOW/Change+History
+  - https://confluence.ecmwf.int/display/ECFLOW/Release+Notes
 
   - Generate ecflow python API(only required when updating confluence)
     - module load python3  # rely on user support to have installed sphinx, make expects sphinx-build on $PATH
@@ -71,17 +71,17 @@ Process
 
 0/ Update WIKI:
    This announces the changes in the release
-   https://software.ecmwf.int/wiki/display/ECFLOW/Latest+news
+   https://confluence.ecmwf.int/display/ECFLOW/Latest+news
 
    In both cases add a tag/label for "news". This make the newly added page
    appear in the top half of the latest news
 
 0/ Check attachments:
    ** The eflow tar ball is automatically upload to confluence
-   http://software.ecmwf.int/wiki/display/ECFLOW/Releases
+   http://confluence.ecmwf.int/display/ECFLOW/Releases
 
    0 Beta releases :
-   https://software.ecmwf.int/wiki/display/ECFLOW/Pre-Releases
+   https://confluence.ecmwf.int/display/ECFLOW/Pre-Releases
 
    Add a page with the title of the release.
    In both cases add a tag/label for "news". This make the newly added page

diff --git a/Doc/sphinx-examples/cookbook/operational.rst b/Doc/sphinx-examples/cookbook/operational.rst
@@ -224,7 +224,7 @@ locally and remotely. They are:
   * ECF_URL_CMD (for html man pages for tasks, plots display, products
     arrival html page)::
   
-     edit URLBASE https://software.ecmwf.int/wiki/display/
+     edit URLBASE https://confluence.ecmwf.int/display/
      edit URL     ECFLOW/Home
      edit ECF_CHECK_CMD '${BROWSER:=firefox} -remote "openURL(%URLBASE%/%URL%)"'
 

diff --git a/Doc/sphinx-examples/cookbook/src/course.py b/Doc/sphinx-examples/cookbook/src/course.py
@@ -424,7 +424,7 @@ def top(self, node):
             Label("info", "from sms to ecFlow"),
             Defcomplete(),
             Variables(
-                URL= "https://software.ecmwf.int/wiki/display/ECFLOW/Home",
+                URL= "https://confluence.ecmwf.int/display/ECFLOW/ecflow+home",
                 ECF_URL_CMD= "${BROWSER:=firefox} -remote 'openURL(%URL%"),
             self.main())
         return node

diff --git a/Pyext/samples/confluence_add_attachment.py b/Pyext/samples/confluence_add_attachment.py
@@ -16,7 +16,7 @@
 class TestConfluence(unittest.TestCase):
     def setUp(self):
         conflunce_base_url = "https://software-test.ecmwf.int/wiki"
-#         conflunce_base_url = "https://software.ecmwf.int/wiki"
+#         conflunce_base_url = "https://confluence.ecmwf.int"
         user = "deploy"  
         password = "deploy2013"  
 #         user = "ma0"

diff --git a/Pyext/samples/overview.py b/Pyext/samples/overview.py
@@ -102,7 +102,7 @@ def __createHelp(self):
                             relief=tki.RAISED, text='Help')
         menu = tki.Menu(mb)
         mb['menu'] = menu
-        url = "https://software.ecmwf.int/wiki/display/ECFLOW/Documentation"
+        url = "https://confluence.ecmwf.int/display/ECFLOW/Documentation"
 
         def url1(): self.__url(url=url)
 

diff --git a/tools/ecflow_fuse.py b/tools/ecflow_fuse.py
@@ -490,7 +490,7 @@ def list_att(node):
 
 def list_used_variables(node, ARGS=None):
     """ thanks Avi
-    https://software.ecmwf.int/wiki/pages/viewpage.action?pageId=53513079
+    https://confluence.ecmwf.int/pages/viewpage.action?pageId=53513079
     """
     if ARGS is None:
         ARGS = object()