[Python-checkins] devguide (hg_transition): Minor edits and typo fixes.

[eric.araujo]

eric.araujo pushed 140b84af4344 to devguide:

http://hg.python.org/devguide/rev/140b84af4344
changeset:   334:140b84af4344
branch:      hg_transition
tag:         tip
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Feb 27 04:08:47 2011 +0100
summary:
  Minor edits and typo fixes.

- Move a link target after its use
- Add a todo about tracker markup
- Remove one XXX that was in a warning block, not a comment

files:
  committing.rst
  faq.rst
  grammar.rst
  triaging.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -144,7 +144,8 @@
 Porting Between Major Versions
 ''''''''''''''''''''''''''''''
 
-.. warning:: XXX transplant always commits automatically. This breaks the
+.. warning::
+   transplant always commits automatically. This breaks the
    "run the test suite before committing" rule. We could advocate using
    "hg qimport -r tip -P" afterwards but that would add another level of
    complexity.
@@ -161,7 +162,7 @@
 Differences with ``svnmerge``
 '''''''''''''''''''''''''''''
 
-If you are coming from SVN, you might be surprised by how Mercurial works.
+If you are coming from Subversion, you might be surprised by how Mercurial works.
 Despite its name, ``svnmerge`` is different from ``hg merge``: while ``svnmerge``
 allows to cherrypick individual revisions, ``hg merge`` can only merge whole
 lines of development in the repository's :abbr:`DAG (directed acyclic graph)`.
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -32,8 +32,6 @@
 What do I need to use Mercurial?
 -------------------------------------------------------------------------------
 
-.. _download Mercurial: http://mercurial.selenic.com/downloads/
-
 UNIX
 '''''''''''''''''''
 
@@ -46,6 +44,7 @@
 are typically available either online or through the platform's package
 management system.
 
+.. _download Mercurial: http://mercurial.selenic.com/downloads/
 .. _OpenSSH: http://www.openssh.org/
 
 
@@ -72,7 +71,6 @@
    If your private key is in OpenSSH format, you must first convert it to
    PuTTY format by loading it into `PuTTYgen`_.
 
-
 .. _download TortoiseHg: http://tortoisehg.bitbucket.org/download/index.html
 
 
diff --git a/grammar.rst b/grammar.rst
--- a/grammar.rst
+++ b/grammar.rst
@@ -62,6 +62,6 @@
 
 * After everything's been checked in, you're likely to see a new
   change to Python/Python-ast.c.  This is because this
-  (generated) file contains the svn version of the source from
+  (generated) file contains the hg version of the source from
   which it was generated.  There's no way to avoid this; you just
   have to submit this file separately.
diff --git a/triaging.rst b/triaging.rst
--- a/triaging.rst
+++ b/triaging.rst
@@ -190,6 +190,10 @@
 * ``r<number>``, ``rev<number>``, ``revision <number>`` links to the Subversion
   revision ``<number>``.
 
+.. TODO update that last item to the format choosed for Mercurial: [CSET]
+   - check that [CSET] works
+   - check that rNUMBER links to the hglookup application
+
 
 Reporting Issues About the Tracker
 ----------------------------------

--
Repository URL: http://hg.python.org/devguide