Browse files

Remove sa-web and sa-service branch references

  • Loading branch information...
1 parent ab70fb8 commit ebcfd77bc42d6ff9d86d80a1f8ba9e8d929450fa @atogle atogle committed Sep 24, 2012
Showing with 12 additions and 18 deletions.
  1. +1 −1 .travis.yml
  2. +4 −7 doc/ARCHITECTURE.md
  3. +2 −2 doc/DEPLOY.md
  4. +5 −8 doc/README.md
View
2 .travis.yml
@@ -24,4 +24,4 @@ notifications:
# on_failure: change
branches:
only:
- - sa-web
+ - master
View
11 doc/ARCHITECTURE.md
@@ -2,12 +2,9 @@ SHAREABOUTS ARCHITECTURE
========================
Shareabouts (SA) is composed primarily of two parts:
-the Shareabouts API service, and the Shareabouts Web front-end
-application.
-
-These are currently (2012-09-05) developed on two branches on github:
-sa-services and sa-web respectively. That is likely to change, at
-some point they will probably become separate repositories.
+the [Shareabouts API](https://github.com/openplans/shareabouts-api)
+service, and the [Shareabouts](https://github.com/openplans/shareabouts)
+front-end application.
The Shareabouts Web Application
@@ -42,7 +39,7 @@ creating and retrieving geographic points and metadata about them.
It also includes a management UI for creating datasets and
inspecting the raw data stored by the back end.
-For more about this, see **TODO: link to sa-service docs**
+For more about this, see **TODO: link to API docs**
Shareabouts Data Model
-----------------------
View
4 doc/DEPLOY.md
@@ -11,13 +11,13 @@ Deploying to DotCloud
At OpenPlans, we have been deploying Shareabouts to DotCloud internally, so many
of the files necessary are already in the repository.
-* First, create a new dotcloud application from the contents of the `sa-web` branch:
+* First, create a new dotcloud application from the contents of the `master` branch:
dotcloud create <instance name>
* Push the code to DotCloud
- dotcloud push <instance name> -b sa-web
+ dotcloud push <instance name> -b master
Note you should either push all your changes to your master
repository (eg. github or whatever you're using for version
View
13 doc/README.md
@@ -65,24 +65,21 @@ Running the Shareabouts API Service
------------------------------------
For local development, you will also want to install and run the
-back-end API service. To do so, you will want a separate clone
-of the shareabouts repository, with the sa-service branch checked out.
-(This is as of 2012-09-05; will likely move to a separate repository
-in the future.)
+back-end API service. To do so, you will want clone the
+[Shareabouts API](https://github.com/openplans/shareabouts-api).
For example, in another terminal session, do this:
- git clone https://github.com/openplans/shareabouts/ sa-service
- cd sa-service
- git checkout sa-service
+ git clone https://github.com/openplans/shareabouts-api
+ cd shareabouts-api
Then read its own install documentation, in doc/README.md.
You'll want to run it on a separate port; we usually use 8001.
Configuration
--------------
-Next you need to configure the SA web app.
+Next you need to configure the Shareabouts web app.
See [the config docs](CONFIG.md).

0 comments on commit ebcfd77

Please sign in to comment.