--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Sphinx/source/faq/query-retrieve.rst	Fri Apr 22 12:57:38 2016 +0200
@@ -0,0 +1,64 @@
+.. _query-retrieve:
+
+Configuring DICOM Query/Retrieve
+================================
+
+Starting with release 0.7.0, Orthanc supports DICOM Query/Retrieve
+(i.e. Orthanc can act as C-Find SCP and C-Move SCP). To configure this
+feature, follow these instructions:
+
+* Get the AET (Application Entity Title), the IP address and the port
+  number of your DICOM client.
+* Add an entry in the ``DicomModalities`` section of your Orthanc
+  :ref:`configuration file <configuration>` to reflect these settings.
+* Restart Orthanc with the updated configuration file.
+* Symmetrically, in your DICOM client, configure an additional DICOM
+  node corresponding to your Orthanc AET (see the ``DicomAet``
+  parameter of your Orthanc configuration, by default, ORTHANC), IP
+  address et port number (cf. ``DicomPort``, by default 4242).
+
+If you encounter configuration problem with query/retrieve, please be
+sure to read the :ref:`dicom-move` section.
+
+
+.. _ginkgo-cadx:
+
+Illustration: Ginkgo CADx
+-------------------------
+
+This section explains how to connect the `Ginkgo CADx viewer
+<http://ginkgo-cadx.com/en/>`__ to an Orthanc server, both running on
+the local computer. First, start Orthanc without specifying a
+configuration file (i.e. using its default configuration).  Then, open
+the settings pannel of Ginkgo CADx:
+
+.. image:: ../images/GinkgoCADx1.png
+           :align: center
+           :width: 500px
+
+Write down the AET and the DICOM port of Ginkgo CADx (in this case,
+respectively ``GINKGO_001`` and ``11112``). Then, create a new DICOM
+node corresponding to Orthanc by clicking on the "*New...*" button,
+which raises the following dialog box:
+
+.. image:: ../images/GinkgoCADx2.png
+           :align: center
+           :width: 400px
+
+.. highlight:: json
+
+Complete the highlighted fields with the default parameters of
+Orthanc, as shown in the screenshot.  Do not forget to click on the
+"*Test connection*" button to make sure the :ref:`C-Echo <dicom-echo>`
+succeeds. Stop Orthanc, create a new :ref:`configuration file
+<configuration>`, and declare Gingko CADx in the ``DicomModalities``
+section, given the parameters you wrote down above::
+
+  // The list of the known DICOM modalities
+  "DicomModalities" : {
+    "ginkgo" : [ "GINKGO_001", "localhost", 11112 ]
+  },
+
+Restart Orthanc using this newly created configuration file, and
+you will be able to do query/retrieve from Gingko CADx through the
+"*PACS Q/R*" menu.