--- a/Sphinx/source/developers/creating-plugins.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/developers/creating-plugins.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -34,8 +34,8 @@
 ------------------------
 
 A plugin takes the form of a shared library (``.DLL`` under Windows,
-``.so`` under Linux, ``.dylib`` under Apple OS X...) that use the `ABI
-of the C language
+``.so`` under GNU/Linux, ``.dylib`` under Apple OS X...) that use the
+`ABI of the C language
 <https://en.wikipedia.org/wiki/Application_binary_interface>`__ to
 declare 4 public functions/symbols:
 

--- a/Sphinx/source/dicom-guide.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/dicom-guide.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -384,11 +384,11 @@
 also block the DICOM protocol. This is especially true for the
 `Microsoft Windows firewall
 <https://en.wikipedia.org/wiki/Windows_Firewall>`__ and for
-:ref:`RedHat-based Linux boxes <redhat>`. As a consequence, after any
-change in the DICOM topology of an hospital (notably when connecting
-two imaging devices), one should always check whether the DICOM
-protocol can travel from end to end, i.e.  between the DICOM client
-and the DICOM server.
+:ref:`RedHat-based GNU/Linux boxes <redhat>`. As a consequence, after
+any change in the DICOM topology of an hospital (notably when
+connecting two imaging devices), one should always check whether the
+DICOM protocol can travel from end to end, i.e.  between the DICOM
+client and the DICOM server.
 
 This is where the **DICOM Echo service** comes into play. This service
 is triggered when the client sends a so-called ``C-Echo`` command to

--- a/Sphinx/source/faq/compiling-old.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/faq/compiling-old.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -1,19 +1,19 @@
 .. highlight:: bash
 .. _compiling-old:
 
-Old build instructions for Linux
-================================
+Old build instructions for GNU/Linux
+====================================
 
-This page summarizes the Linux build instructions that were used **up
-to Orthanc 0.7.0 (inclusive)**.  Instructions for Orthanc above 0.7.0
-can be found directly `inside the source package
+This page summarizes the GNU/Linux build instructions that were used
+**up to Orthanc 0.7.0 (inclusive)**.  Instructions for Orthanc above
+0.7.0 can be found directly `inside the source package
 <https://bitbucket.org/sjodogne/orthanc/src/default/LinuxCompilation.txt>`_.
 
 Static linking
 --------------
 
-In general, the static linking should work on any Linux distribution
-(in particular, this works on Debian Squeeze)::
+In general, the static linking should work on any GNU/Linux
+distribution (in particular, this works on Debian Squeeze)::
 
     $ cmake -DSTATIC_BUILD:BOOL=ON -DCMAKE_BUILD_TYPE=Debug
 

--- a/Sphinx/source/faq/compiling.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/faq/compiling.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -3,8 +3,8 @@
 Compiling Orthanc
 =================
 
-Under Linux
------------
+Under GNU/Linux
+---------------
 
 * Orthanc >= 0.7.1: See the `build instructions
   <https://bitbucket.org/sjodogne/orthanc/src/default/LinuxCompilation.txt>`_
@@ -45,7 +45,7 @@
 The build infrastructure of Orthanc is based upon `CMake
 <https://cmake.org/>`_. The build scripts are designed to embed all
 the third-party dependencies directly inside the Orthanc
-executable. This is the meaning of the ``-DSTATIC_BUILD=TRUE`` option,
+executable. This is the meaning of the ``-DSTATIC_BUILD=ON`` option,
 as described in the `INSTALL
 <https://bitbucket.org/sjodogne/orthanc/src/default/INSTALL>`_ file of Orthanc.
 
@@ -58,34 +58,34 @@
 `DLL hell <https://en.wikipedia.org/wiki/Dll_hell>`_. As a downside,
 this makes our build infrastructure rather complex.
 
-Static linking is not as desirable under Linux than under
-Windows. Linux prefers software that dynamically links against the
+Static linking is not as desirable under GNU/Linux than under
+Windows. GNU/Linux prefers software that dynamically links against the
 system-wide libraries: This is explained by the fact that whenever a
 third-party dependency benefits from a bugfix, any software that is
 linked against it also immediately benefits from this fix. This also
 reduces the size of the binaries as well as the build time. Under
-Linux, it is thus recommended to use the ``-DSTATIC_BUILD=FALSE``
+GNU/Linux, it is thus recommended to use the ``-DSTATIC_BUILD=OFF``
 option whenever possible.
 
 When the dynamic build is used, some third-party dependencies may be
