update URL to reflect new website

diff --git a/Doc/Makefile b/Doc/Makefile
index 0d391afcde1c6c33a507b234893d53f5c3b8c107..bc9c5c236fa9b944309b701d76203c376cac611e 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -108,7 +108,7 @@ MKISILOHTML=$(MKHOWTO) --html --about html/stdabout.dat \
                --iconserver ../icons \
                --l2h-init perl/isilo.perl --numeric --split 1 \
                --dvips-safe
-MKISILO=   iSilo386 -U -y -rCR -d0
+MKISILO=   iSiloXC -o isilo/settings.ixs
 MKPDF=    $(MKHOWTO) --paper=$(PAPER) --pdf
 MKPS=     $(MKHOWTO) --paper=$(PAPER) --ps
 
@@ -441,8 +441,7 @@ isilo:      isilo/python-api.pdb \
        isilo/python-whatsnew.pdb
 
 isilo/python-api.pdb: isilo/api/api.html isilo/api/api.css
-       $(MKISILO) "-iPython/C API Reference Manual" \
-               isilo/api/api.html $@
+       $(MKISILO) -x isilo/api.ixs isilo/api/api.html $@
 
 isilo/python-doc.pdb: isilo/doc/doc.html isilo/doc/doc.css
        $(MKISILO) "-iDocumenting Python" \
@@ -691,7 +690,7 @@ distlatex:  bziplatex ziplatex
 # The small amount of additional work is a small price to pay for not
 # having to remember which order to do it in. ;)
 paperdist:     distpdf distps pkglist
-edist:         disthtml distinfo zipisilo pkglist
+edist:         disthtml distinfo pkglist
 
 # The pkglist.html file is used as part of the download.html page on
 # python.org; it is not used as intermediate input here or as part of

diff --git a/Doc/python-docs.txt b/Doc/python-docs.txt
index 017feceddb5a4851eb77ce332b66cf8d741efe46..bf475b610a9f8c5fbf9cfc27f6da5c19ac0f8485 100644 (file)
--- a/Doc/python-docs.txt
+++ b/Doc/python-docs.txt
@@ -180,4 +180,4 @@ Answers to the Questions
       whether it's safe to remove, see the "Why is Python Installed on
       my Computer?" FAQ, found at:
 
-          http://www.python.org/doc/faq/installed.html
+          http://www.python.org/doc/faq/installed/