changeset 217:796040545f61

merge
author amazy
date Mon, 25 Feb 2019 18:56:58 +0100
parents dcf6c2e60448 (current diff) d7073b3e8488 (diff)
children 8bb11cd0f20f
files
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Sphinx/source/developers/db-versioning.rst	Mon Feb 25 18:56:30 2019 +0100
+++ b/Sphinx/source/developers/db-versioning.rst	Mon Feb 25 18:56:58 2019 +0100
@@ -26,7 +26,7 @@
 Version                           DB v2   DB v3   DB v4   DB v5   DB v6
 ===============================   =====   =====   =====   =====   =====
 Mainline                                  u       u       u       x
-Orthanc 0.9.5 - Orthanc 1.5.4             u       u       u       x
+Orthanc 0.9.5 - Orthanc 1.5.5             u       u       u       x
 Orthanc 0.8.5 - Orthanc 0.9.4             u       u       x
 Orthanc 0.7.3 - Orthanc 0.8.4             u       x
 Orthanc 0.4.0 - Orthanc 0.7.2             x
--- a/Sphinx/source/faq/log.rst	Mon Feb 25 18:56:30 2019 +0100
+++ b/Sphinx/source/faq/log.rst	Mon Feb 25 18:56:58 2019 +0100
@@ -49,7 +49,7 @@
 2. Stop the Orthanc service. The actual process depends on your
    version of Windows.
 
-3. Copy the just-downloaded ``Orthanc-1.5.4-Release.exe`` together
+3. Copy the just-downloaded ``Orthanc-1.5.5-Release.exe`` together
    with your configuration file (that is by default located in
    ``C:\Orthanc\Configuration.json``) into the same folder
    (e.g. ``C:\Temp``).
@@ -57,7 +57,7 @@
 4. Type in a command-line shell, to generate the ``Orthanc.log`` file::
 
    $ cd C:\Temp
-   $ Orthanc-1.5.4-Release.exe --verbose Configuration.json > Orthanc.log 2<&1
+   $ Orthanc-1.5.5-Release.exe --verbose Configuration.json > Orthanc.log 2<&1
 
 5. Restart the Orthanc service.
 
--- a/Sphinx/source/faq/scalability.rst	Mon Feb 25 18:56:30 2019 +0100
+++ b/Sphinx/source/faq/scalability.rst	Mon Feb 25 18:56:58 2019 +0100
@@ -27,7 +27,7 @@
 Here is a generic setup that should provide best performance in the
 presence of large databases:
 
-* Make sure to use the latest release of Orthanc (1.5.4 at the time of
+* Make sure to use the latest release of Orthanc (1.5.5 at the time of
   writing).
 
 * We suggest to use the latest release of the :ref:`PostgreSQL plugin
--- a/Sphinx/source/users/configuration.rst	Mon Feb 25 18:56:30 2019 +0100
+++ b/Sphinx/source/users/configuration.rst	Mon Feb 25 18:56:58 2019 +0100
@@ -7,7 +7,7 @@
 Configuring Orthanc simply consists in providing a configuration file.
 Orthanc has numerous configuration that are documented in the `default 
 configuration file
-<https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-1.5.4/Resources/Configuration.json>`_. This
+<https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-1.5.5/Resources/Configuration.json>`_. This
 file is in the `JSON <https://en.wikipedia.org/wiki/JSON>`_ file
 format. You can generate this file file with the
 following call::
--- a/Sphinx/source/users/docker.rst	Mon Feb 25 18:56:30 2019 +0100
+++ b/Sphinx/source/users/docker.rst	Mon Feb 25 18:56:58 2019 +0100
@@ -45,7 +45,7 @@
 If more stability is required, you can select the official release of
 Orthanc to be run::
 
-  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.5.4
+  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.5.5
 
 Passing additional command-line options (e.g. to make Orthanc verbose)
 can be done as follows (note the ``/etc/orthanc`` option that is
@@ -94,7 +94,7 @@
 container to some path in the filesystem of your Linux host, e.g.::
 
   $ mkdir /tmp/orthanc-db
-  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc-db/:/var/lib/orthanc/db/ jodogne/orthanc:1.5.4 
+  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc-db/:/var/lib/orthanc/db/ jodogne/orthanc:1.5.5 
 
 
 Whole-slide imaging support
@@ -215,4 +215,4 @@
 * The build artifacts can be found in folder ``/root/orthanc/Build``.
 
 * This command launches the mainline version. To start a released version,
-  use e.g. ``jodogne/orthanc-debug:1.5.4``.
+  use e.g. ``jodogne/orthanc-debug:1.5.5``.