From ac5ae80c778f3a5dd9d98a91c5c0f868e6267e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20VIGNELLES?=
 <jeremyVignelles@users.noreply.github.com>
Date: Thu, 28 Dec 2017 19:25:05 +0100
Subject: [PATCH 1/3] Fixed typo in command

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index 711546627..43cf43dde 100644
--- a/docker/README.md
+++ b/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...)

From 02f6b38df6880db80df34be112e65fd58d5435b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20VIGNELLES?=
 <jeremyVignelles@users.noreply.github.com>
Date: Thu, 28 Dec 2017 19:29:44 +0100
Subject: [PATCH 2/3] Fixed docker-compose.yml URL

Using raw.githubusercontent rather than github (HTML)
---
 docker/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/setup.sh b/docker/setup.sh
index 707de1844..6efb8a0da 100644
--- a/docker/setup.sh
+++ b/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 "$@"
\ No newline at end of file
+prepare_config "$@"

From f622789e5d013107b0b115e6a1ba474ed48b35f9 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Tue, 2 Jan 2018 10:26:04 +0100
Subject: [PATCH 3/3] Version 2.6.3

---
 .fabmanager-version | 2 +-
 CHANGELOG.md        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.fabmanager-version b/.fabmanager-version
index 097a15a2a..ec1cf33c3 100644
--- a/.fabmanager-version
+++ b/.fabmanager-version
@@ -1 +1 @@
-2.6.2
+2.6.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04e25299..b27cc147b 100644
--- a/CHANGELOG.md
+++ b/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