-unavailable or incompatible with Orthanc, depending on your Linux
+unavailable or incompatible with Orthanc, depending on your GNU/Linux
 distribution. Some CMake options have thus been introduced to force
 the static linking against some individual third-party
 dependencies. Here are the most useful:
 
-* ``-DUSE_SYSTEM_DCMTK=FALSE`` to statically link against DCMTK.
-* ``-DUSE_SYSTEM_JSONCPP=FALSE`` to statically link against JsonCpp.
+* ``-DUSE_SYSTEM_DCMTK=OFF`` to statically link against DCMTK.
+* ``-DUSE_SYSTEM_JSONCPP=OFF`` to statically link against JsonCpp.
 
-You will also have to set the ``-DALLOW_DOWNLOADS=TRUE`` to
+You will also have to set the ``-DALLOW_DOWNLOADS=ON`` to
 explicitely allow the CMake script to download the source code of any
 required dependency. The source code of all these dependencies is
 self-hosted on our servers at the University Hospital of Liège.
 
-Please also note that the option ``-DSTANDALONE_BUILD=TRUE`` must be
+Please also note that the option ``-DSTANDALONE_BUILD=ON`` must be
 used whenever your plan to move the binaries or to install them on
 another computer. This option will embed all the external resource
 files (notably Orthanc Explorer) into the resulting executable. If
-this option is set to ``FALSE``, the resources will be read from the
+this option is set to ``OFF``, the resources will be read from the
 source directories.
 
 

--- a/Sphinx/source/faq/debian-daemon.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/faq/debian-daemon.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -3,7 +3,8 @@
 Installing Orthanc as a Debian/Ubuntu daemon
 ============================================
 
-To install Orthanc as a Linux daemon on a Debian/Ubuntu system, you can:
+To install Orthanc as a GNU/Linux daemon on a Debian/Ubuntu system,
+you can:
 
 1. Download this `service script
    <http://anonscm.debian.org/cgit/debian-med/orthanc.git/tree/debian/orthanc.init>`_

--- a/Sphinx/source/faq/troubleshooting.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/faq/troubleshooting.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -58,14 +58,14 @@
     and `here
     <http://stackoverflow.com/questions/1726585/firefox-and-chrome-slow-on-localhost-known-fix-doesnt-work-on-windows-7>`__.
 
-* If you experience **slow DICOM transfers under Linux**, please read
-  the `following bug report
+* If you experience **slow DICOM transfers under GNU/Linux**, please
+  read the `following bug report
   <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785400>`__. This
-  issue does *not* affect all the versions of Linux. A
-  patch to this issue is shipped with the Orthanc source code. In
-  order to take advantage of this patch, you need to statically link
-  Orthanc against DCMTK by using the ``-DUSE_SYSTEM_DCMTK=OFF`` flag
-  `when invoking CMake
+  issue does *not* affect all the versions of GNU/Linux. A patch to
+  this issue is shipped with the Orthanc source code. In order to take
+  advantage of this patch, you need to statically link Orthanc against
+  DCMTK by using the ``-DUSE_SYSTEM_DCMTK=OFF`` flag `when invoking
+  CMake
   <https://bitbucket.org/sjodogne/orthanc/src/default/LinuxCompilation.txt>`__.
 
 

--- a/Sphinx/source/plugins.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/plugins.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -10,8 +10,8 @@
 
 The core of Orthanc can be extended through **plugins**. A plugin
 takes the form of a shared library (``.DLL`` under Windows, ``.so``
-under Linux, ``.dylib`` under Apple OS X...). A plugin can do various
-things, among others:
+under GNU/Linux, ``.dylib`` under Apple OS X...). A plugin can do
+various things, among others:
 
 * Serving new **Web applications** that have full access to the REST
   API of Orthanc, which makes easy to handle DICOM images from

--- a/Sphinx/source/plugins/worklists-plugin.rst	Fri Sep 16 08:57:28 2016 +0200
+++ b/Sphinx/source/plugins/worklists-plugin.rst	Fri Sep 16 09:14:59 2016 +0200
@@ -43,7 +43,7 @@
 	
 	"Plugins" : [
 	  "OsimisWebViewer.dll",
-	  "ModalityWorklists.dll" // on Linux, use ModalityWorklists.so
+	  "ModalityWorklists.dll" // on GNU/Linux, use ModalityWorklists.so
 	],
 
 - Add the findscu utility to the list of know modalities (considering findscu and Orthanc runs on the same machine)::