Merge commit 'd5af608fe58ff9ed8f77021424708ae8a71fc53c' into release-1.4.1

Pulled updates from MaxScale-Documentation.

Documentation/Documentation-Contents.md

@@ -6,7 +6,7 @@
 ## About MaxScale
 
  - [About MaxScale](About/About-MaxScale.md)
- - [MaxScale 1.3.0 Release Notes](Release-Notes/MaxScale-1.3.0-Release-Notes.md)
+ - [MaxScale 1.4.0 Release Notes](Release-Notes/MaxScale-1.4.0-Release-Notes.md)
  - [Changelog](Changelog.md)
  - [Limitations](About/Limitations.md)
  - [COPYRIGHT](About/COPYRIGHT.md)
@@ -20,6 +20,7 @@
 
 ## Upgrading MaxScale
 
+- [Upgrading MaxScale from 1.3 to 1.4](Upgrading/Upgrading-To-MaxScale-1.4.md)
 - [Upgrading MaxScale from 1.2 to 1.3](Upgrading/Upgrading-To-MaxScale-1.3.md)
 - [Upgrading MaxScale from 1.1.1 to 1.2](Upgrading/Upgrading-To-MaxScale-1.2.md)
 - [Upgrading MaxScale from 1.0.5 to 1.1.0](Upgrading/Upgrading-To-MaxScale-1.1.0.md)
@@ -30,6 +31,8 @@
  - [How Errors are Handled in MaxScale](Reference/How-errors-are-handled-in-MaxScale.md)
  - [Debug and Diagnostic Support](Reference/Debug-And-Diagnostic-Support.md)
  - [Routing Hints](Reference/Hint-Syntax.md)
+ - [MaxBinlogCheck](Reference/MaxBinlogCheck.md)
+ - [MaxScale and SSL](Reference/MaxScale-and-SSL.md)
 
 ## Tutorials
 

Documentation/Filters/RabbitMQ-Consumer-Client.md

@@ -14,7 +14,37 @@ The **RabbitMQ Consumer Client** only has one command line argument.
 
 ## Installation
 
-To install the RabbitMQ Consumer Client you ca either use the provided packages or you can compile it from source code. The source code is included as a part of the MaxScale source code and can be found in the `rabbitmq_consumer` folder. Please refer to the [README](../../rabbitmq_consumer/README) in the folder for more detailed instructions about installation and configuration.
+To install the RabbitMQ Consumer Client you ca either use the provided packages or you can compile it from source code. The source code is included as a part of the MaxScale source code and can be found in the `rabbitmq_consumer` folder.
+
+## Building from source
+
+This program requires the librabbitmq and libmysqlclient libraries.
+
+* [librabbitmq-c] (https://github.com/alanxz/rabbitmq-c)
+* [MariaDB Client Library for C 2.0 Series](https://mariadb.com/kb/en/mariadb/client-libraries/client-library-for-c/)
+
+Building with CMake:
+
+```
+cmake .
+```
+
+Variables to pass for CMake:
+
+Path to headers		-DCMAKE_INCLUDE_PATH=<path to headers>
+Path to libraries	-DCMAKE_LIBRARY_PATH=<path to libraries>
+Install prefix		-DCMAKE_INSTALL_PREFIX=<prefix>
+
+
+Separate multiple folders with colons, for example:
+```
+path1:path2:path3
+```
+
+After running CMake run `make` to build the binaries and `make package` to build RPMs.
+
+To build without CMake, use the provided makefile and update the
+include and library directories 'in buildvars.inc'
 
 ## Configuration
 

Documentation/Release-Notes/MaxScale-1.4.0-Release-Notes.md

@@ -61,7 +61,7 @@ than the non-MD5 version. This means that a new password file needs to be
 created with `maxkeys`. The configuration file should be updated to use the new
 passwords. This can be done with the help of the `maxpasswd` utility. For more
 details about how to do this, please refer to the installation guide:
-[MariaDB MaxScale Installation Guide](../Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md)
+[MariaDB MaxScale Installation Guide](../Getting-Started/MariaDB-MaxScale-Installation-Guide.md)
 
 ## Removed Features
 

Documentation/Upgrading/Upgrading-To-MaxScale-1.4.md

@@ -24,7 +24,7 @@ GRANT SELECT ON mysql.tables_priv TO 'username'@'maxscalehost';
 MaxScale 1.4.0 upgrades the used password encryption algorithms to more secure ones.
 This requires that the password files are recreated with the `maxkeys` tool.
 For more information about how to do this, please read the installation guide:
-[MariaDB MaxScale Installation Guide](../Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md)
+[MariaDB MaxScale Installation Guide](../Getting-Started/MariaDB-MaxScale-Installation-Guide.md)
 
 ## SSL