Mercurial > hg > orthanc

changeset 4318:3c85edacd0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Mon, 23 Nov 2020 12:04:59 +0100
parents a691916ab535 (current diff) 7dc52763ab1c (diff)
children 3b8a868616a8 08e3600dcb1b
files
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Resources/Configuration.json	Mon Nov 23 12:04:42 2020 +0100
+++ b/OrthancServer/Resources/Configuration.json	Mon Nov 23 12:04:59 2020 +0100
@@ -197,7 +197,9 @@
    * Network topology
    **/
 
-  // The list of the known DICOM modalities
+  // The list of the known DICOM modalities. This option is ignored if
+  // "DicomModalitiesInDatabase" is set to "true", in which case you
+  // must use the REST API to define modalities.
   "DicomModalities" : {
     /**
      * Uncommenting the following line would enable Orthanc to
@@ -290,7 +292,9 @@
   // DICOM SCP (server) does not answer.
   "DicomScuTimeout" : 10,
 
-  // The list of the known Orthanc peers
+  // The list of the known Orthanc peers. This option is ignored if
+  // "OrthancPeersInDatabase" is set to "true", in which case you must
+  // use the REST API to define Orthanc peers.
   "OrthancPeers" : {
     /**
      * Each line gives the base URL of an Orthanc peer, possibly