Fixed ldap docs & updated requirements to match next release

 Closes BookStackApp/BookStack#207.
 Closes BookStackApp/BookStack#214.
 
 

diff --git a/resources/docs/admin/installation.md b/resources/docs/admin/installation.md
index 6c79f4a6790721cac69bb17b7eebbb9eff89462b..06e3cb0ea5ed4bd28df0ab5d45588a92dc50edff 100644 (file)
--- a/resources/docs/admin/installation.md
+++ b/resources/docs/admin/installation.md
@@ -11,7 +11,7 @@
 BookStack has similar requirements to Laravel:
 
 * PHP >= 5.6.4, Will need to be usable from the command line.
-* PHP Extensions: `OpenSSL`, `PDO`, `MBstring`, `Tokenizer`, `GD`, `MySQLND`
+* PHP Extensions: `OpenSSL`, `PDO`, `MBstring`, `Tokenizer`, `GD`, `MySQLND`, `Tidy`
 * MySQL >= 5.6
 * Git (Not strictly required but helps manage updates)
 * [Composer](https://getcomposer.org/)

diff --git a/resources/docs/admin/ldap-auth.md b/resources/docs/admin/ldap-auth.md
index b2aa0da2525decd5727ba4580b98445eb57ea4c4..9bfbd502c706aef53d63183183beefa4672866b8 100644 (file)
--- a/resources/docs/admin/ldap-auth.md
+++ b/resources/docs/admin/ldap-auth.md
@@ -11,7 +11,7 @@ To set up LDAP-based authentication add or modify the following variables in you
 AUTH_METHOD=ldap
 
 # The LDAP host, Adding a port is optional
-LDAP_SERVER=ldap://example.com:389
+LDAP_SERVER=example.com:389
 
 # The base DN from where users will be searched within.
 LDAP_BASE_DN=ou=People,dc=example,dc=com
@@ -33,4 +33,4 @@ You will also need to have the php-ldap extension installed on your system. It's
 
 A user in BookStack will be linked to a LDAP user via a 'uid'. If a LDAP user uid changes it can be updated in BookStack by an admin by changing the 'External Authentication ID' field on the user's profile.
 
-You may find that you cannot log in with your initial Admin account after changing the `AUTH_METHOD` to `ldap`. To get around this set the `AUTH_METHOD` to `standard`, login with your admin account then change it back to `ldap`. You get then edit your profile and add your LDAP uid under the 'External Authentication ID' field. You will then be able to login in with that ID.
\ No newline at end of file
+You may find that you cannot log in with your initial Admin account after changing the `AUTH_METHOD` to `ldap`. To get around this set the `AUTH_METHOD` to `standard`, login with your admin account then change it back to `ldap`. You get then edit your profile and add your LDAP uid under the 'External Authentication ID' field. You will then be able to login in with that ID.

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index a7ff4a716fabe02cdf5f0eadf265525236b39f30..af7591779cb460de3cd4e7a8993d38b82e569744 100644 (file)
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -3,7 +3,7 @@
 @section('header')
     <div class="row hero">
         <div class="col-md-4 spaced">
-            <h2 >Simple &amp; Free <br>Wiki Software</h2>
+            <h2>Simple &amp; Free <br>Wiki Software</h2>
             <p>BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information.</p>
             <p>
               <a href="https://github.com/ssddanbrown/BookStack">GitHub</a> &nbsp;-&nbsp;