--- a/Sphinx/source/contributing.rst	Tue Jul 07 14:29:46 2020 +0200
+++ b/Sphinx/source/contributing.rst	Tue Jul 07 14:30:13 2020 +0200
@@ -74,14 +74,8 @@
 
 * **Financial support**:
 
-  - Buy commercial services:
-
-    + Osimis provides `support packs
-      <https://www.osimis.io/en/services.html>`__ dedicated to Orthanc.
-    + Osimis can be hired to do `custom developments
-      <https://www.orthanc-server.com/orthanc-pro.php>`__ related to medical imaging.
-    + Currently, Osimis is the only company ensuring such corporate
-      services according to an open-source business model, but others
-      might show up in the future. `Please warn us
-      <mailto:s.jodogne@orthanc-labs.com>`__ if your know about another such
-      company!
+  - Osimis provides `support packs and custom development services
+    <https://www.osimis.io/en/services.html>`__ around the Orthanc
+    ecosystem and, more generally, around medical imaging. Buying such
+    professional services is the best way to make the Orthanc project
+    sustainable in the long term.

--- a/Sphinx/source/faq/donations.rst	Tue Jul 07 14:29:46 2020 +0200
+++ b/Sphinx/source/faq/donations.rst	Tue Jul 07 14:30:13 2020 +0200
@@ -7,28 +7,20 @@
 it's a poor business model for running an open source project as it
 suggests the developers are working for charity.
 
+If you are a **commercial company** that builds upon the Orthanc
+ecosystem for your own products, please contribute by buying the
+`corporate services provided by Osimis
+<https://www.osimis.io/en/services.html>`__.
+
 If you want to **help the project financially as an end-user**, you
 can approach some of the companies offering commercial support for
 Orthanc and engage their services. Doing so creates a healthy
 ecosystem around the project where companies are encouraged to
 contribute their resources to improve the project to create a larger
-pool of potential customers wanting their services. Those companies
-can be found at the following locations:
-
-* `Orthanc Pro contact form <https://www.orthanc-server.com/orthanc-pro.php>`__.
-
-* List of `freelancers, small companies, or volunteers providing
-  custom assistance
-  <https://groups.google.com/d/msg/orthanc-users/vWpHWFkYiWI/vB5eRM1WCQAJ>`__
-  on the Orthanc Users forum.
-
-Also, if you are a **commercial company** that builds upon the Orthanc
-project for your own products, please use the `Orthanc Pro contact
-form <https://www.orthanc-server.com/orthanc-pro.php>`__ so as to
-engage one of the companies that provide commercial support to
-accelerate your feature. Currently, `Osimis <https://www.osimis.io/>`_
-is the only company ensuring such corporate services, but others might
-show up in the future.
+pool of potential customers wanting their services. A list of
+`freelancers or volunteers providing custom assistance
+<https://groups.google.com/d/msg/orthanc-users/vWpHWFkYiWI/vB5eRM1WCQAJ>`__
+is available on the Orthanc Users forum.
 
 We appreciate **positive feedback** on our project as well. If you are
 on Twitter, send us a tweet to `@OrthancServer
@@ -38,5 +30,5 @@
 Finally, don't forget to have a look :ref:`other ways to contribute
 <contributing>` to the Orthanc project.
 
-*Note:* This text is directly adapted from the `BigBlueButton FAQ
+*Note:* This text is adapted from the `BigBlueButton FAQ
 <https://docs.bigbluebutton.org/support/faq.html#how-can-i-donate-money-to-the-project>`__.

--- a/Sphinx/source/faq/improving-interface.rst	Tue Jul 07 14:29:46 2020 +0200
+++ b/Sphinx/source/faq/improving-interface.rst	Tue Jul 07 14:30:13 2020 +0200
@@ -36,21 +36,26 @@
 a `plugin
 <https://github.com/jodogne/OrthancContributed/tree/master/Plugins>`__. Any
 front-end Web developer could take care of this task using well-known
-JavaScript frameworks (such as Meteor, AngularJS, Ember.js...).
+JavaScript frameworks (such as Angular, Vue.js...).
 
 It is possible that an official plugin that provides a more advanced
 user interface will be developed in the future (provided we find
-funding for this development). In the meantime, you can also contact a
-company that provides **commercial support on the top of Orthanc** and
-that might have developed an advanced user interface. Currently,
-`Osimis <https://www.osimis.io/>`_ is the only company ensuring such
-corporate services, but others might show up in the future. A `contact
-form <https://www.orthanc-server.com/orthanc-pro.php>`_ is available
-on the official Web page of Orthanc.
+funding for this development). In the meantime, you can also contact
+**Osimis**, the commercial partner of the Orthanc project, by using
+the `contact form <https://www.orthanc-server.com/orthanc-pro.php>`_
+that is available on the official Web page of Orthanc.
+
+Finally, have a look to the following **related projects**:
 
