# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1680110698 -7200
# Node ID ae3b5b29e37937f99726edc91678357a022e5bcf
# Parent  08e0c9c0ab39fa9d4399c5c9c0230aef10fe0da9# Parent  345dac17a3492e247da5b72145b982211f7f9125
merge

diff -r 08e0c9c0ab39 -r ae3b5b29e379 NEWS
--- a/NEWS	Wed Mar 29 19:24:09 2023 +0200
+++ b/NEWS	Wed Mar 29 19:24:58 2023 +0200
@@ -11,8 +11,8 @@
 -----------
 
 * Enforce the existence of the patient/study/instance while creating its archive
-* Security: New configuration option "RestApiWriteToFileSystemEnabled" to allow 
-  "/instances/../export" that is now disabled by default.
+* Security: New configuration option "RestApiWriteToFileSystemEnabled"
+  to allow "/instances/../export" that is now disabled by default.
 
 Bug Fixes
 ---------
@@ -20,24 +20,30 @@
 * Fix issue 214: VOILUTSequence is not returned in Wado-RS
 * Fix /tools/reset crashing when ExtraMainDicomTags were defined
 
-version 1.11.3 (2023-02-03)
+
+Version 1.11.3 (2023-02-03)
 ===========================
 
 General
 -------
 
-* C-Store SCU now gives priority to the preferred TransferSyntax proposed by the receiving SCP
-  instead of Orthanc own AcceptedTransferSyntaxes.
-* Made the default SQLite DB more robust wrt future updates like adding new columns in DB.
+* C-Store SCU now gives priority to the preferred TransferSyntax
+  proposed by the receiving SCP instead of Orthanc own
+  AcceptedTransferSyntaxes.
+* Made the default SQLite DB more robust wrt future updates like
+  adding new columns in DB.
 * Made the HTTP Client errors more verbose by including the url in the logs.
-* Optimization: now using multiple threads to transcode files for asynchronous download of studies archive.
+* Optimization: now using multiple threads to transcode files for
+  asynchronous download of studies archive.
 * New configuration "KeepAliveTimeout" with a default value of 1 second.
 * ResourceModification jobs (/modify + /anonymize) can now use multiple threads to speed up processing
   - New configuration "JobsEngineThreadsCount.ResourceModification" to configure the number of threads.
-* For systems using glibc > 2.8 (most of Linux systems except LSB binaries):
-  Introduced a new Housekeeper thread in Orthanc (different from the Housekeeper sample plugin).  This thread
-  regularly try to give back memory that Orthanc no longer uses to the system.  This reduces the overall memory
-  consumption.  More information in  OrthancServer/Resources/ImplementationNotes/memory_consumption.txt.
+* For systems using glibc > 2.8 (most of Linux systems except LSB
+  binaries): Introduced a new thread for to trim memory in Orthanc (different
+  from the Housekeeper sample plugin). This thread regularly try to
+  give back memory that Orthanc no longer uses to the system. This
+  reduces the overall memory consumption. More information in
+  OrthancServer/Resources/ImplementationNotes/memory_consumption.txt.
 
 REST API
 --------
@@ -77,7 +83,7 @@
 * Fix issue #212 (Anonymization process transcodes data and loses resource link).
 
 
-version 1.11.2 (2022-08-30)
+Version 1.11.2 (2022-08-30)
 ===========================
 
 General
diff -r 08e0c9c0ab39 -r ae3b5b29e379 OrthancServer/Resources/Configuration.json
--- a/OrthancServer/Resources/Configuration.json	Wed Mar 29 19:24:09 2023 +0200
+++ b/OrthancServer/Resources/Configuration.json	Wed Mar 29 19:24:58 2023 +0200
@@ -50,7 +50,7 @@
   // By default, the patients are recycled ("Recycle" mode).
   // In "Reject" mode, the sender will receive a 0xA700 DIMSE status code
   // if the instance was sent through C-Store, a 507 HTTP status code
-  // if using the Rest API and a 0xA700 Failure reason when using
+  // if using the REST API and a 0xA700 Failure reason when using
   // DicomWeb Stow-RS 
   // Allowed values: "Recycle", "Reject"
   // (new in Orthanc 1.11.2)
@@ -766,7 +766,7 @@
   // with Orthanc 1.5.8, this URI is disabled by default for security.
   "ExecuteLuaEnabled" : false,
 
-  // Whether the Rest API can write to the filesystem (e.g. in 
+  // Whether the REST API can write to the filesystem (e.g. in 
   // /instances/../export route). Starting with Orthanc 1.12.0, 
   // this URI is disabled by default for security.
   "RestApiWriteToFileSystemEnabled": false,
diff -r 08e0c9c0ab39 -r ae3b5b29e379 OrthancServer/Sources/main.cpp
--- a/OrthancServer/Sources/main.cpp	Wed Mar 29 19:24:09 2023 +0200
+++ b/OrthancServer/Sources/main.cpp	Wed Mar 29 19:24:58 2023 +0200
@@ -1175,13 +1175,13 @@
       if (lock.GetConfiguration().GetBooleanParameter("RestApiWriteToFileSystemEnabled", false))
       {
         context.SetRestApiWriteToFileSystemEnabled(true);
-        LOG(WARNING) << "====> Your Rest API can write to the FileSystem.  Review your configuration option \"RestApiWriteToFileSystemEnabled\". "
+        LOG(WARNING) << "====> Your REST API can write to the FileSystem.  Review your configuration option \"RestApiWriteToFileSystemEnabled\". "
                      << "Your setup is POSSIBLY INSECURE <====";
       }
       else
       {
         context.SetRestApiWriteToFileSystemEnabled(false);
-        LOG(WARNING) << "Rest API can not write to the file system.";
+        LOG(WARNING) << "REST API can not write to the file system.";
       }
 
       if (lock.GetConfiguration().GetBooleanParameter("WebDavEnabled", true))