# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1590417666 -7200
# Node ID 546a6fc47aa28a2bb4cb81f2c2453f9b6d886270
# Parent  42231b0d99a796be52993d7ae5a5bf24266f01b5
donations

diff -r 42231b0d99a7 -r 546a6fc47aa2 Sphinx/source/faq.rst
--- a/Sphinx/source/faq.rst	Mon May 25 13:13:06 2020 +0200
+++ b/Sphinx/source/faq.rst	Mon May 25 16:41:06 2020 +0200
@@ -3,25 +3,36 @@
 Frequently asked questions
 ==========================
 
-General questions
------------------
+General questions about the project
+-----------------------------------
 
 .. toctree::
    :maxdepth: 1
 
    faq/licensing.rst
+   faq/features.rst
+   faq/scalability.rst
+   faq/security.rst
+   faq/proprietary.rst
+   faq/why-orthanc.rst
+   faq/donations.rst
+
+Questions related to Orthanc and DICOM
+--------------------------------------
+   
+.. toctree::
+   :maxdepth: 1
+
    faq/troubleshooting.rst
    faq/dicom.rst
+   faq/compiling.rst
    faq/query-retrieve.rst
-   faq/compiling.rst
-   faq/scalability.rst
-   faq/features.rst
    faq/rest-samples.rst
-   faq/series-completion.rst
-   faq/proprietary.rst
-   faq/security.rst
+   faq/transcoding.rst
+   faq/orthanc-storage.rst
+   faq/authentication.rst
    faq/debugging.rst
-   faq/transcoding.rst
+   faq/crash.rst
 
 Features supported by Orthanc
 -----------------------------
@@ -54,8 +65,5 @@
    faq/https.rst
    faq/same-origin.rst
    faq/matlab.rst
-   faq/orthanc-storage.rst
-   faq/authentication.rst
-   faq/crash.rst
+   faq/series-completion.rst
    faq/dcmtk-tricks.rst
-   faq/why-orthanc.rst
diff -r 42231b0d99a7 -r 546a6fc47aa2 Sphinx/source/faq/donations.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Sphinx/source/faq/donations.rst	Mon May 25 16:41:06 2020 +0200
@@ -0,0 +1,42 @@
+.. _donations:
+
+How can I donate money to the project?
+======================================
+
+The Orthanc project **does not accept donations for now**. We think
+it's a poor business model for running an open source project as it
+suggests the developers are working for charity.
+
+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.
+
+We appreciate **positive feedback** on our project as well. If you are
+on Twitter, send us a tweet to `@OrthancServer
+<https://twitter.com/OrthancServer>`__. That helps raise awareness of
+our project so others can benefit from it as well.
+
+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
+<https://docs.bigbluebutton.org/support/faq.html#how-can-i-donate-money-to-the-project>`__.
diff -r 42231b0d99a7 -r 546a6fc47aa2 Sphinx/source/faq/versioning.rst
--- a/Sphinx/source/faq/versioning.rst	Mon May 25 13:13:06 2020 +0200
+++ b/Sphinx/source/faq/versioning.rst	Mon May 25 16:41:06 2020 +0200
@@ -1,8 +1,8 @@
 Orthanc versioning
 ==================
 
-Each release of Orthanc is identified by a version that is made of three parts: ``API.MAJOR.MINOR`` (e.g. 0.5.1).
+Each release of Orthanc is identified by a version that is made of three parts: ``API.MAJOR.MINOR`` (e.g. 1.5.1).
 
-* API (currently, 0) changes when the REST API is refactored.
+* API (currently, 1) changes when the REST API is refactored.
 * MAJOR changes when a new major feature is introduced (either in the REST API or in the DICOM support), when an incompatibility in the database schema is introduced, or when an important refactoring is achieved.
 * MINOR changes after each introduction of a minor feature, after a bugfix, or after a speed or GUI improvement. It also changes when an experimental feature is introduced.