merged in from code from the other master

[selectricity] / README

diff --git a/README b/README
index 3bac5d3df429d4ae20d11762e8c533a40263e45a..84e08c585626dac66f45f46193adbfa136c0276e 100644 (file)
--- a/README
+++ b/README
@@ -2,10 +2,11 @@
 === Getting Selectricity ======================
 ===============================================
 
 === Getting Selectricity ======================
 ===============================================
 

-Selectricity is free software and is distributed under the MIT or
-BSD-like ExPat license. You are free to use, modify, and distribute, or
-rework Selectricity. Of course, we'd sure like it if you would send
-fixes back to us and tell us about cool stuff you do with our software!
+Selectricity is free software and is distributed under the GNU Affero
+General Public License version 3. You are free to use, modify, and
+distribute, or rework Selectricity under the terms of that license. Of
+course, we'd sure like it if you would send fixes back to us and tell us
+about cool stuff you do with our software!

 
 The best way to get Selectricity is just to download it from our source
 source repository. You'll need the Git version control system or
 
 The best way to get Selectricity is just to download it from our source
 source repository. You'll need the Git version control system or


@@ -18,11 +19,16 @@ to check out a branch with a command like this:
 
   git clone http://projects.mako.cc/source/selectricity/.git
 
 
   git clone http://projects.mako.cc/source/selectricity/.git
 

-This will give you the latest *development* version of our code. If you
-want the latest production version (i.e., what we're running on the
-site), you can grab that here:
+By default, this will create a working copy with the latest
+*development* version of our code. If you want the latest production
+version (i.e., what we're running on the site), you need to switch to
+the live version of the software which is kept in a branch called
+"live." Once you cloned the repository above, you can switch into the
+directory (i.e., run "cd selectricity") and then run the following
+command:
+
+  git checkout -b live origin/live

 
 

-  git clone http://projects.mako.cc/source/selectricity-live/.git

 
 ===============================================
 === Dependencies ==============================
 
 ===============================================
 === Dependencies ==============================