Jason Pellerin avatar Jason Pellerin committed 24e0552

Updated with hg urls, better explanations of what version is where

Comments (0)

Files changed (2)

doc/contributing.rst

 Get the code!
 -------------
 
-Start by getting a local working copy of nose.
+Start by getting a local working copy of nose, either stable, from google code::
 
-.. code-block:: none
+  hg clone http://python-nose.googlecode.com/hg/ nose-stable
 
-   hg clone FIXME FIXME FIXME
+or unstable, from bitbucket::
 
-Next, if you plan to push changes back to the core repository, you
-should set up a public repository of your own somewhere. `Bitbucket
-<http://bitbucket.org>`__ is one good place to do that. Once you've
-set up your bitbucket nose repository, pull from your working copy of
-nose core, and push to bitbucket. That (with occasional merging) will
-be your normal practice for keeping your repository up to date.
+  hg clone http://bitbucket.org/jpellerin/nose/ nose-unstable
+
+If you plan to submit changes back to the core repository, you should set up a
+public repository of your own somewhere. `Bitbucket <http://bitbucket.org>`__
+is a good place to do that. Once you've set up your bitbucket nose repository,
+if working from **stable**, pull from your working copy of nose-stable, and push
+to bitbucket. That (with occasional merging) will be your normal practice for
+keeping your repository up to date. If you're on bitbucket and working from
+**unstable**, just **fork** http://bitbucket.org/jpellerin/nose/.
 
 Discuss
 -------
 Issues affecting nose3 should likewise be reported at the bitbucket
 site, not at google code.
 
-nose3 hosting may move to google code at some future date, when or if google
+nose3 hosting may move to google code at some future date, when google
 code supports bitbucket-style forking.
 
 I have a great idea for a plugin...

doc/developing.rst

 Get the code
 ------------
 
-.. code-block:: none
+The stable branch of nose is hosted at `google code
+<http://code.google.com/p/python-nose/>`__. You should clone this
+branch if you're developing a plugin or working on bug fixes for nose::
 
-   hg clone FIXME FIXME FIXME
+  hg clone http://python-nose.googlecode.com/hg/ nose-stable
 
+The **unstable** branch of nose is hosted at `bitbucket
+<http://bitbucket.org/jpellerin/nose/>`__. You should **fork** this branch if
+you are developing new features for nose. Then clone your fork, and submit
+your changes as a pull request. If you just want to use unstable, you can
+clone the branch::
+
+  hg clone http://bitbucket.org/jpellerin/nose/ nose-unstable
+
+The **python3.0** version of nose, nose3, is also hosted at bitbucket. You can
+fork that branch to work on features or bug fixes for nose3. If you just want
+to use it, clone the branch::
+
+  hg clone http://bitbucket.org/jpellerin/nose3/
+   
 Read
 ----
    
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.