From c77a09cb7b5d99cfa5724be3f986a80ba40aec55 Mon Sep 17 00:00:00 2001
From: Alberto Colla <alberto.colla@garr.it>
Date: Thu, 4 Jan 2018 13:06:07 +0100
Subject: [PATCH] Update making-changes-to-charm.rst

---
 web/support/kb/juju/making-changes-to-charm.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/support/kb/juju/making-changes-to-charm.rst b/web/support/kb/juju/making-changes-to-charm.rst
index 5d0f6f9a..b6aebf41 100644
--- a/web/support/kb/juju/making-changes-to-charm.rst
+++ b/web/support/kb/juju/making-changes-to-charm.rst
@@ -60,9 +60,21 @@ The main steps needed to start modifying a charm are:
 - let `git-review` do some initial magic: `git review -s`
 - `git remote update`
 - `git checkout master`
-- `git pull --ff-only origin master`
+- `git pull - - ff-only origin master`
 - `git checkout -b bug/<bugID>` where `bugID` is the number of the bug you opened earlier in Launchpad
 
+
+Prepare testing area
+....................
+
+To execute the tests (based on tox) we still need to download the packages pip and tox::
+
+   - sudo apt-get install python-pip
+   - pip install tox
+
+
+
+
 At each development cycle
 .........................
 
-- 
GitLab