Merge branch 'stable'

Conflicts:
	docs/source/siteadmin/deploying.rst
	docs/source/siteadmin/relnotes.rst

diff --cc docs/source/siteadmin/deploying.rst
index 2aadd045888efddf9acabc70a7897e6d5a431bba,dad489c5c9db5214b0e9c6b74b094cbc5cefa5c0..e40426176003c7e3a6852c2ea10d7c47ced186c5
--- 1/docs/source/siteadmin/deploying.rst
--- 2/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@@ -210,14 -193,33 +210,21 @@@ Change to the MediaGoblin directory tha
  
  Clone the MediaGoblin repository and set up the git submodules::
  
-     $ git clone https://gitorious.org/mediagoblin/mediagoblin.git -b stable
 -    git clone git://git.savannah.gnu.org/mediagoblin.git -b stable
 -    cd mediagoblin
 -    git submodule init && git submodule update
++    $ git clone git://git.savannah.gnu.org/mediagoblin.git -b stable
 +    $ cd mediagoblin
 +    $ git submodule init && git submodule update
  
+ .. note::
+ 
+    The MediaGoblin repository used to be on gitorious.org, but since
+    gitorious.org shut down, we had to move.  We are presently on
+    Savannah.  You may need to update your git repository location::
+ 
+        git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git
  
 -And set up the in-package virtualenv::
 -
 -    (virtualenv --python=python2 --system-site-packages . || virtualenv --python=python2 .) && ./bin/python setup.py develop
 -
 -.. note::
 -
 -   We presently have an **experimental** make-style deployment system.  if
 -   you'd like to try it, instead of the above command, you can run::
 +Set up the hacking environment::
  
 -     ./experimental-bootstrap.sh && ./configure && make
 -
 -   This also includes a number of nice features, such as keeping your
 -   viratualenv up to date by simply running `make update`.
 -
 -   Note: this is liable to break.  Use this method with caution.
 +    $ ./bootstrap.sh && ./configure && make
  
  The above provides an in-package install of ``virtualenv``. While this
  is counter to the conventional ``virtualenv`` configuration, it is

diff --cc docs/source/siteadmin/relnotes.rst
index cb8db4ab1f8d33c9937a871b46aa1c8ab31ed61b,11ee019f4e865d79740a2e8974b2f3b18c15580f..101d9447c29063f8571f414adaabf5d2713a456a
--- 1/docs/source/siteadmin/relnotes.rst
--- 2/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@@ -21,12 -21,14 +21,23 @@@ This chapter has important information 
  If you're upgrading from a previous release, please read it
  carefully, or at least skim over it.
  
- **NOTE:** ALWAYS do backups before upgrading, especially before
-  running migrations!  That way if something goes wrong, we can fix
-  things!
++.. note::
++
++   ALWAYS do backups before upgrading, especially before
++   running migrations!  That way if something goes wrong, we can fix
++   things!
++
++   And be sure to shut down your current mediagoblin/celery processes
++   before upgrading!
++
+ .. note::
+ 
+    The MediaGoblin repository used to be on gitorious.org, but since
+    gitorious.org shut down, we had to move.  We are presently on
+    Savannah.  You may need to update your git repository location::
+ 
+        git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git
  
-  And be sure to shut down your current mediagoblin/celery processes
-  before upgrading!
  
  0.7.1
  =====