summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-02-09 13:39:24 -0200
committerBruno Wagner <bwgpro@gmail.com>2015-02-10 13:06:36 -0200
commit9840548ffc68e68ec1bd3d91e2cdfcbe92a492f4 (patch)
treeb455eba8efaa9f55dd978f8d76696e3d4da86871 /README.md
parent2b3842485c5f780b9b52d1b5c62b8f4ccc89b1a1 (diff)
Rephrased some things on the README and removed the provision README as its contents are already on the main README now
Diffstat (limited to 'README.md')
-rw-r--r--README.md13
1 files changed, 5 insertions, 8 deletions
diff --git a/README.md b/README.md
index a383eb27..9f295cd2 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This contains the Pixelated User Agent, which is composed of a web UI written as
# Running it
The User Agent has 2 components:
* The Web Ui, which is the the HTML, CSS and JS files served to the browser;
-* The Service component, which is the web service that serves the Web UI to the browser, provides the REST API which the the Web Ui uses, and integrates with the LEAP or Pixelated provider.
+* The Service component, which is the web service that serves the Web UI to the browser, provides the REST API which the Web Ui uses, and integrates with the LEAP or Pixelated provider.
## Quickstart
@@ -25,10 +25,10 @@ Clone the repository:
git clone https://github.com/pixelated-project/pixelated-user-agent.git
-From the root folder, set up the vagrant machine:
+From the root folder, set up the vagrant machine:
vagrant up source
-
+
You can log into the machine using:
vagrant ssh
@@ -73,11 +73,11 @@ node, npm, compass (ruby), virtualenv, git
* Enter the `service` folder
-* Create the virtualenv with `virtualenv .virtualenv`
+* Create the virtualenv with `virtualenv .virtualenv`
* Activate it with `source .virtualenv/bin/activate`
-* Install the test dependencies with `pip install -r test_requirements.txt`
+* Install the test dependencies with `pip install -r test_requirements.txt`
* Run the setup with `python setup.py develop`
@@ -122,6 +122,3 @@ apt-get update
apt-get install pixelated-user-agent
```
-
-**Warning:** Currently there are some challenges with the dependencies. To make the user agent work see instructions used to build the docker image: [Dockerfile](provisioning/Dockerfile).
-