This commit is contained in:
Jeff Balogh 2011-10-17 14:08:01 -07:00
Родитель 2d53e504b8
Коммит 82fb648a27
9 изменённых файлов: 11 добавлений и 12 удалений

Просмотреть файл

@ -50,4 +50,4 @@ JavaScript
- Write `JavaScript`_ tests whenever possible
.. _`JavaScript`: http://jbalogh.github.com/zamboni/topics/testing/#javascript-tests
.. _`JavaScript`: http://mozilla.github.com/zamboni/topics/testing/#javascript-tests

Просмотреть файл

@ -217,4 +217,4 @@ for key, val in intersphinx_mapping.items():
intersphinx_mapping[key] = '_intersphinx/' + val
# Root url where source files can be browsed online.
src_base_url = 'http://github.com/jbalogh/zamboni/tree/master/'
src_base_url = 'http://github.com/mozilla/zamboni/tree/master/'

Просмотреть файл

@ -32,5 +32,5 @@ but to use a merge commit if you have multiple commits that form a cohesive unit
.. _nvie's branching model: http://nvie.com/posts/a-successful-git-branching-model/
.. _master: http://github.com/jbalogh/zamboni/tree/master
.. _next: http://github.com/jbalogh/zamboni/tree/next
.. _master: http://github.com/mozilla/zamboni/tree/master
.. _next: http://github.com/mozilla/zamboni/tree/next

Просмотреть файл

@ -15,13 +15,13 @@ The Perfect Git Configuration
We're going to talk about two git repositories:
* *origin* will be the main zamboni repo at http://github.com/jbalogh/zamboni.
* *origin* will be the main zamboni repo at http://github.com/mozilla/zamboni.
* *mine* will be your fork at http://github.com/:user/zamboni.
There should be something like this in your ``.git/config`` already::
[remote "origin"]
url = git://github.com/jbalogh/zamboni.git
url = git://github.com/mozilla/zamboni.git
fetch = +refs/heads/*:refs/remotes/origin/*
Now we'll set up your master to pull directly from the upstream zamboni::

Просмотреть файл

@ -54,9 +54,8 @@ Use the Source
Grab zamboni from github with::
git clone --recursive git://github.com/jbalogh/zamboni.git
git clone --recursive git://github.com/mozilla/zamboni.git
cd zamboni
git clone --recursive git://github.com/jbalogh/zamboni-lib.git vendor
svn co http://svn.mozilla.org/addons/trunk/site/app/locale locale
``zamboni.git`` is all the source code. ``zamboni-lib.git`` is all of our

Просмотреть файл

@ -37,7 +37,7 @@ repositories. These are maintained by Hudson in the zamboni-lib repository.
Check out the vendor lib with ::
git clone --recursive git://github.com/jbalogh/zamboni-lib.git ./vendor
git clone --recursive git://github.com/mozilla/zamboni-lib.git ./vendor
Once the zamboni-lib repo has been downloaded to ``/vendor``, you only need to
install the compiled packages. These can come from your system package manager

Просмотреть файл

@ -10,7 +10,7 @@ Getting Requirements
Grab zamboni from github with ::
git clone git://github.com/jbalogh/zamboni.git
git clone git://github.com/mozilla/zamboni.git
git submodule update --init
You're going to need virtualenv and pip, but I'll let you figure that one out.

Просмотреть файл

@ -40,7 +40,7 @@ fi
if [ ! -d "$VENDOR" ]; then
echo "No vendor lib? Cloning..."
git clone --recursive git://github.com/jbalogh/zamboni-lib.git $VENDOR
git clone --recursive git://github.com/mozilla/zamboni-lib.git $VENDOR
fi
# Update the vendor lib.

Просмотреть файл

@ -41,7 +41,7 @@ fi
if [ ! -d "$VENDOR" ]; then
echo "No vendor lib? Cloning..."
git clone --recursive git://github.com/jbalogh/zamboni-lib.git $VENDOR
git clone --recursive git://github.com/mozilla/zamboni-lib.git $VENDOR
fi
# Update the vendor lib.