# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1606129499 -3600
# Node ID 3c85edacd0eec822ee258a86b18a4abd41e699aa
# Parent  a691916ab535d44ee073e9a5cf98c25bababa502# Parent  7dc52763ab1ca52515110666c16fe185f646d493
merge

diff -r a691916ab535 -r 3c85edacd0ee OrthancServer/Resources/Configuration.json
--- 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