From d5cfb2451e49c67f21fb7a38ec7acfc41acf199e Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Tue, 20 Nov 2018 15:18:00 +0000
Subject: [PATCH] Update required PHP version, add docs on module.enable.

---
 docs/simplesamlphp-install.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/simplesamlphp-install.md b/docs/simplesamlphp-install.md
index b410c54c7..812dde820 100644
--- a/docs/simplesamlphp-install.md
+++ b/docs/simplesamlphp-install.md
@@ -31,7 +31,7 @@ Prerequisites
 -------------
 
  * Some webserver capable of executing PHP scripts.
- * PHP version >= 5.4.0.
+ * PHP version >= 5.5.0.
  * Support for the following PHP extensions:
    * Always required: `date`, `dom`, `hash`, `libxml`, `openssl`, `pcre`, `SPL`, `zlib`, `json`, `mbstring`
    * When automatically checking for latest versions, and used by some modules: `cURL`
@@ -100,7 +100,7 @@ By default, SimpleSAMLphp looks for its configuration in the `config` directory
 has some drawbacks, like making it harder to use SimpleSAMLphp as a composer dependency, or to package it for different
 operating systems.
 
-However, it is now possible to specify an alternate location for the configuration directory by setting an environment
+It is possible to specify an alternate location for the configuration directory by setting an environment
 variable with this location. This way, the configuration directory doesn't need to be inside the library's directory,
 making it easier to manage and to update. The simplest way to set this environment variable is to set it in your web
 server's configuration. See the next section for more information.
@@ -257,6 +257,14 @@ to `disable`.
     cd modules/consent
     mv enable disable
 
+Alternatively or additionally, you can use the `module.enable` setting
+in config.php:
+
+    'module.enable' => [
+         'exampleauth' => true, // Setting to TRUE enables.
+         'saml' => false, // Setting to FALSE disables.
+         'core' => null, // Unset or NULL uses default for this module.
+    ],
 
 
 The SimpleSAMLphp installation webpage
-- 
GitLab