Update to push the docs to python.org instead of python.sf.net.
diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh
index 11a5f33..389f7bb 100755
--- a/Doc/tools/push-docs.sh
+++ b/Doc/tools/push-docs.sh
@@ -3,7 +3,10 @@
# Script to push docs from my development area to SourceForge, where the
# update-docs.sh script unpacks them into their final destination.
-TARGET=python.sourceforge.net:/home/users/f/fd/fdrake/tmp
+TARGETHOST=www.python.org
+TARGETDIR=/usr/home/fdrake/tmp
+
+TARGET="$TARGETHOST:$TARGETDIR"
ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org'
@@ -68,7 +71,7 @@
RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'`
PACKAGE="html-$RELEASE.tar.bz2"
scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
-ssh python.sourceforge.net tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
+ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
if $ANNOUNCE ; then
sendmail $ADDRESSES <<EOF
@@ -78,7 +81,7 @@
The $DOCLABEL version of the documentation has been updated:
- http://python.sourceforge.net/$DOCTYPE-docs/
+ http://$TARGETHOST/dev/doc/$DOCTYPE/
$EXPLANATION
EOF
diff --git a/Doc/tools/update-docs.sh b/Doc/tools/update-docs.sh
index 5f4b03d..c68e875 100755
--- a/Doc/tools/update-docs.sh
+++ b/Doc/tools/update-docs.sh
@@ -1,9 +1,9 @@
#! /bin/sh
# Script which installs a development snapshot of the documentation
-# into the "Python @ SourceForge" website.
+# into the development website.
#
-# The push-docs.sh script pushes this to the SourceForge when needed
+# The push-docs.sh script pushes this to the server when needed
# and removes it when done.
if [ -z "$HOME" ] ; then
@@ -16,15 +16,15 @@
TMPDIR="$$-docs"
-cd /home/groups/p/py/python/htdocs || exit $?
+cd /ftp/ftp.python.org/pub/www.python.org/dev/doc/ || exit $?
mkdir $TMPDIR || exit $?
cd $TMPDIR || exit $?
(bzip2 -dc "$UPDATES" | tar xf -) || exit $?
cd .. || exit $?
-if [ -d $DOCTYPE-docs ] ; then
- mv $DOCTYPE-docs $DOCTYPE-temp
+if [ -d $DOCTYPE ] ; then
+ mv $DOCTYPE $DOCTYPE-temp
fi
-mv $TMPDIR $DOCTYPE-docs
+mv $TMPDIR $DOCTYPE
rm -rf $DOCTYPE-temp || exit $?
rm "$UPDATES" || exit $?