--- a/Sphinx/source/faq.rst	Sat Jun 18 15:00:15 2016 +0200
+++ b/Sphinx/source/faq.rst	Sun Jun 19 14:38:01 2016 +0200
@@ -42,6 +42,7 @@
    faq/redhat.rst
    faq/apache.rst
    faq/nginx.rst
+   faq/iis.rst
    faq/https.rst
    faq/same-origin.rst
    faq/why-orthanc.rst

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Sphinx/source/faq/iis.rst	Sun Jun 19 14:38:01 2016 +0200
@@ -0,0 +1,70 @@
+.. _iis:
+
+How can I run Orthanc behind Microsoft IIS?
+===========================================
+
+Similarly to :ref:`Apache <apache>` and :ref:`nginx <nginx>`, Orthanc
+can run behind `Microsoft IIS (Internet Information Services)
+<https://en.wikipedia.org/wiki/Internet_Information_Services>`__
+servers through reverse proxying. The instructions below are provided
+courtesy of `Mark Hodge
+<https://groups.google.com/d/msg/orthanc-users/3-b3cLBAr8U/QIePcADMAAAJ>`__.
+
+- IIS is available as a feature you can enable via the Programs and Features in non Server versions of Windows.
+
+- Add Application Request Routing 3.0.
+
+- Add URL Rewrite module 2.
+
+- In IIS Manager bind an SSL certificate to port 443 on the default web site being used for Orthanc.
+
+- Add the following ``web.config`` at the root of the default website:
+
+.. code-block:: xml
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <configuration>
+      <system.webServer>
+        <rewrite>
+          <rules>
+            <clear />
+            <rule name="HTTP to HTTPS redirect" stopProcessing="true">
+              <match url="(.*)" />
+              <conditions logicalGrouping="MatchAll" trackAllCaptures="false">
+                <add input="{HTTPS}" pattern="off" ignoreCase="true" />
+              </conditions>
+              <action type="Redirect" url="https://{HTTP_HOST}/{R:1}" redirectType="Found" />
+            </rule>
+            <rule name="ReverseProxyInboundRule1" stopProcessing="true">
+              <match url="(.*)" />
+              <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
+              <action type="Rewrite" url="http://127.0.0.1:8042/{R:1}" />
+            </rule>
+          </rules>
+        </rewrite>
+      </system.webServer>
+    </configuration>
+
+- In IIS Manager Open Application Request Routing Cache click on
+  Server Proxy Settings on the right side of the window, change the
+  Time-out to a much higher value. eg., 3600 = 1 hour to ensure
+  download of DICOMDIR or ZIP's doesn't time out.
+
+- To allow user authentication against an Active Directory group add
+  the following directly after ``<configuration>`` in the above
+  ``web.config``, grant the appropriate Active Directory group read
+  permission on the ``wwwroot`` folder:
+ 
+.. code-block:: xml
+
+    <system.web>
+        <authentication mode="Windows" />
+    </system.web>
+
+- You also need to make sure registered users is empty in the Orthanc Configuration.json file:
+
+.. code-block:: json
+
+    [...]
+    "RegisteredUsers" : {  },
+    [...]

--- a/Sphinx/source/faq/troubleshooting.rst	Sat Jun 18 15:00:15 2016 +0200
+++ b/Sphinx/source/faq/troubleshooting.rst	Sun Jun 19 14:38:01 2016 +0200
@@ -15,9 +15,9 @@
 * **Orthanc Explorer is slow under Windows on the localhost**: You
   have to disable the IPv6 support. This is a Windows-specific problem
   that is discussed `here
-  <http://superuser.com/questions/43823/google-chrome-is-slow-to-localhost>`_
+  <http://superuser.com/questions/43823/google-chrome-is-slow-to-localhost>`__
   and `here
-  <http://stackoverflow.com/questions/1726585/firefox-and-chrome-slow-on-localhost-known-fix-doesnt-work-on-windows-7>`_.
+  <http://stackoverflow.com/questions/1726585/firefox-and-chrome-slow-on-localhost-known-fix-doesnt-work-on-windows-7>`__.
 * Under Windows, Orthanc creates the "OrthancStorage" folder, and
   crashes with the error "**SQLite: Unable to open the database**":
   Your directory name is either too long, or it contains special