changeset 109:b14e88dc1a9c

merge
author amazy
date Thu, 20 Jul 2017 07:35:01 +0200
parents e3be44c1d041 (current diff) ae10157de307 (diff)
children 1d32a7f3d144
files Sphinx/source/faq/troubleshooting.rst
diffstat 6 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Sphinx/source/developers/db-versioning.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/developers/db-versioning.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -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.2.0             u       u       u       x
+Orthanc 0.9.5 - Orthanc 1.3.0             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/dicom-guide.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/dicom-guide.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -241,7 +241,7 @@
 application that handles patients from different hospitals.
 
 *Note:* The current version of the :ref:`Orthanc Explorer
-<orthanc-explorer>` interface (1.2.0 at the time of writing) is
+<orthanc-explorer>` interface (1.3.0 at the time of writing) is
 designed for single-hospital scenarios, and thus does not provide
 study-level access. But the core engine of Orthanc does support
 study-level access through its :ref:`REST API <rest>`.
@@ -572,7 +572,7 @@
 server. The DICOM standard features an `alternative mechanism called
 C-Get
 <http://dclunie.blogspot.be/2016/05/to-c-move-is-human-to-c-get-divine.html>`_.
-As of Orthanc 1.2.0, C-Get is not supported yet (but work is in
+As of Orthanc 1.3.0, C-Get is not supported yet (but work is in
 progress).
 
 *Note 2:* As :ref:`written above <dicom-pixel-data>`, the Orthanc
--- a/Sphinx/source/faq/log.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/faq/log.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -25,7 +25,7 @@
 2. Stop the Orthanc service. The actual process depends on your
    version of Windows.
 
-3. Copy the just-downloaded ``Orthanc-1.2.0-Release.exe`` together
+3. Copy the just-downloaded ``Orthanc-1.3.0-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``).
@@ -33,7 +33,7 @@
 4. Type in a command-line shell, to generate the ``Orthanc.log`` file::
 
    $ cd C:\Temp
-   $ Orthanc-1.2.0-Release.exe --verbose Configuration.json > Orthanc.log 2<&1
+   $ Orthanc-1.3.0-Release.exe --verbose Configuration.json > Orthanc.log 2<&1
 
 5. Restart the Orthanc service.
 
--- a/Sphinx/source/faq/troubleshooting.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/faq/troubleshooting.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -61,7 +61,7 @@
   performance, make sure to use either the mainline version of the
   container (run ``docker pull jodogne/orthanc`` to ensure you use the
   most recent version of the mainline), or versions more recent than
-  ``jodogne/orthanc:1.2.0``.
+  ``jodogne/orthanc:1.3.0``.
 
 * **Orthanc slows down if storing many files**: The default database
   engine that is built in Orthanc is `SQLite
--- a/Sphinx/source/users/configuration.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/users/configuration.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -6,7 +6,7 @@
 
 Configuring Orthanc simply consists in copying and adapting the
 `default configuration file
-<https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-1.2.0/Resources/Configuration.json>`_. This
+<https://bitbucket.org/sjodogne/orthanc/raw/Orthanc-1.3.0/Resources/Configuration.json>`_. This
 file is in the `JSON <https://en.wikipedia.org/wiki/JSON>`_ file
 format. You can generate a sample configuration file with the
 following call::
--- a/Sphinx/source/users/docker.rst	Thu Jul 20 07:34:37 2017 +0200
+++ b/Sphinx/source/users/docker.rst	Thu Jul 20 07:35:01 2017 +0200
@@ -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.2.0
+  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.3.0
 
 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.2.0 
+  $ sudo docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc-db/:/var/lib/orthanc/db/ jodogne/orthanc:1.3.0 
 
 
 Whole-slide imaging support