improved WWW page generation (still somewhat experimental);
authorwenzelm
Mon, 11 Sep 2000 17:41:34 +0200
changeset 9920 9734f2717203
parent 9919 3cf12ab0b8ac
child 9921 7acefd99e748
improved WWW page generation (still somewhat experimental);
Admin/filesizes
Admin/makedist
Admin/page/Makefile
Admin/page/bin/genpage
Admin/page/common/functions.pl
Admin/page/dist-content/binary.content
Admin/page/dist-content/docs.content
Admin/page/dist-content/index.content
Admin/page/dist-content/past.content
Admin/page/dist-content/source.content
Admin/page/dist-layout/navigation.html
Admin/page/main-content/docs.content
Admin/page/main-content/index.content
Admin/page/main-layout/navigation.html
--- a/Admin/filesizes	Mon Sep 11 17:40:41 2000 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# filesizes -- calculate and substitute file sizes in isabelle web pages
-#
-# needs:
-# working directory in dist, rpms + webpages generated and copied to dist
-# $DISTNAME
-# 
-# substitutes:
-# -norpm:
-# {PACKED_SIZE} {PACKED_SIZE_PDF} {UNPACKED_SIZE}
-# -rpm:
-# {RPM_SML_SIZE} {RPM_BASE_SIZE} {RPM_HOL_SIZE} {RPM_REAL_SIZE}
-# {RPM_ZF_SIZE} {RPM_DOCS_SIZE}
-
-
-PRG=$(basename $0)
-
-function usage()
-{
-  echo
-  echo "Usage: $PRG [-rpm|-norpm]"
-  echo
-  echo "fill in file sizes and distname in isabelle dist web pages"
-  echo
-  echo "  Options are:"
-  echo "    -rpm     only fill in rpm sizes"
-  echo "    -norpm   only fille in other sizes"
-  echo "  (do both by default)" 
-  echo 
-  echo "needs \$DISTNAME environment variable"
-  echo "expects to be startet in isabelle dist dir"
-  echo
-  exit 1
-}
-
-function fail()
-{
-  echo "$1" >&2
-  exit 2
-}
-
-# check options
-
-if [ $# -ge 2 ]; then
-  usage
-fi
-
-if [ $# -eq 1 -a "$1" != "-rpm" -a "$1" != "-norpm" ]; then
-  usage
-fi
-
-
-# begin work
-
-if [ $# -eq 0 -o "$1" = "-norpm" ]; then
-
-  # check for $DISTNAME
-  if [ "$DISTNAME" = "" ]; then    
-    echo "Error: \$DISTNAME not set"
-    usage
-  fi
-
-  PACKED_SIZE=$[ $(wc -c < $DISTNAME.tar.gz) / 1024 ]
-  PACKED_SIZE_PDF=$[ $(wc -c < ${DISTNAME}_pdf.tar.gz) / 1024 ]
-
-  UNPACKED_SIZE=$[ $(cat $DISTNAME.tar.gz ${DISTNAME}_pdf.tar.gz | gunzip | wc -c) / 1024 ]
-
-  perl -pi -e \
-   "s/{UNPACKED_SIZE}/$UNPACKED_SIZE/g; \ 
-    s/{PACKED_SIZE}/$PACKED_SIZE/g; \
-    s/{PACKED_SIZE_PDF}/$PACKED_SIZE_PDF/g;" \
-      *.html
-fi
-
-if [ $# -eq 0 -o "$1" = "-rpm" ]; then
-  RPM_SML_SIZE=$[ $(wc -c < rpm/polyml-3X-1.i386.rpm) / 1024 ]
-  RPM_BASE_SIZE=$[ $(wc -c < rpm/isabelle.rpm) / 1024 ]
-  RPM_HOL_SIZE=$[ $(wc -c < rpm/isabelle-HOL.i386.rpm) / 1024 ]
-  RPM_REAL_SIZE=$[ $(wc -c < rpm/isabelle-HOL-Real.i386.rpm) / 1024 ]
-  RPM_ZF_SIZE=$[ $(wc -c < rpm/isabelle-ZF.i386.rpm) / 1024 ]
-  RPM_DOCS_SIZE=$[ $(wc -c < rpm/isabelle-pdfdocs.rpm) / 1024 ]
-
-  perl -pi -e \
-   "s/{RPM_SML_SIZE}/$RPM_SML_SIZE/g; \
-    s/{RPM_BASE_SIZE}/$RPM_BASE_SIZE/g; \
-    s/{RPM_HOL_SIZE}/$RPM_HOL_SIZE/g; \
-    s/{RPM_REAL_SIZE}/$RPM_REAL_SIZE/g; \
-    s/{RPM_ZF_SIZE}/$RPM_ZF_SIZE/g; \
-    s/{RPM_DOCS_SIZE}/$RPM_DOCS_SIZE/g;" \
-      *.html
-fi
--- a/Admin/makedist	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/makedist	Mon Sep 11 17:41:34 2000 +0200
@@ -14,6 +14,12 @@
 
 umask 022
 
+TAR=tar
+type -path gtar >/dev/null && TAR=gtar
+
+FIND=find
+type -path gfind >/dev/null && FIND=gfind
+
 
 ## diagnostics
 
@@ -110,10 +116,10 @@
 cd "$DISTBASE"
 
 $EXPORT
-find . -name CVS -print | xargs rm -rf
-find . "(" -type d -a -empty ")" -print | xargs rm -f
-find . "(" -type d -a -empty ")" -print | xargs rm -f
-find . "(" -type d -a -empty ")" -print | xargs rm -f
+$FIND . -name CVS -print | xargs rm -rf
+$FIND . "(" -type d -a -empty ")" -print | xargs rm -rf
+$FIND . "(" -type d -a -empty ")" -print | xargs rm -rf
+$FIND . "(" -type d -a -empty ")" -print | xargs rm -rf
 
 
 # build docs
@@ -128,24 +134,27 @@
 for DOC in $(cat Contents)
 do
   cd "$DOC"
-  make dvi
-  [ -n "$PDFLATEX" ] && make clean pdf
+  #FIXME make dvi
+  #FIXME [ -n "$PDFLATEX" ] && make clean pdf
   cd ..
 done
 
 
-# make WWW pages
+# prepare dist dir for release
 
-#FIXME
-#export DISTNAME
-#( cd "$DISTBASE/$DISTNAME/Admin/page"; make clean; make dist; cd dist; cp * "$DISTBASE"; )
-
-
-# prepare dist dir for release
+echo "###"
+echo "### Preparing distribution ..."
+echo "###"
 
 cd "$DISTBASE/$DISTNAME"
 
-MOVE=$(find Doc \( -type f -a \( -name \*.dvi -o -name \*.eps -o -name \*.ps -o -name \*.pdf \) -a -print \) | grep -v 'gfx/.*pdf')
+cp -R Admin/page ../page
+cp Distribution/Doc/Contents ../page/Contents
+cp Distribution/lib/logo/isabelle.gif ../page/main-content
+cp Distribution/lib/logo/isabelle.gif ../page/dist-content
+echo "$DISTNAME" > ../page/DISTNAME
+
+MOVE=$($FIND Doc \( -type f -a \( -name \*.dvi -o -name \*.eps -o -name \*.ps -o -name \*.pdf \) -a -print \) | grep -v 'gfx/.*pdf')
 mv -f $MOVE Distribution/doc
 rm Distribution/doc/Isa-logics.eps
 rm -rf Doc Tools
@@ -194,9 +203,6 @@
 chmod -R u+w "$DISTNAME"
 chmod -R g=o "$DISTNAME"
 
-TAR=tar
-type -path gtar >/dev/null && TAR=gtar
-
 mkdir -p "pdf/$DISTNAME/doc"
 mv "$DISTNAME/doc/"*.pdf "pdf/$DISTNAME/doc"
 
@@ -215,7 +221,6 @@
 mv "$DISTNAME" "${DISTNAME}-old"
 mkdir "$DISTNAME"
 
-mv "${DISTNAME}-old/lib/logo/isabelle.gif" .
 mv "${DISTNAME}-old/README.html" "${DISTNAME}-old/INSTALL" "$DISTNAME"
 mkdir "$DISTNAME/doc"
 mv "${DISTNAME}-old/doc/"*.pdf "${DISTNAME}-old/doc/Contents" "$DISTNAME/doc"
@@ -225,14 +230,8 @@
 rm -rf "${DISTNAME}-old"
 
 
-# prepare web pages
-
-#FIXME
-#$THIS/filesizes -norpm
-
-
 # final note
 
 echo "###"
-echo "### Finished. You will find the distribution in $DISTBASE."
+echo "### Finished."
 echo "###"
--- a/Admin/page/Makefile	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/Makefile	Mon Sep 11 17:41:34 2000 +0200
@@ -1,12 +1,10 @@
-# --- uses $DISTNAME environment variable 
-
 # -- makefile for Isabelle web pages (dist and main)
 # -- $Id$
 
-# --- perl scripts used in this makefile
+# --- external tools
 
-GENPAGE   = bin/genpage
-MKCONTENT = bin/mkcontents
+GENPAGE   = ./bin/genpage
+MKCONTENT = ./bin/mkcontents
 
 # ---
 # --- genpage stuff 
@@ -30,11 +28,7 @@
 # --- doc content generation
 
 # --- location of the Contents file of the Isabelle documentation
-DOC_CONTENT_FILE = ../../Distribution/doc/Contents
-
-# --- url prefixes for documentation links in main and dist dirs
-DIST_DOCU_PREFIX = $(DISTNAME)/doc/
-MAIN_DOCU_PREFIX = dist/$(DISTNAME)/doc/
+DOC_CONTENT_FILE = Contents
 
 # --- target include files with documentation links
 DOC_CONTENTS_MAIN = docu-contents.main
@@ -43,28 +37,24 @@
 # ---
 # --- begin rules
 
-all: clean gen
-
-gen: main dist
-
-main: check
-	$(MKCONTENT) -p $(MAIN_DOCU_PREFIX) Contents $(DOC_CONTENTS_MAIN)
-	$(GENPAGE) -t $(MAIN_LAYOUT)/$(TEMPLATE_NAME) -c $(MAIN_CONTENT) -o $(MAIN_TARGET)
+all: clean main dist
+	@echo "###"
+	@echo "### Finished.  See main/ and dist/ for the resulting pages."
+	@echo "###"
 
-	cd $(MAIN_TARGET); perl -pi -e "s/{ISABELLE}/$(DISTNAME)/g;" *.html
+main:
+	@$(MKCONTENT) -p dist/`cat DISTNAME`/doc/ $(DOC_CONTENT_FILE) $(DOC_CONTENTS_MAIN)
+	@env DISTNAME=`cat DISTNAME` \
+	  $(GENPAGE) -t $(MAIN_LAYOUT)/$(TEMPLATE_NAME) -c $(MAIN_CONTENT) -o $(MAIN_TARGET)
 
-dist: check
-	$(MKCONTENT) -p $(DIST_DOCU_PREFIX) $(DOC_CONTENT_FILE) $(DOC_CONTENTS_DIST)
-	$(GENPAGE) -t $(DIST_LAYOUT)/$(TEMPLATE_NAME) -c $(DIST_CONTENT) -o $(DIST_TARGET)
-
-	cd $(DIST_TARGET); perl -pi -e "s/{ISABELLE}/$(DISTNAME)/g;" *.html
+dist:
+	@$(MKCONTENT) -p `cat DISTNAME`/doc/ $(DOC_CONTENT_FILE) $(DOC_CONTENTS_DIST)
+	@env DISTNAME=`cat DISTNAME` \
+	  $(GENPAGE) -t $(DIST_LAYOUT)/$(TEMPLATE_NAME) -c $(DIST_CONTENT) -o $(DIST_TARGET)
 
 clean: 
-	rm -rf $(MAIN_TARGET)
-	rm -rf $(DIST_TARGET)
-	rm -rf $(DOC_CONTENTS_MAIN)
-	rm -rf $(DOC_CONTENTS_DIST)
-	rm -f `find . -name "*~" -type f`
-
-check:
-	@if [ "$(DISTNAME)" = "" ]; then echo "Error: \$$DISTNAME not set."; exit 1; fi
+	@rm -rf $(MAIN_TARGET)
+	@rm -rf $(DIST_TARGET)
+	@rm -rf $(DOC_CONTENTS_MAIN)
+	@rm -rf $(DOC_CONTENTS_DIST)
+	@find . -name "*~" -type f -print | xargs rm -f
--- a/Admin/page/bin/genpage	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/bin/genpage	Mon Sep 11 17:41:34 2000 +0200
@@ -1,7 +1,4 @@
-#!/bin/sh
-exec perl -x. $0 ${1+"$@"} 
-#
-#!perl -w
+#!/usr/bin/perl -w
 
 # Genpage - Webpage Generator.
 #
--- a/Admin/page/common/functions.pl	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/common/functions.pl	Mon Sep 11 17:41:34 2000 +0200
@@ -1,9 +1,12 @@
 <!-- _GP_
 # undef all the functions we're defining. This stops lots of
-# complaining about re-defining the sub for each content file thats
+# complaining about re-defining the sub for each content file that's
 # processed.
 
        if (defined(&me)) { undef &me; }
+       if (defined(&distname)) { undef &distname; }
+       if (defined(&href)) { undef &href; }
+       if (defined(&twodig)) { undef &twodig; }
        if (defined(&when)) { undef &when; }
        if (defined(&size)) { undef &size; }
        if (defined(&page)) { undef &page; }
@@ -17,6 +20,14 @@
 
 <!--  _GP_ 
 
+    sub distname {
+      return $ENV{"DISTNAME"};
+    }
+
+    sub href {
+	return "<a href=\"" . $_[0] . "\">" . $_[1] . "</a>";
+    }
+
     sub twodig {
       if ($_[0] < 10) {
         return "0$_[0]";
@@ -85,9 +96,9 @@
     sub size {
       my $filename = $_[0];
       my @s = stat $filename;
-      my $size = $s[7]/1024;
+      my $size = defined $s[7] ? $s[7]/1024 : 0;
 
-      return sprintf("%.1f",$size);
+      return sprintf("%.1f", $size);
     }
 
     sub setdowncolor {
@@ -95,17 +106,15 @@
       return "";
     }
 
-   # download(description, url, size)
+   # download(description, url, prefix)
     sub download {
 
       my $descr = $_[0];
       my $url   = $_[1];
-      my $size  = $_[2];
+      my $prefix  = $_[2];
 
-      if ($size eq "") {
-	$size = size($url);
-	$size = "$size K";
-      }
+      my $size = size("$prefix/$url");
+      $size = "$size K";
 
       my $filename = $path;
 
--- a/Admin/page/dist-content/binary.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-content/binary.content	Mon Sep 11 17:41:34 2000 +0200
@@ -2,36 +2,83 @@
 Isabelle Binary Distribution
 
 %body%
-The binary distribution of {ISABELLE} for rpm-based Linux/x86 systems:
+
+<h2>(1) Linux/x86 systems with RPM</h2>
+
+This is the binary distribution of <!-- _GP_ distname --> for
+Linux/x86 systems.  It requires RPM based package management (as used
+by most Linux distributions), and <em>root</em> user access to
+install.
 
 <p>
 
 <!-- _GP_ setdowncolor("#E0E0E0") -->
 <center>
 <table border="0" cellspacing="5" cellpadding="4" width="520">
-
-  <!-- _GP_ download("ML system", "rpm/smlnj-110.0-3.i386.rpm", "{RPM_SML_SIZE} K") -->
-  <!-- _GP_ download("Isabelle system", "rpm/isabelle.rpm", "{RPM_BASE_SIZE} K") -->
-  <!-- _GP_ download("Isabelle/HOL image", "rpm/isabelle-HOL.i386.rpm", "{RPM_HOL_SIZE} K") -->
-  <!-- _GP_ download("Isabelle/HOL-Real image (optional)", "rpm/isabelle-HOL-Real.i386.rpm", "{RPM_REAL_SIZE} K") -->
-  <!-- _GP_ download("Isabelle/ZF image (optional)", "rpm/isabelle-ZF.i386.rpm", "{RPM_ZF_SIZE} K") -->
-  <!-- _GP_ download("Isabelle pdf documentation (optional)", "rpm/isabelle-pdfdocs.rpm", "{RPM_DOCS_SIZE} K") -->
-
+  <!-- _GP_ download("Poly/ML system", "contrib/polyml.i386.rpm", "../..") -->
+  <!-- _GP_ download("Isabelle main system", "isabelle.rpm", "../..") -->
+  <!-- _GP_ download("Isabelle/HOL image", "isabelle-HOL.i386.rpm", "../..") -->
+  <!-- _GP_ download("Isabelle/HOL-Real image (optional)", "isabelle-HOL-Real.i386.rpm", "../..") -->
+  <!-- _GP_ download("Isabelle/ZF image (optional)", "isabelle-ZF.i386.rpm", "../..") -->
+  <!-- _GP_ download("Isabelle pdf documentation (optional)", "isabelle-pdfdocs.rpm", "../..") -->
+  <!-- _GP_ download("Proof General system (recommended)", "contrib/proofgeneral.rpm", "../..") -->
+  <!-- _GP_ download("X-Symbol package (recommended)", "contrib/xsymbol.rpm", "../..") -->
 </table>
-
 </center>
 
 <p>
 
-Example installation procedure:
+Example installation in <tt>/usr/share</tt> (the default location).
 
 <pre>
-rpm -i smlnj-110.0-3.i386.rpm 
-rpm -i --prefix /usr/share isabelle.rpm             
-rpm -i --prefix /usr/share isabelle-HOL.i386.rpm    
+rpm -i --prefix /usr/share polyml.i386.rpm
+rpm -i --prefix /usr/share isabelle.rpm
+rpm -i --prefix /usr/share isabelle-HOL.i386.rpm
+rpm -i --prefix /usr/share proofgeneral.rpm               #requires XEmacs-21
+rpm -i --prefix /usr/share xsymbol.rpm                    #requires XEmacs-21
 </pre>
 
 <p>
 
-Use the mailing list <a href="mailto:isabelle-users@cl.cam.ac.uk">isabelle-users@cl.cam.ac.uk</a>
-to discuss problems and results.  (Why not <A HREF="mailto:lcp@cl.cam.ac.uk">subscribe</A>?)
+
+<h2>(2) Generic Linux/x86 or Solaris/Sparc systems</h2>
+
+The following distribution of <!-- _GP_ distname --> works for any
+Linux/x86 or Solaris/Sparc system -- only Poly/ML is platform
+dependent.  Installation does not rely on package management; it may
+be performed by non-root users as well.
+
+<p>
+
+<!-- _GP_ setdowncolor("#E0E0E0") -->
+<center>
+<table border="0" cellspacing="5" cellpadding="4" width="520">
+  <!-- _GP_ download("Poly/ML base system", "contrib/polyml.tar.gz", "../..") -->
+  <!-- _GP_ download("Poly/ML module for Linux/x86", "contrib/polyml_x86-linux.tar.gz", "../..") -->
+  <!-- _GP_ download("Poly/ML module for Solaris/Sparc", "contrib/polyml_sparc-solaris.tar.gz", "../..") -->
+  <!-- _GP_ download("Isabelle main system", distname . ".tar.gz", "../..") -->
+  <!-- _GP_ download("Isabelle pdf documentation (optional)", distname . "_pdf.tar.gz", "../..") -->  <!-- _GP_ download("Proof General system (recommended)", "contrib/proofgeneral.tar.gz", "../..") -->
+  <!-- _GP_ download("X-Symbol package (recommended)", "contrib/xsymbol.tar.gz", "../..") -->
+</table>
+</center>
+
+<p>
+
+Example installation in <tt>/usr/share</tt> for Linux/x86.
+
+<pre>
+tar -C /usr/share -x -z -f polyml.tar.gz
+tar -C /usr/share -x -z -f polyml_x86-linux.tar.gz
+tar -C /usr/share -x -z -f <!-- _GP_ distname . ".tar.gz"-->
+tar -C /usr/share -x -z -f proofgeneral.tar.gz            #requires XEmacs-21
+tar -C /usr/share -x -z -f xsymbol.tar.gz                 #requires XEmacs-21
+
+cd <!-- _GP_ "/usr/share/" . distname -->
+./configure
+./build
+./bin/isatool install -p /usr/bin
+</pre>
+
+<p>
+
+<p>
--- a/Admin/page/dist-content/docs.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-content/docs.content	Mon Sep 11 17:41:34 2000 +0200
@@ -6,4 +6,5 @@
 
 <!-- _GP_ include("$pwd/docu-contents.dist") -->
 
-All this documentation is also part of the Isabelle <a href="source.html">distribution</a>.
+All this documentation is also part of the Isabelle <a
+href="source.html">distribution</a> (both as dvi and pdf).
--- a/Admin/page/dist-content/index.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-content/index.content	Mon Sep 11 17:41:34 2000 +0200
@@ -21,5 +21,3 @@
 <li> <a href="ftp://rodin.stanford.edu/pub/smlnj/isabelle/source.html">Stanford (USA)</a> <br>&nbsp;</li>
 
 </ul>
-
-
--- a/Admin/page/dist-content/past.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-content/past.content	Mon Sep 11 17:41:34 2000 +0200
@@ -4,9 +4,10 @@
 %body%
 <p> 
 
-The past releases of Isabelle from the Cambrige ftp archive:
+Past releases of Isabelle are available from the Cambrige ftp archive:
 
 <ul>
+<li> <a href="ftp://ftp.cl.cam.ac.uk/ml/Isabelle99.tar.gz">Isabelle99</a> </li>
 <li> <a href="ftp://ftp.cl.cam.ac.uk/ml/Isabelle98-1.tar.gz">Isabelle98-1</a> </li>
 <li> <a href="ftp://ftp.cl.cam.ac.uk/ml/Isabelle98.tar.gz">Isabelle98</a> </li>
 <li> <a href="ftp://ftp.cl.cam.ac.uk/ml/Isabelle94-8.tar.gz">Isabelle94-8</a> </li>
--- a/Admin/page/dist-content/source.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-content/source.content	Mon Sep 11 17:41:34 2000 +0200
@@ -2,7 +2,7 @@
 Isabelle Source Distribution
 
 %body%
-The standard source distribution of Isabelle:
+This is the complete source distribution of <!-- _GP_ distname -->.
 
 <p>
 
@@ -11,20 +11,21 @@
 <center>
 <table border="0" cellspacing="5" cellpadding="4" width="500">
 
-  <!-- _GP_ download("Isabelle sources with dvi documentation", "{ISABELLE}.tar.gz", "{PACKED_SIZE} K") -->
-  <!-- _GP_ download("Documentation as pdf files", "{ISABELLE}_pdf.tar.gz", "{PACKED_SIZE_PDF} K") -->
-  <!-- _GP_ download("Browse all files unpacked", "{ISABELLE}", "{UNPACKED_SIZE} K") -->
+  <!-- _GP_ download("Isabelle sources with dvi documentation", distname . ".tar.gz", "../..") -->
+  <!-- _GP_ download("Documentation as pdf files", distname . "_pdf.tar.gz", "../..") -->
 
 </table>
 </center>
 
 <p>
 
-Please see the Isabelle <a href="{ISABELLE}/README.html">README</a>
-and <a href="{ISABELLE}/INSTALL">INSTALL</a> files for more
-information.
+Please see the Isabelle <!-- _GP_ href(distname . "/README.html",
+"README") --> and <!-- _GP_ href(distname . "/INSTALL", "INSTALL") -->
+files for more information.
 
 <p>
 
-Use the mailing list <a href="mailto:isabelle-users@cl.cam.ac.uk">isabelle-users@cl.cam.ac.uk</a>
-to discuss problems and results.  (Why not <A HREF="mailto:lcp@cl.cam.ac.uk">subscribe</A>?)
+Use the mailing list <a
+href="mailto:isabelle-users@cl.cam.ac.uk">isabelle-users@cl.cam.ac.uk</a>
+to discuss problems and results.  Why not <a
+href="mailto:lcp@cl.cam.ac.uk">subscribe</a>?
--- a/Admin/page/dist-layout/navigation.html	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/dist-layout/navigation.html	Mon Sep 11 17:41:34 2000 +0200
@@ -1,8 +1,7 @@
 <p>
 &nbsp;
 <center>
-<a href="index.html"><img src="{ISABELLE}/lib/logo/isabelle.gif" 
-width="100" height="86" alt="[Isabelle logo]" border="0"></a>
+<a href="index.html"><img src="isabelle.gif" width="100" height="86" alt="[Isabelle logo]" border="0"></a>
 </center>
 <p>
 <center>
--- a/Admin/page/main-content/docs.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/main-content/docs.content	Mon Sep 11 17:41:34 2000 +0200
@@ -5,4 +5,5 @@
 
 <!-- _GP_ include("$pwd/docu-contents.main") -->
 
-All this documentation is also part of the Isabelle <a href="dist/">distribution</a>.
+All this documentation is also part of the Isabelle <a
+href="dist/">distribution</a> (both as dvi and pdf).
--- a/Admin/page/main-content/index.content	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/main-content/index.content	Mon Sep 11 17:41:34 2000 +0200
@@ -43,7 +43,7 @@
   href="dist/source.html">sources</a>, <a
   href="dist/binary.html">binary packages</a>, and <a
   href="dist/docs.html">documentation</a>. 
-  The current version is <strong>{ISABELLE}</strong>.
+  The current version is <strong><!-- _GP_ distname --></strong>.
 
 <p>
 
--- a/Admin/page/main-layout/navigation.html	Mon Sep 11 17:40:41 2000 +0200
+++ b/Admin/page/main-layout/navigation.html	Mon Sep 11 17:41:34 2000 +0200
@@ -1,7 +1,7 @@
 <p>
 &nbsp;
 <center>
-<a href="index.html"><img src="dist/{ISABELLE}/lib/logo/isabelle.gif" width="100" height="86" alt="[Isabelle logo]" border="0"></a>
+<a href="index.html"><img src="isabelle.gif" width="100" height="86" alt="[Isabelle logo]" border="0"></a>
 </center>
 <p>
 &nbsp;