[Python-checkins] devguide: Backporting is obsolete. Add details that I had to learn.

[terry.reedy]

http://hg.python.org/devguide/rev/7848c29f58c6
changeset:   471:7848c29f58c6
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Jan 09 15:57:50 2012 -0500
summary:
  Backporting is obsolete. Add details that I had to learn.
(Loading project files otherwise generates an error/warning with Express.)

files:
  devcycle.rst |  8 ++++----
  faq.rst      |  5 +++--
  setup.rst    |  4 ++--
  3 files changed, 9 insertions(+), 8 deletions(-)


diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -30,10 +30,10 @@
 Branches
 ''''''''
 
-Different branches are used at a time to represent different *minor versions*
-in which development is made.  All development should be done **first** in the
-:ref:`in-development <indevbranch>` branch, and selectively backported
-to other branches when necessary.
+There is a branch for each *minor version*. Development is done separately
+for Python 2 and Python 3. For each *major version*, each change should be made
+**first** in the oldest branch to which it applies and forward-ported as
+appropriate.
 
 
 .. _indevbranch:
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -174,8 +174,9 @@
 
 If you have push rights, you need to configure Mercurial to work with
 your SSH keys.  For that, open your Mercurial configuration file
-(you can do so by opening the TortoiseHg configuration dialog and then
-clicking *"Edit File"*).  In the ``[ui]`` section, add the following line::
+(you can do so by opening the TortoiseHg Global Settings dialog and then
+clicking *"Edit File"*).  If there is no ``[ui]`` section, create it by
+typing just that on a line by itself. Then add the following line::
 
    ssh = TortoisePlink.exe -ssh -2 -C -i C:\path\to\yourkey.ppk
 
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -165,8 +165,8 @@
 is sufficient. Its limitations are given at
 http://msdn.microsoft.com/en-us/library/hs24szh9%28v=VS.90%29.aspx .
 
-To build from the Visual Studio GUI, load the project files and press F7. Make
-sure you have chosen the "Debug" build first.
+To build from the Visual Studio GUI, open pcbuild.sln to load the project
+files and press F7. Make sure you have chosen the "Debug" build first.
 
 Once built you might want to set Python as a startup project. Pressing F5 in
 Visual Studio will launch the interpreter.

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