[yt-svn] commit/yt-doc: MatthewTurk: Merging heads

[commits-noreply at bitbucket.org]

1 new commit in yt-doc:

https://bitbucket.org/yt_analysis/yt-doc/commits/e3c976980978/
Changeset:   e3c976980978
User:        MatthewTurk
Date:        2013-03-28 10:50:35
Summary:     Merging heads
Affected #:  3 files

diff -r 5f94c4690226ef7ddd90e03e73518f93a690d562 -r e3c976980978d4aa6ab0e4a56f97ad78c5991214 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -3,3 +3,4 @@
 ae96e6783ef6fe12b9d9ffd2c370b26b5de183b1 2.2-build1
 67134a1d1c3fde038544147b0bc5f0319dd806eb 2.3-build1
 1cc371e712eefa92fb2c6871475c05870eed840f 2.4
+577e461de85e4e3ab6acf50151d1265f41d56f2e 2.5

diff -r 5f94c4690226ef7ddd90e03e73518f93a690d562 -r e3c976980978d4aa6ab0e4a56f97ad78c5991214 source/advanced/developing.rst
--- a/source/advanced/developing.rst
+++ b/source/advanced/developing.rst
@@ -187,8 +187,7 @@
      these changes as well.
   #. Push your changes to your new fork using the command::
 
-     hg push https://bitbucket.org/YourUsername/yt/
-
+        hg push https://bitbucket.org/YourUsername/yt/
  
      If you end up doing considerable development, you can set an alias in the
      file ``.hg/hgrc`` to point to this path.
@@ -205,7 +204,7 @@
   #. Commit those changes to your local repository.
   #. Push the changes to your fork::
 
-     hg push https://bitbucket.org/YourUsername/yt/
+        hg push https://bitbucket.org/YourUsername/yt/
 
   #. Update your pull request by visiting
      https://bitbucket.org/YourUsername/yt/pull-request/new
@@ -363,7 +362,7 @@
 To keep things tidy, we try to stick with a couple simple guidelines.
 
 General Guidelines
-^^^^^^^^^^^^^^^^^^
+++++++++++++++++++
 
  * In general, follow `PEP-8 <http://www.python.org/dev/peps/pep-0008/>`_ guidelines.
  * Classes are ConjoinedCapitals, methods and functions are
@@ -386,7 +385,7 @@
    fiducial example of a docstring.
 
 API Guide
-^^^^^^^^^
++++++++++
 
  * Do not import "*" from anything other than ``yt.funcs``.
  * Internally, only import from source files directly; instead of: ``from
@@ -411,7 +410,7 @@
  * No global variables!
 
 Variable Names and Enzo-isms
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+++++++++++++++++++++++++++++
 
  * Avoid Enzo-isms.  This includes but is not limited to:
 

diff -r 5f94c4690226ef7ddd90e03e73518f93a690d562 -r e3c976980978d4aa6ab0e4a56f97ad78c5991214 source/conf.py
--- a/source/conf.py
+++ b/source/conf.py
@@ -55,7 +55,7 @@
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5dev'
+release = '2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Repository URL: https://bitbucket.org/yt_analysis/yt-doc/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.