-**Note:** In 2017-2018, a team of Master students from `ULiège
-<https://www.uliege.be/>`__ has done some work about creating a
-revamped version of Orthanc Explorer. Check out the `related
-discussion
-<https://groups.google.com/d/msg/orthanc-users/oOyKTmfs-J0/B6eyBJcvCAAJ>`__
-on the Orthanc Users forum.
+* In 2017-2018, a team of Master students from `ULiège
+  <https://www.uliege.be/>`__ has done some work about creating a
+  revamped version of Orthanc Explorer. Check out the `related
+  discussion
+  <https://groups.google.com/d/msg/orthanc-users/oOyKTmfs-J0/B6eyBJcvCAAJ>`__
+  on the Orthanc Users forum.
+
+* The `Orthanc Tools JS <https://github.com/salimkanoun/Orthanc-Tools-JS>`__
+  environment created by Salim Kanoun.
+
+* The `Orthanc Manager <https://github.com/id-05/OrthancManager>`__
+  Android application.

--- a/Sphinx/source/faq/proprietary.rst	Tue Jul 07 14:29:46 2020 +0200
+++ b/Sphinx/source/faq/proprietary.rst	Tue Jul 07 14:30:13 2020 +0200
@@ -45,10 +45,6 @@
 Orthanc requires them to **publicly release the source code of this
 derived version of Orthanc**.
 
-Finally, if you need to complement the commercial services of your
-official supplier, please note that you can also contact a company
-that provides **commercial support on the top of Orthanc**. Currently,
-`Osimis <https://www.osimis.io/>`_ is the only company ensuring such
-corporate services, but others might show up in the future. A `contact
-form <https://www.orthanc-server.com/orthanc-pro.php>`_ is available
-on the official Web page of Orthanc.
+Finally, if you need to complement the services of your vendor,
+consider buying the `Orthanc support packs provided by Osimis
+<https://www.osimis.io/en/services.html>`__.

--- a/Sphinx/source/users/support.rst	Tue Jul 07 14:29:46 2020 +0200
+++ b/Sphinx/source/users/support.rst	Tue Jul 07 14:30:13 2020 +0200
@@ -11,34 +11,36 @@
 When you face a problem, you should first check out the following
 resources:
 
-1. Make sure to :ref:`check all the content of the Orthanc Book
+1. Make sure that you use the `latest version of Orthanc
+   <http://www.orthanc-server.com/download.php>`__.
+2. Make sure to :ref:`check all the content of the Orthanc Book
    <orthanc-book>`, and notably to :ref:`understand the basics of
    DICOM <dicom-guide>`.
-2. Carefully read your :ref:`log files in verbose mode <log>`.
-3. In the case of DICOM networking problems, carefully read the log
+3. Carefully read your :ref:`log files in verbose mode <log>`.
+4. In the case of DICOM networking problems, carefully read the log
    files from your remote modality. If you are :ref:`using Orthanc
    against a proprietary system <proprietary>`, contact the support
    team from the vendor of this system: You pay them to solve your
    setup issues.
-4. Follow the :ref:`general troubleshooting guide <troubleshooting>`.
-5. If the problem is related to the DICOM network protocol, follow
+5. Follow the :ref:`general troubleshooting guide <troubleshooting>`.
+6. If the problem is related to the DICOM network protocol, follow
    the :ref:`DICOM troubleshooting guide <dicom>`.
-6. Have a look at **all** the :ref:`frequently asked questions (FAQs)
+7. Have a look at **all** the :ref:`frequently asked questions (FAQs)
    <faq>` that are already available in the Orthanc Book.
-7. Make a search for similar problem previously discussed in the
+8. Make a search for similar problem previously discussed in the
    `Orthanc Users discussion forum
    <https://groups.google.com/forum/#!forum/orthanc-users>`__.
-8. Check out the ``Pending changes in the mainline`` section of the
+9. Check out the ``Pending changes in the mainline`` section of the
    `NEWS file
    <https://hg.orthanc-server.com/orthanc/file/default/NEWS>`__, as
    your issue might already be solved in the mainline of Orthanc (i.e.
    in the cutting-edge version of Orthanc since the last stable
    official release).
-9. Carefully read the `TODO file
-   <https://hg.orthanc-server.com/orthanc/file/default/TODO>`__ that
-   contains our roadmap, as you might be requesting a feature that is
-   currently pending in our backlog (i.e. not implemented yet).
-10. Look for similar issue in the `official bug tracker
+10. Carefully read the `TODO file
+    <https://hg.orthanc-server.com/orthanc/file/default/TODO>`__ that
+    contains our roadmap, as you might be requesting a feature that is
+    currently pending in our backlog (i.e. not implemented yet).
+11. Look for similar issue in the `official bug tracker
     <https://bugs.orthanc-server.com/query.cgi>`__ (make sure to
     select ``All`` in the ``Status`` field, as your issue might
     already have been solved).
@@ -46,8 +48,8 @@
 
 Importantly, for all the features that are pending in the ``TODO``
 file, if you are a company, please consider `buying professional
-services <https://www.orthanc-server.com/orthanc-pro.php>`__ in order
-to get the feature implemented faster.
+services <https://www.osimis.io/en/services.html>`__ in order to get
+the feature implemented faster.
    
    
 .. _support-mwe: