--- a/Plugin/DicomWebClient.cpp	Tue Dec 19 11:50:15 2023 +0100
+++ b/Plugin/DicomWebClient.cpp	Tue Dec 19 11:52:07 2023 +0100
@@ -776,7 +776,7 @@
            * chunked transfers, or a version of Orthanc <= 1.7.2 that
            * supports chunk transfers, but cannot receive multipart
            * messages larger than 2GB. The latter problem is fixed by:
-           * https://hg.orthanc-server.com/orthanc/rev/36257d6f348f
+           * https://orthanc.uclouvain.be/hg/orthanc/rev/36257d6f348f
            **/
           if (client->IsChunkedTransfersAllowed())
           {

--- a/Plugin/StowRs.cpp	Tue Dec 19 11:50:15 2023 +0100
+++ b/Plugin/StowRs.cpp	Tue Dec 19 11:52:07 2023 +0100
@@ -64,7 +64,7 @@
     }
 
     // Hotfix for bug #190, until the Orthanc Framework is fixed
-    // https://bugs.orthanc-server.com/show_bug.cgi?id=190
+    // https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=190
     if (!boundary.empty() &&
         boundary.size() >= 2 &&
         boundary[0] == '"' &&

--- a/README	Tue Dec 19 11:50:15 2023 +0100
+++ b/README	Tue Dec 19 11:52:07 2023 +0100
@@ -36,7 +36,7 @@
 ----------------------
 
 Build and usage instructions are available in the Orthanc Book:
-http://book.orthanc-server.com/plugins/dicomweb.html
+https://orthanc.uclouvain.be/book/plugins/dicomweb.html
 
 
 Contributing
@@ -44,7 +44,7 @@
 
 Instructions for contributing to the Orthanc project are included in
 the Orthanc Book:
-https://book.orthanc-server.com/developers/repositories.html
+https://orthanc.uclouvain.be/book/developers/repositories.html
 
 
 Licensing: AGPL

--- a/Resources/CMake/JavaScriptLibraries.cmake	Tue Dec 19 11:50:15 2023 +0100
+++ b/Resources/CMake/JavaScriptLibraries.cmake	Tue Dec 19 11:52:07 2023 +0100
@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-set(BASE_URL "https://orthanc.uclouvain.be/third-party-downloads/dicom-web")
+set(BASE_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web")
 
 DownloadPackage(
   "da0189f7c33bf9f652ea65401e0a3dc9"

--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Dec 19 11:50:15 2023 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Dec 19 11:52:07 2023 +0100
@@ -191,7 +191,11 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
         # DICOMweb 1.15 (framework pre-1.12.2)
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+<<<<<<< working copy
         set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848")
+=======
+        set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
+>>>>>>> merge rev
       endif()
     endif()
   endif()

--- a/WebApplication/index.html	Tue Dec 19 11:50:15 2023 +0100
+++ b/WebApplication/index.html	Tue Dec 19 11:52:07 2023 +0100
@@ -44,7 +44,7 @@
             </p>
             <p>
               <a class="btn btn-primary btn-lg"
-                 href="https://book.orthanc-server.com/plugins/dicomweb.html"
+                 href="https://orthanc.uclouvain.be/book/plugins/dicomweb.html"
                  target="_blank" role="button">Open documentation</a>
               <a class="btn btn-primary btn-lg"
                  :href="orthancApiRoot"