[Python-checkins] peps (merge default -> default): merge

[georg.brandl]

http://hg.python.org/peps/rev/cbdbff7cf367
changeset:   5113:cbdbff7cf367
parent:      5111:9f8656f36392
parent:      5112:29ea1675720c
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 14 07:08:32 2013 +0200
summary:
  merge

files:
  pep-0101.txt |  28 ++++++++++++++++------------
  1 files changed, 16 insertions(+), 12 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -406,13 +406,13 @@
           directory, You'll move everything in there when the final release
           comes out.
 
-      ___ Move the release .tgz, tar.bz2, and .msi files into place, as well
-          as the .asc GPG signature files.
+      ___ Move the release .tgz, tar.bz2, .tar.xz, .dmg and .msi files into
+          place, as well as the .asc GPG signature files.
 
           Make sure they are world readable.  They should also be group
           writable, and group-owned by webmaster.
 
-      ___ md5sum the files and make sure they got uploaded intact.
+      ___ Use `gpg --verify` to make sure they got uploaded intact.
 
       ___ If this is a final release: Move the doc zips and tarballs to
           /data/ftp.python.org/pub/python/doc/X.Y.Z creating the directory
@@ -426,6 +426,9 @@
           If it is a release of a security-fix-only version, tell the DE to
           build a version with the "version switcher" and put it there.
 
+      ___ For branches out of maintenance: adapt the symlink in
+          /docs.python.org/release/X.Y to point to the recent version.
+
       ___ Let the DE check if the docs are built and work all right.
 
       ___ If this is a major release: Tell the DE to adapt redirects for
@@ -456,9 +459,8 @@
   permissions.  It's insane for you not to have it.
 
   I'm not going to go into the details of building the site or pushing it
-  live.  Plenty of people on pydotorg can help you, and there's a good README
-  once you get the branch.  All the directories below are named relative to
-  the data subdirectory unless otherwise noted.
+  live.  All the directories below are named relative to the data subdirectory
+  unless otherwise noted.
 
   This page will probably come in handy:
 
@@ -492,8 +494,8 @@
 
       ___ update the download page, editing `download/content.ht`
 
-      ___ edit the previous release's last release content.ht page to point to
-          the new release.
+      ___ for X.Y.Z, edit all the previous X.Y releases' content.ht page to
+          point to the new release.
 
       ___ update `doc/content.ht` to indicate the new current documentation
           version, and remove the current version from any 'in development'
@@ -501,7 +503,7 @@
 
       ___ Add the new version to `doc/versions/content.ht`.
 
-  ___ Edit download/releases/content.ht to update the version numbers for
+  ___ Edit `download/releases/content.ht` to update the version numbers for
       this release.  There are a bunch of places you need to touch:
 
       ___ The subdirectory name as the first element in the Nav rows.
@@ -510,14 +512,16 @@
 
   ___ Update the version specific pages.
 
-      ___ cd to download/releases/X.Y.Z
+      ___ cd to `download/releases/X.Y.Z`
       ___ Edit the version numbers in content.ht
       ___ Comment out the link to the CHM file if this is not a final,
           remove the comment if it is.
       ___ Update the md5 checksums
 
-      Note, you don't have to copy the actual .tgz or tar.bz2 tarballs into
-      this directory because they only live on dinsdale in the ftp directory.
+      ___ Update the license in `download/releases/X.Y.Z/license`
+
+      Note, you don't have to copy any release files into this directory;
+      they only live on dinsdale in the ftp directory.
 
   ___ When everything looks good, `svn commit` in the data directory.  This
       will trigger the live site to update itself, and at that point the

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