diff --git a/docs/source/simplesamlphp-advancedfeatures.xml b/docs/source/simplesamlphp-advancedfeatures.xml
index 35ddf1c521fe5a07813157d4cb28a7f3fed8f84b..8c7755ec92a4f7b38eddf73c38ea2fbcde6ef128 100644
--- a/docs/source/simplesamlphp-advancedfeatures.xml
+++ b/docs/source/simplesamlphp-advancedfeatures.xml
@@ -58,7 +58,7 @@
       optionally can add a parameter called <literal>attributes</literal>. If
       you do not include this parameter, all available attributes will be sent
       by default. Adding an array of attributes to this parameter, limits the
-      attributes sent to match this list. </para>
+      attributes sent to match this list.</para>
 
       <example>
         <title>Example of attribute filtering</title>
@@ -181,6 +181,42 @@ $attributemap = array(
     </section>
   </section>
 
+  <section>
+    <title>Automatically update SAML 2.0 Metadata XML from HTTPS</title>
+
+    <para>simpleSAMLphp supports the SAML 2.0 Metadata XML format. There are
+    mulitple ways of using simpleSAMLphp with SAML 2.0 Metadata XML documents,
+    but the reccomended approach would be to use the command line utility
+    <filename>bin/parseMetadata.php</filename> to download and parse metadata
+    from a HTTPS location. This script will grab the XML document from an URL
+    and parse the content. Next it will output simpleSAMLphp flat files in a
+    directory. In config.php configuration you should configure simpleSAMLphp
+    to read these files generated by
+    <filename>parseMetadata.php</filename>.</para>
+  </section>
+
+  <section>
+    <title>Automated testing </title>
+
+    <para>simpleSAMLphp includes a test script that can go to a simpleSAMLphp
+    SP, initiate login, enter some credentials, and then follow the response
+    back to the SP where it is validated, and check the output for expected
+    attributes.</para>
+
+    <para>The intension of this script is to be run in some system monitoring
+    systems, like nagios or hobbit, and generate alerts when something breaks
+    (in example a server is down or metadata misconfigured).</para>
+
+    <para>This test script is located here: <filename>bin/test.php</filename>.
+    The configuration file is located in
+    <filename>config/test.php</filename>.</para>
+
+    <para>Documentation about configuration file format and more details about
+    this test script will be added later. If you in example write a nagios
+    plugin for this test script, let us know :) We will add a hobbit plugin
+    and publish it somewhere pretty soon. Stay tuned!</para>
+  </section>
+
   <section>
     <title>Support</title>