Merge branch 'master' of github.com:BookStackApp/website into add-ldaptlsinsecure

diff --git a/content/docs/admin/third-party-auth.md b/content/docs/admin/third-party-auth.md
index cd9b1c9f678ffdd5cf6e6a31ef5c13d2827c5113..f86b0f8fe085f9d1bd413be11be42b4925c194cd 100644 (file)
--- a/content/docs/admin/third-party-auth.md
+++ b/content/docs/admin/third-party-auth.md
@@ -113,7 +113,9 @@ To create a Twitter application for signing in with you may require a phone numb
 3. In your new app select 'Add Product' on the left sidebar then choose 'Facebook Login' by clicking the 'Get Started' button. Select the 'Web' option if asked to choose a platform.
 4. Enter the your base BookStack url into the 'Site URL' box and save.
 5. On the left sidebar again go to 'Facebook Login' -> 'Settings'.
-6. Enter your base BookStack URL again into the 'Valid OAuth redirect URIs' input and save.
+6. Enter the following URLs under 'Valid OAuth Redirect URIs', changing `https://example.com` to your own domain where BookStack is hosted:
+    - `https://example.com/login/service/facebook/callback`
+    - `https://example.com/register/service/facebook/callback`
 7. Navigate back to the app 'Dashboard' in the sidebar to find your app id and secret. Add or set these to your `.env` file like so:
        ```bash
        # Replace the below (including '{}' braces) with your facebook APP_KEY and APP_SECRET

diff --git a/content/docs/user/content-overview.md b/content/docs/user/content-overview.md
index a0b024e9f297b8edbf40e4b7848b37c36a0d40d4..fb556e8bd42efc380c7b98f344ab932f65dde056 100644 (file)
--- a/content/docs/user/content-overview.md
+++ b/content/docs/user/content-overview.md
@@ -9,7 +9,7 @@ The principles of storing information within BookStack is based of the ideas of
 
 Within a book you can directly create pages or you can first create chapters. Chapters provide an additional level of page grouping to keep pages organised but are optional. All the information you write is held within pages. Although books and chapters do not hold information they can be given a short description to assist with searching and visibility.
 
-Once you start to stack-up books you can start to use Bookshelves to organise your Books. Bookshelves can contain mulitple books and a single books could be placed on multiple Bookshelves. 
+Once you start to stack-up books you can start to use Bookshelves to organise your Books. Bookshelves can contain mulitple books and a single book could be placed on multiple Bookshelves. 
 
 ### Default Colour Coding