merged in from code from the other master

[selectricity] / README

diff --git a/README b/README
index 859f0ca0341047616411411cf97299f9c1db8daf..84e08c585626dac66f45f46193adbfa136c0276e 100644 (file)
--- a/README
+++ b/README
@@ -2,27 +2,33 @@
 === 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
 
 The best way to get Selectricity is just to download it from our source

-source repository. You'll need the Bazaar version control system or
+source repository. You'll need the Git version control system or

 source control manager to check it. You can get it here:
 
 source control manager to check it. You can get it here:
 

-  http://bazaar-vcs.org
+  http://git-scm.com/

 
 Once you have it, getting the source code is pretty easy. You just need
 to check out a branch with a command like this:
 
 
 Once you have it, getting the source code is pretty easy. You just need
 to check out a branch with a command like this:
 

-  bzr branch http://projects.mako.cc/source/selectricity
+  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

 
 

-  bzr branch http://projects.mako.cc/source/selectricity-live

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


@@ -50,6 +56,9 @@ On Ubuntu, you can install install the dependencies with:
 Our server configuration uses Mongrel (installed from gems) behind an
 Apache2 load balancing proxy using mod_proxy.
 
 Our server configuration uses Mongrel (installed from gems) behind an
 Apache2 load balancing proxy using mod_proxy.
 

+You'll also need to have a MTA installed. We use Postfix and have not
+tried it with any other system. Presumably though, anything that
+provides '/usr/bin/sendmail' should work.

 
 ===============================================
 === Contributors to Selectricity Include ======
 
 ===============================================
 === Contributors to Selectricity Include ======