diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-04-17 17:09:06 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-04-17 17:09:06 -0500 |
| commit | a35b7c7fb38f7121eacef7fc6a76b06db47fabf2 (patch) | |
| tree | 73176f4eb6af01e2f4de158a3371db794d5c619c /docs/source | |
| parent | 3ae2371242802ac58ce0ba13c02b911a5a16482e (diff) | |
| parent | 9fa1e602b40d1e531335bf903dc7b15632818cf0 (diff) | |
| download | mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.tar.lz mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.tar.xz mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.zip | |
Merge branch 'stable'
Conflicts:
docs/source/siteadmin/deploying.rst
docs/source/siteadmin/relnotes.rst
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/siteadmin/deploying.rst | 9 | ||||
| -rw-r--r-- | docs/source/siteadmin/relnotes.rst | 21 |
2 files changed, 24 insertions, 6 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 2aadd045..e4042617 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -210,10 +210,17 @@ Change to the MediaGoblin directory that you just created:: 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 +.. 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 Set up the hacking environment:: diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index cb8db4ab..101d9447 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -21,12 +21,23 @@ This chapter has important information for releases in it. 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 ===== |