Merge branch 'master' into system-cli-support

Author: thespad

README.md

@@ -113,14 +113,14 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - APP_URL=
+      - APP_URL=https://bookstack.example.com
       - DB_HOST=bookstack_db
       - DB_PORT=3306
       - DB_USER=bookstack
       - DB_PASS=<yourdbpass>
       - DB_DATABASE=bookstackapp
     volumes:
-      - /path/to/data:/config
+      - ./bookstack_app_data:/config
     ports:
       - 6875:80
     restart: unless-stopped
@@ -138,7 +138,7 @@ services:
       - MYSQL_USER=bookstack
       - MYSQL_PASSWORD=<yourdbpass>
     volumes:
-      - /path/to/data:/config
+      - ./bookstack_db_data:/config
     restart: unless-stopped
 
 ```
@@ -151,7 +151,7 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -e APP_URL= \
+  -e APP_URL=<yourbaseurl> \
   -e DB_HOST=<yourdbhost> \
   -e DB_PORT=<yourdbport> \
   -e DB_USER=<yourdbuser> \
@@ -174,7 +174,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` |
+| `-e APP_URL=<yourbaseurl>` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` |
 | `-e DB_HOST=<yourdbhost>` | for specifying the database host |
 | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 |
 | `-e DB_USER=<yourdbuser>` | for specifying the database user |