Merge branch '2.0.1' into develop

Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md

@@ -6,6 +6,7 @@ requirements are as follows:
 * CMake version 2.8 or later (Packaging requires version 2.8.12 or later)
 * GCC version 4.4.7 or later
 * libaio
+* libcurl
 * OpenSSL
 * Bison 2.7 or later
 * Flex 2.5.35 or later

Documentation/Getting-Started/Install-MariaDB-MaxScale-Using-a-Tarball.md

@@ -2,6 +2,12 @@
 
 MariaDB MaxScale is also made available as a tarball, which is named like `maxscale-x.y.z.OS.tar.gz` where `x.y.z` is the same as the corresponding version and `OS` identifies the operating system, e.g. `maxscale-2.0.1.centos.7.tar.gz`.
 
+In order to use the tarball, the following libraries are required:
+
+- libcurl
+- libaio
+- OpenSSL
+
 The tarball has been built with the assumption that it will be installed in `/usr/local`. However, it is possible to install it in any directory, but in that case MariaDB MaxScale must be invoked with a flag.
 
 ## Installing as root in `/usr/local`
@@ -18,7 +24,7 @@ The required steps are as follows:
     $ cd maxscale
     $ sudo chown -R maxscale var
 
-Creating the symbolic link is necessary, since MariaDB MaxScale has been built with with the assumption that its base-directory, that is, the directory under which all its sub-directories are found, is `/usr/local/maxscale`.
+Creating the symbolic link is necessary, since MariaDB MaxScale has been built with with the assumption that the plugin directory is `/usr/local/maxscale/lib/maxscale`.
 
 The symbolic link also makes it easy to switch between different versions of MariaDB MaxScale that have been installed side by side in `/usr/local`; just make the symbolic link point to another installation.
 
@@ -46,6 +52,12 @@ The `-d` flag causes maxscale _not_ to turn itself into a daemon, which is advis
 
 If you want to place the configuration file somewhere else but in `/etc` you can invoke MariaDB MaxScale with the `--config` flag, for instance, `--config=/usr/local/maxscale/etc/maxscale.cnf`.
 
+Note also that if you want to keep _everything_ under `/usr/local/maxscale` you can invoke MariaDB MaxScale using the flag `--basedir`.
+
+    $ sudo bin/maxscale --user=maxscale --basedir=/usr/local/maxscale -d
+
+That will cause MariaDB MaxScale to look for its configuration file in `/usr/local/maxscale/etc` and to store all runtime files under `/usr/local/maxscale/var`.
+
 ## Installing in any Directory
 
 Enter a directory where you have the right to create a subdirectory. Then do as follows.