Merge branch 'dev' for release 2.6.3

.fabmanager-version

@@ -1 +1 @@
-2.6.2
+2.6.3

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog Fab Manager
 
+## v2.6.3 2018 January 2
+
+- Fix a bug: wrong docker-compose url in setup script (#98)
+- Typo correction in docker README (#97)
+
 ## v2.6.2 2017 December 21
 
 - Support for internet explorer 11

docker/README.md

@@ -103,7 +103,7 @@ You can run the following script as root to easily perform all these operations:
 Create the config folder, copy the environnement variables configuration file and edit it:
 ```bash
 mkdir -p /apps/fabmanager/config
-cd /apps/famanager
+cd /apps/fabmanager
 cp example/env.exemple config/env
 vi config/env
 # or use your favorite text editor instead of vi (nano, ne...)

docker/setup.sh

@@ -17,7 +17,7 @@ prepare_config()
   \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example"
 
   # docker-compose
-  \curl -sSL https://github.com/LaCasemate/fab-manager/blob/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml"
+  \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml"
 }
 
-prepare_config "$@"
+prepare_config "$@"