From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 14 Jan 2012 21:27:56 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~400^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee090c71b7278d12b297193c4a6e507c57c612a9;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

ee090c71b7278d12b297193c4a6e507c57c612a9
diff --cc Doc/contents.rst
index e9d1771a85fc,c0c6af34d9d1..cc5c8e379496
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@@ -11,9 -11,8 +11,8 @@@
     library/index.rst
     extending/index.rst
     c-api/index.rst
 -   distutils/index.rst
 +   packaging/index.rst
     install/index.rst
-    documenting/index.rst
     howto/index.rst
     faq/index.rst
     glossary.rst
diff --cc Doc/tools/sphinxext/indexcontent.html
index 778346ff38c6,7f8547020f1b..abe17f3d231e
--- a/Doc/tools/sphinxext/indexcontent.html
+++ b/Doc/tools/sphinxext/indexcontent.html
@@@ -20,12 -20,10 +20,10 @@@
           <span class="linkdescr">tutorial for C/C++ programmers</span></p>
        <p class="biglink"><a class="biglink" href="{{ pathto("c-api/index") }}">Python/C API</a><br/>
           <span class="linkdescr">reference for C/C++ programmers</span></p>
 -      <p class="biglink"><a class="biglink" href="{{ pathto("install/index") }}">Installing Python Modules</a><br/>
 -         <span class="linkdescr">information for installers &amp; sys-admins</span></p>
 -      <p class="biglink"><a class="biglink" href="{{ pathto("distutils/index") }}">Distributing Python Modules</a><br/>
 -         <span class="linkdescr">sharing modules with others</span></p>
 +      <p class="biglink"><a class="biglink" href="{{ pathto("install/index") }}">Installing Python Projects</a><br/>
 +         <span class="linkdescr">finding and installing modules and applications</span></p>
 +      <p class="biglink"><a class="biglink" href="{{ pathto("packaging/index") }}">Distributing Python Projects</a><br/>
 +         <span class="linkdescr">packaging and distributing modules and applications</span></p>
-       <p class="biglink"><a class="biglink" href="{{ pathto("documenting/index") }}">Documenting Python</a><br/>
-          <span class="linkdescr">guide for documentation authors</span></p>
        <p class="biglink"><a class="biglink" href="{{ pathto("faq/index") }}">FAQs</a><br/>
           <span class="linkdescr">frequently asked questions (with answers!)</span></p>
      </td></tr>