From 35326525393fcf1a672ba16e87f43ebf684bd13e Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Mon, 27 Aug 2007 04:07:47 +0000
Subject: [PATCH] misc improvements

svn: r7191
---
 collects/help/servlets/acknowledge.ss         |   8 +-
 collects/help/servlets/doc-anchor.ss          |   1 -
 collects/help/servlets/doc-content.ss         |   7 +-
 collects/help/servlets/doc-message.ss         |   1 -
 collects/help/servlets/home.ss                |  57 ++--
 collects/help/servlets/manual-section.ss      |  12 +-
 collects/help/servlets/manuals.ss             |   2 +-
 collects/help/servlets/missing-manual.ss      |  31 +--
 collects/help/servlets/private/external.ss    |  11 +-
 collects/help/servlets/private/headelts.ss    |   2 +-
 collects/help/servlets/private/html.ss        |   9 +-
 collects/help/servlets/private/read-doc.ss    |   8 +-
 collects/help/servlets/private/search-util.ss |   2 -
 .../help/servlets/private/split-screen.ss     | 189 +++++++------
 collects/help/servlets/private/url.ss         |  28 +-
 collects/help/servlets/releaseinfo.ss         |  16 +-
 collects/help/servlets/resources.ss           |  27 +-
 collects/help/servlets/scheme/doc.ss          |   2 +-
 collects/help/servlets/scheme/langlevels.ss   |   2 +-
 collects/help/servlets/scheme/misc.ss         |   2 +-
 collects/help/servlets/scheme/misc/activex.ss |  27 +-
 collects/help/servlets/scheme/misc/batch.ss   |  46 ++--
 collects/help/servlets/scheme/misc/cgi.ss     | 260 +++++++++---------
 .../help/servlets/scheme/misc/database.ss     |  32 ++-
 .../help/servlets/scheme/misc/graphics.ss     |  24 +-
 collects/help/servlets/scheme/what.ss         |   2 +-
 collects/help/servlets/static.ss              |   6 +-
 collects/help/servlets/teachpacks.ss          |   2 +-
 28 files changed, 420 insertions(+), 396 deletions(-)

diff --git a/collects/help/servlets/acknowledge.ss b/collects/help/servlets/acknowledge.ss
index a673825a1c..b852895052 100644
--- a/collects/help/servlets/acknowledge.ss
+++ b/collects/help/servlets/acknowledge.ss
@@ -9,11 +9,9 @@
     (with-errors-to-browser
      send/finish
      (lambda ()
-       (html-page 
+       (html-page
         #:title  "Acknowledgements"
         #:bodies `((a ([name "acknowledgements"] [value "acknowledgements"]))
                    (h1  "Acknowledgements")
-                   (p)
-                   ,(get-general-acks)
-                   (p)
-                   ,(get-translating-acks)))))))
+                   (p ,(get-general-acks))
+                   (p ,(get-translating-acks))))))))
diff --git a/collects/help/servlets/doc-anchor.ss b/collects/help/servlets/doc-anchor.ss
index bd4766c84b..85ef5a45d3 100644
--- a/collects/help/servlets/doc-anchor.ss
+++ b/collects/help/servlets/doc-anchor.ss
@@ -16,4 +16,3 @@
                    (extract-binding/single 'caption bindings)
                    (extract-binding/single 'name bindings)
                    offset))))))
-
diff --git a/collects/help/servlets/doc-content.ss b/collects/help/servlets/doc-content.ss
index 1eb5cb685b..5031794450 100644
--- a/collects/help/servlets/doc-content.ss
+++ b/collects/help/servlets/doc-content.ss
@@ -15,8 +15,5 @@
               [offset (with-handlers ((void (lambda _ #f)))
                         (string->number
                          (extract-binding/single 'offset bindings)))])
-         `(html (head (title "PLT Help Desk")
-                      ,hd-css
-                      ,@hd-links)
-                ,(read-lines file caption offset)))))))
-  
\ No newline at end of file
+         `(html (head (title "PLT Help Desk") ,hd-css ,@hd-links)
+            ,(read-lines file caption offset)))))))
diff --git a/collects/help/servlets/doc-message.ss b/collects/help/servlets/doc-message.ss
index 5e492034a2..35ed774209 100644
--- a/collects/help/servlets/doc-message.ss
+++ b/collects/help/servlets/doc-message.ss
@@ -14,4 +14,3 @@
                 (body ,(format-collection-message
                         (extract-binding/single 'msg bindings))
                       (hr))))))))
-  
\ No newline at end of file
diff --git a/collects/help/servlets/home.ss b/collects/help/servlets/home.ss
index 25e23b4fe2..39db4fee46 100644
--- a/collects/help/servlets/home.ss
+++ b/collects/help/servlets/home.ss
@@ -56,8 +56,7 @@
                         " what is installed on this HelpDesk server only."))
                    '())
                (VERBATIM ,(find-manuals))
-               (p)
-               (i "Version: " ,(plt-version))))]
+               (p (i "Version: " ,(plt-version)))))]
            ["release"
             (let ([link-stuff (lambda (url txt)
                                 `(li (b (a ([href ,url]) ,txt))))])
@@ -77,8 +76,7 @@
                        ,(link-stuff url-helpdesk-known-bugs "Known Bugs")
                        ,(link-stuff url-helpdesk-patches "Downloadable Patches"))
                    (p "The PLT software is installed on this machine at" (br)
-                      (pre nbsp nbsp
-                           ,(path->string (find-collects-dir)))))))))]
+                      (pre nbsp nbsp ,(path->string (find-collects-dir)))))))))]
            [_
             (let-values ([(right-header right-items)
                           (page-tag->title+items subpage)])
@@ -91,8 +89,7 @@
                                "home"
                                right-header
                                (append (left-items)
-                                       `(((p)
-                                          (i "Version: " ,(plt-version))))))]
+                                       `(((p (i "Version: " ,(plt-version)))))))]
                 [else
                  (html-subpage "PLT Scheme Help Desk: Home"
                                (html-top initial-request)
@@ -173,13 +170,16 @@
     `(("acknowledge" "Acknowledgements"
        ((p ,(get-general-acks))
         (p ,(get-translating-acks))))
+      ;;
       ("books" "Books"
        ((h3 "HTDP - How to Design Programs")
-        (p (a ((href "http://www.htdp.org/"))
-              "'How to Design Programs - An Introduction to Programming and Computing'")
+        (p (a ([href "http://www.htdp.org/"])
+              "'How to Design Programs -"
+              " An Introduction to Programming and Computing'")
            (br)
            " by Matthias Felleisen, Robert Bruce Findler, Matthew Flatt, and Shriram Krishnamurthi")
-        (p (a ((href "http://www.ccs.neu.edu/home/matthias/htdp-plus.html")) "HTDP+")
+        (p (a ([href "http://www.ccs.neu.edu/home/matthias/htdp-plus.html"])
+              "HTDP+")
            (br)
            " Supplemental Materials for 'How to Design Programs'")
         (h3 "Teach Yourself Scheme in Fixnum Days")
@@ -187,15 +187,25 @@
               " Teach Yourself Scheme in Fixnum Days")
            (br)
            "- an introduction to Scheme by Dorai Sitaram")))
+      ;;
       ("drscheme" "DrScheme"
        ((p "DrScheme is PLT's flagship programming environment")
-        (ul (li (a ((href ,url-helpdesk-tour)) (b "Tour: ")    "An introduction to DrScheme"))
-            (li (a ((href ,url-helpdesk-interface-essentials)) "Quick-start jump into the user manual"))
-            (li (a ((href ,url-helpdesk-languages))            "Languages: ") "supported by DrScheme")
-            (li (a ((href ,url-helpdesk-drscheme-manual))    "PLT DrScheme: Programming Environment Manual")
-                (br) "The complete user manual")
-            (li (a ((href ,url-helpdesk-drscheme-faq)) "FAQ") ": DrScheme Frequently asked questions")
-            (li (a ((href ,url-helpdesk-why-drscheme))        "Why DrScheme?")))))
+        (ul (li (a ([href ,url-helpdesk-tour])
+                   (b "Tour: ") "An introduction to DrScheme"))
+            (li (a ([href ,url-helpdesk-interface-essentials])
+                   "Quick-start jump into the user manual"))
+            (li (a ([href ,url-helpdesk-languages])
+                   "Languages: ")
+                "supported by DrScheme")
+            (li (a ([href ,url-helpdesk-drscheme-manual])
+                   "PLT DrScheme: Programming Environment Manual")
+                (br)
+                "The complete user manual")
+            (li (a ([href ,url-helpdesk-drscheme-faq]) "FAQ")
+                ": DrScheme Frequently asked questions")
+            (li (a ([href ,url-helpdesk-why-drscheme])
+                   "Why DrScheme?")))))
+      ;;
       ("home" "Help Desk Home"
        ((p "The HelpDesk is a complete source of information about PLT software, "
            "including DrScheme, MzScheme and MrEd.")
@@ -211,11 +221,13 @@
         (ul (li "The " (b "Home")    " link will take you back to this page.")
             (li "The " (b "Manuals") " link displays a list of manuals and other documentation")
             #;(li "The " (b "Send a bug report") " link allows you to submit a bug report to PLT."))))
+      ;;
       ("known-bugs" "Known Bugs"
        ((p (a ([name "bugs"] [value "Bugs"]))
            "For an up-to-date list of bug reports, see the "
            (a ([href "http://bugs.plt-scheme.org/query/"] [target "_top"])
               "PLT bug report query page") ".")))
+      ;;
       ("languages" "Scheme Languages"
        ((p "DrScheme supports many dialects of Scheme. "
            "The following dialects are specifically designed for teaching "
@@ -255,6 +267,7 @@
         (p "DrScheme's set of languages can be extended, so the above list mentions only "
            "the languages installed by default. "
            "Documentation for all languages is available through the manuals page.")))
+      ;;
       ("libraries" "Libraries"
        ((h3 "Built-in Libraries")
         (p "PLT Scheme has a lot of libraries. The core libraries are described in "
@@ -263,6 +276,7 @@
         (h3 "User / PLaneT Libraries")
         (p (a ((href ,url-external-planet)) "PLaneT") " is the repository for user contributed libraries. "
            "Join the PLaneT announcement mailing list to get notified on new PLaneT packages.")))
+      ;;
       ("license" "License"
        ((a ([name "lic"] [value "License"]))
         (b "PLT Software") (br)
@@ -337,6 +351,7 @@
                  "Copyright (c) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.")
                 ("GNU Classpath"
                  "GNU Public License with special exception"))))))
+      ;;
       ("mailing-lists" "Mailing Lists"
        ((p "There are two mailing lists: the discussion list and the announcements only list.")
         (h3 "Archives")
@@ -349,6 +364,7 @@
            (a ((href ,url-external-mailing-list-subscription))
               "subscription page")
            " to join the mailing lists.")))
+      ;;
       ("patches" "Downloadable Patches"
        ((p (a ([name "patches"] [value "Downloadable patches"]))
            "The following Web page may contain downloadable patches to fix "
@@ -357,6 +373,7 @@
            ,(let ([url (format "http://download.plt-scheme.org/patches/~a/"
                                (version))])
               `(a ([href ,url] [target "_top"]) ,url)))))
+      ;;
       ("program-design" "Program Design"
        ((h3 "For Students")
         (p "The textbook " (a ((href "http://www.htdp.org")) "How to Design Programs")
@@ -368,6 +385,7 @@
            ": For programmers with lots of experience in other languages")
         (h3 "For Teachers and Researchers")
         (p (a ((href ,url-helpdesk-why-drscheme)) "PLT's vision"))))
+      ;;
       ("release-notes" (h1 "Release Notes for PLT Scheme version " ,(version))
        ((a ([name "relnotes"] [VALUE "Release notes"]))
         (p "Detailed release notes:"
@@ -395,6 +413,7 @@
                         ("MrEd release notes"         "mred"      "HISTORY")
                         ("Stepper release notes"      "stepper"   "HISTORY")
                         ("MrFlow release notes"       "mrflow"    "HISTORY")))))))))
+      ;;
       ("software" "Software"
        ((ul (li (a ((href ,url-helpdesk-drscheme)) "DrScheme") ": The programming environment")
             (li (a ((href ,url-helpdesk-languages)) "Languages") ": The family of languages "
@@ -404,11 +423,13 @@
             ;; (li (a ((href ,url-helpdesk-hints)) "Hints")
             ;;      ": How to do things in Scheme")
             )))
+      ;;
       ("teachpacks" "Teachpacks"
        ((ul (li (a ((href ,url-helpdesk-teachpacks-for-htdp))
                    "Teachpacks for 'How to Design Programs'"))
             (li (a ((href ,url-helpdesk-teachpacks-for-htdc))
                    "Teachpacks for 'How to Design Classes'")))))
+      ;;
       ("teachscheme" "Teach Scheme"
        ((h2  "TeachScheme! Workshops")
         (p (a ([name "workshops"] [value "TeachScheme! workshops"]))
@@ -428,10 +449,12 @@
            (a ([href "http://www.teach-scheme.org/Workshops/"]
                [TARGET "_top"])
               "TeachScheme! Workshops page") ".")))
+      ;;
       ("tour" "Tour of DrScheme"
-       ((p "Take a " (a ((href ,url-external-tour-of-drscheme)) "Tour of DrScheme")
+       ((p "Take a " (a ([href ,url-external-tour-of-drscheme]) "Tour of DrScheme")
            " and discover the wealth of features of the interactive, "
            "integrated programming environment.")))
+      ;;
       ("why-drscheme" "Why DrScheme?"
        ((p "Teaching introductory computing courses with Scheme, or any other "
            "functional programming language, facilitates many conceptual tasks "
diff --git a/collects/help/servlets/manual-section.ss b/collects/help/servlets/manual-section.ss
index 7ef8823c2a..3e3e784433 100644
--- a/collects/help/servlets/manual-section.ss
+++ b/collects/help/servlets/manual-section.ss
@@ -21,13 +21,11 @@
                                  (send/finish
                                   (html-page
                                    #:title "Can't find manual section"
-                                   #:bodies 
+                                   #:bodies
                                    `("Error looking up PLT manual section"
-                                     (p)
-                                     "Requested manual: "
-                                     ,manual (br)
-                                     "Requested section: "
-                                     ,section))))])
+                                     (p "Requested manual: "
+                                        ,manual (br)
+                                        "Requested section: "
+                                        ,section)))))])
                       (finddoc-page-anchor manual section))])
          (send/finish (redirect-to page)))))))
-  
\ No newline at end of file
diff --git a/collects/help/servlets/manuals.ss b/collects/help/servlets/manuals.ss
index 9008e5bbf6..651c8acdd4 100644
--- a/collects/help/servlets/manuals.ss
+++ b/collects/help/servlets/manuals.ss
@@ -8,4 +8,4 @@
     (with-errors-to-browser 
      send/finish
      (lambda ()
-       (list #"text/html" (find-manuals))))))
\ No newline at end of file
+       (list #"text/html" (find-manuals))))))
diff --git a/collects/help/servlets/missing-manual.ss b/collects/help/servlets/missing-manual.ss
index c78808e491..e90cbd28d5 100644
--- a/collects/help/servlets/missing-manual.ss
+++ b/collects/help/servlets/missing-manual.ss
@@ -23,21 +23,20 @@
        #:title "Missing PLT manual"
        #:bodies
        `(,(with-color "red" `(h1 "Documentation missing"))
-          (p)
-          "You tried to access documentation for "
-          ,(with-color "blue" `(b ,label)) ". "
-          "The documentation is not installed on this machine, probably"
-          " because it is not part of the standard DrScheme distribution."
-          (p)
-          (h2 "Install Locally")
-          (a ((href ,plt-url)) "Download and/or install")
-          " the documentation."
+          (p "You tried to access documentation for "
+             ,(with-color "blue" `(b ,label)) ". "
+             "The documentation is not installed on this machine, probably"
+             " because it is not part of the standard DrScheme distribution.")
           (br)
-          "After installing, "
-          (a ((href ,link)) "continue")
-          " to the originally requested page."
-          (br) nbsp (br)
+          (h2 "Install Locally")
+          (p (a ([href ,plt-url]) "Download and/or install")
+             " the documentation."
+             (br)
+             "After installing, "
+             (a ((href ,link)) "continue")
+             " to the originally requested page."
+             (br) nbsp (br))
           (h2 "Read Online")
-          "Read the documentation on "
-          (a ((href ,html-url)) "PLT's servers")
-          ".")))))
+          (p "Read the documentation on "
+             (a ((href ,html-url)) "PLT's servers")
+             "."))))))
diff --git a/collects/help/servlets/private/external.ss b/collects/help/servlets/private/external.ss
index 01e7ff7a02..d6c0b822bc 100644
--- a/collects/help/servlets/private/external.ss
+++ b/collects/help/servlets/private/external.ss
@@ -6,9 +6,8 @@
     (when (unbox external-box)
       (show 
        `(html (head ,hd-css ,@hd-links (title "Servlet unavailable"))
-              (body (h3 (font ([color "red"]) "Servlet unavailable"))
-                    (p)
-                    "Because the PLT Help Desk server is accepting external"
-                    " connections, the requested Help Desk servlet"
-                    (blockquote (tt ,url))
-                    "is not available."))))))
+          (body (h3 (font ([color "red"]) "Servlet unavailable"))
+                (p "Because the PLT Help Desk server is accepting external"
+                   " connections, the requested Help Desk servlet"
+                   (blockquote (tt ,url))
+                   "is not available.")))))))
diff --git a/collects/help/servlets/private/headelts.ss b/collects/help/servlets/private/headelts.ss
index 4c3d98cdb9..f44e4c141c 100644
--- a/collects/help/servlets/private/headelts.ss
+++ b/collects/help/servlets/private/headelts.ss
@@ -1,4 +1,4 @@
-; elements to go in HEAD part of HTML document
+;; elements to go in HEAD part of HTML document
 
 (module headelts mzscheme
   (require (lib "list.ss"))
diff --git a/collects/help/servlets/private/html.ss b/collects/help/servlets/private/html.ss
index e691de93b2..dc32255a85 100644
--- a/collects/help/servlets/private/html.ss
+++ b/collects/help/servlets/private/html.ss
@@ -35,13 +35,16 @@
         (meta ([http-equiv "Content-Type"] [content "text/html;charset=UTF-8"]))
         (meta ([name "generator"] [content "PLT Scheme"]))
         ;; TODO: Ask Eli what exactly to put here in the online version
-        ;; (script ((src "http://www.google-analytics.com/urchin.js") (type "text/javascript")))
-        ;; (script ((type "text/javascript")) "_uacct=\"UA-808258-1\";_udn=\"plt-scheme.org\";urchinTracker();")
+        ;; (script ([src "http://www.google-analytics.com/urchin.js"]
+        ;;          [type "text/javascript"]))
+        ;; (script ([type "text/javascript"])
+        ;;   "_uacct=\"UA-808258-1\";_udn=\"plt-scheme.org\";urchinTracker();")
         (head
          (title ,title)
          (style ([type "text/css"]) "\n" ,(css))
          ;; TODO: Check the icons work in online version
-         (link ([rel "icon"] [href "/help/servlets/plticon.ico"] [type "image/ico"]))
+         (link ([rel "icon"] [href "/help/servlets/plticon.ico"]
+                [type "image/ico"]))
          (link ([rel "shortcut icon"] [href "/help/servlets/plticon.ico"])))
         (body ,@top ,@bodies))))
 
diff --git a/collects/help/servlets/private/read-doc.ss b/collects/help/servlets/private/read-doc.ss
index f3c3b416a8..9fe289e09b 100644
--- a/collects/help/servlets/private/read-doc.ss
+++ b/collects/help/servlets/private/read-doc.ss
@@ -18,10 +18,10 @@
       (html-page
        #:title "PLT Help Desk"
        #:bodies (if msg
-                    `(,(format-collection-message msg)
-                       (hr)
-                       ,(read-lines file caption offset))
-                    `(,(read-lines file caption offset))))))
+                  `(,(format-collection-message msg)
+                    (hr)
+                    ,(read-lines file caption offset))
+                  `(,(read-lines file caption offset))))))
 
   (define read-doc
     (opt-lambda (file caption coll [offset #f])
diff --git a/collects/help/servlets/private/search-util.ss b/collects/help/servlets/private/search-util.ss
index b8df32e05c..816bd7ce14 100644
--- a/collects/help/servlets/private/search-util.ss
+++ b/collects/help/servlets/private/search-util.ss
@@ -23,5 +23,3 @@
     `(("index entries" html)
       ("keyword entries" text)
       ("text" text))))
-
-
diff --git a/collects/help/servlets/private/split-screen.ss b/collects/help/servlets/private/split-screen.ss
index 73ce93f498..f97f1063a2 100644
--- a/collects/help/servlets/private/split-screen.ss
+++ b/collects/help/servlets/private/split-screen.ss
@@ -4,124 +4,141 @@
            "html.ss"
            "url.ss"
            "../../private/options.ss")
-  
-  ; These items are common to all split screens
-  
+
+  ;; These items are common to all split screens
+
   (define left-header-items
-    `((VERBATIM (big (big (big (b (a ((href ,url-helpdesk-home)) "PLT Scheme Help Desk"))))))))
-  
+    `((VERBATIM (big (big (big (b (a ([href ,url-helpdesk-home])
+                                     "PLT Scheme Help Desk"))))))))
+
   (define left-footer-items
     (case (helpdesk-platform)
       [(internal-browser internal-browser-simple)
        '(nbsp)]
       [else
-       '(nbsp 
-         (VERBATIM (small (small (a ((href "http://www.plt-scheme.org/map.html")) "Site Map"))))
-         (VERBATIM (hr ((noshade "1") (size "2") (color "#3a652b"))))
-         (VERBATIM (nobr 
-                    (small ((class "sansa")) 
-                           (a ((href "http://www.plt-scheme.org/")) "PLT")
-                           nbsp "|" nbsp 
-                           (a ((href "http://www.plt-scheme.org/software/drscheme/")) "DrScheme")
-                           nbsp "|" nbsp 
-                           (a ((href "http://www.teach-scheme.org/")) "TeachScheme!")
-                           nbsp "|" nbsp 
-                           (a ((href "http://www.htdp.org/")) "HtDP") nbsp
-                           "|" nbsp 
-                           (a ((href "http://planet.plt-scheme.org/")) "PLaneT") 
-                           nbsp)))
-         ; Google Search for PLT Documentation
-         #;(VERBATIM (div ((align "center")) 
-                          (div ((style "display: inline; margin: 0; white-space: nowrap;")) 
-                               ; The Google "Search Documentation" field and button
-                               (form ((id "searchbox_010927490648632664335:4yu6uuqr9ia") 
-                                      (action "http://www.plt-scheme.org/search/")
-                                      (style "display: inline; margin: 0;")) 
-                                     (input ((type "hidden") (name "cx") (value "010927490648632664335:4yu6uuqr9ia")))
-                                     (input ((type "text") (name "q") (size "16") (style "font-size: 75%;")))
-                                     (input ((type "hidden") (name "hq") (value "more:plt")))
-                                     (input ((type "hidden") (name "cxq") (value "more:docs")))
-                                     (input ((type "submit") (name "sa") (value "Search Documentation") 
-                                                             (style "font-size: 75%;")))
-                                     (input ((type "hidden") (name "cof") (value "FORID:9")))))
-                          nbsp)))]))
-  
-  
-  ; the internal browser makes a "split" screen by having the left items at the top,
-  ; and the right items at the bottom
+       '(nbsp
+         (VERBATIM (small (small (a ([href "http://www.plt-scheme.org/map.html"])
+                                    "Site Map"))))
+         (VERBATIM (hr ([noshade "1"] [size "2"] [color "#3a652b"])))
+         (VERBATIM (nobr
+                    (small ([class "sansa"])
+                      (a ([href "http://www.plt-scheme.org/"]) "PLT")
+                      nbsp "|" nbsp
+                      (a ([href "http://www.plt-scheme.org/software/drscheme/"])
+                         "DrScheme")
+                      nbsp "|" nbsp
+                      (a ([href "http://www.teach-scheme.org/"]) "TeachScheme!")
+                      nbsp "|" nbsp
+                      (a ([href "http://www.htdp.org/"]) "HtDP") nbsp
+                      "|" nbsp
+                      (a ([href "http://planet.plt-scheme.org/"]) "PLaneT")
+                      nbsp)))
+         ;; Google Search for PLT Documentation
+         #;
+         (VERBATIM
+          (div ([align "center"])
+            (div ([style "display: inline; margin: 0; white-space: nowrap;"])
+              ;; The Google "Search Documentation" field and button
+                 (form ([id "searchbox_010927490648632664335:4yu6uuqr9ia"]
+                        [action "http://www.plt-scheme.org/search/"]
+                        [style "display: inline; margin: 0;"])
+                   (input ([type "hidden"] [name "cx"]
+                           [value "010927490648632664335:4yu6uuqr9ia"]))
+                   (input ([type "text"] [name "q"] [style "font-size: 75%;"]
+                           [size "16"]))
+                   (input ([type "hidden"] [name "hq"] [value "more:plt"]))
+                   (input ([type "hidden"] [name "cxq"] [value "more:docs"]))
+                   (input ([type "submit"] [name "sa"] [style "font-size: 75%;"]
+                           [value "Search Documentation"]))
+                   (input ([type "hidden"] [name "cof"] [value "FORID:9"]))))
+            nbsp))
+         )]))
+
+
+  ;; the internal browser makes a "split" screen by having the left
+  ;; items at the top, and the right items at the bottom
   (define (make-split-page/internal-browser title top-items left-items right-header right-items)
     (html-page
      #:title title
-     #:body `(div ,(html-left-items (append #;left-header-items 
-                                            left-items left-footer-items))
+     #:body `(div ,(html-left-items (append ;; left-header-items
+                                            left-items
+                                            left-footer-items))
                   (hr)
                   ,@(html-right-items right-items))))
-  
-  ; simple version that only shows the contents and no menu
-  (define (make-simple-page/internal-browser title top-items left-items right-header right-items)
-    (html-page 
+
+  ;; simple version that only shows the contents and no menu
+  (define (make-simple-page/internal-browser
+           title top-items left-items right-header right-items)
+    (html-page
      #:title title
      #:body (if (equal? left-items "home")
-                `(div (h1 "PLT Help Desk") ,(html-left-items right-items))
-                `(div (h1 ,right-header)  
-                      ,@(html-right-items right-items)))))
-  
-  ; an external is capable of displaying a proper split screen
+              `(div (h1 "PLT Help Desk") ,(html-left-items right-items))
+              `(div (h1 ,right-header)
+                 ,@(html-right-items right-items)))))
+
+  ;; an external is capable of displaying a proper split screen
   (define (make-split-page title top-items left-items right-header right-items)
     (html-page
      #:title title
-     #:bodies `(,@top-items ,(make-split-screen left-items right-header right-items))))
-  
-  
+     #:bodies `(,@top-items ,(make-split-screen left-items
+                                                right-header
+                                                right-items))))
+
+
   (define (make-split-screen left-items right-header right-items)
-    `(table ((height "80%") (width "100%") (align "center") (border "0") (cellspacing "0") (cellpadding "30"))
-            (tr ((valign "top")) 
-                (td ((height "80%") (width "50%") (align "center") (valign "top") (bgcolor "#74ca56")) 
-                    ; LEFT TABLE
-                    (table ((align "center") (class "sansa") (border "0") (cellpadding "0") (cellspacing "4")) 
-                           #;(tr (td ((align "center"))                                      
-                                     (img ((src "http://www.plt-scheme.org/plt-green.jpg") 
-                                           (width "133") (height "128") (alt "[icon]")))))
-                             ,(html-left-items (append left-header-items left-items left-footer-items)))
-                    (td ((height "100%") (width "50%") (align "left") (valign "top"))
-                        ; RIGHT TABLE
-                        (table ((width "80%") (class "sansa") (align "center") (border "0") 
-                                              (cellpadding "0") (cellspacing "0")) 
-                               (tr (td (h1 ,right-header)))
-                               ;(tr (td (small (small nbsp))))
-                               (tr (td (table ((border "0") (cellpadding "3") (cellspacing "0") (width "100%"))
-                                              ,@(html-right-items right-items))))))))))
-  
+    `(table ([height "80%"] [width "100%"] [align "center"] [border "0"]
+             [cellspacing "0"] [cellpadding "30"])
+       (tr ([valign "top"])
+         (td ([height "80%"] [width "50%"] [align "center"] [valign "top"]
+              [bgcolor "#74ca56"])
+           ;; LEFT TABLE
+           (table ([align "center"] [class "sansa"] [border "0"]
+                   [cellpadding "0"] [cellspacing "4"])
+             ;; (tr (td ([align "center"])
+             ;;       (img ([src "http://www.plt-scheme.org/plt-green.jpg"]
+             ;;             [width "133"] [height "128"] [alt "[icon]"]))))
+             ,(html-left-items
+               (append left-header-items left-items left-footer-items))))
+         (td ([height "100%"] [width "50%"] [align "left"] [valign "top"])
+           ;; RIGHT TABLE
+           (table ([width "80%"] [class "sansa"] [align "center"]
+                   [border "0"] [cellpadding "0"] [cellspacing "0"])
+             (tr (td (h1 ,right-header)))
+             ;; (tr (td (small (small nbsp))))
+             (tr (td (table ([border "0"] [width "100%"]
+                             [cellpadding "3"] [cellspacing "0"])
+                       ,@(html-right-items right-items)))))))))
+
   ;;;
   ;;; ITEM FORMATTING
   ;;; (ad hoc markup inherited)
-  
+
   (define (html-left-items items)
     `(tr (td (table ,@(mappend html-left-item items)))))
 
   (define (html-left-item item)
     (match item
-      ['UP                (list '(font ((size "-2")) nbsp))]
-      ['--                (list '(tr ((height "4")) (td ((colspan "2")))))]
-      [('VERBATIM sxml)   (list `(tr (td ((align "center")) ,sxml)))]
-      [(header)           (list `(tr (td  #;((colspan "2")) ,header)))]
-      [(header body ...)  (list `(tr (td  #;((colspan "2")) ,header))
-                                `(tr (td  ,@body)))]
-      [other              (list other)]))
-  
+      ['UP               (list '(font ((size "-2")) nbsp))]
+      ['--               (list '(tr ((height "4")) (td ((colspan "2")))))]
+      [('VERBATIM sxml)  (list `(tr (td ((align "center")) ,sxml)))]
+      [(header)          (list `(tr (td #;((colspan "2")) ,header)))]
+      [(header body ...) (list `(tr (td #;((colspan "2")) ,header))
+                               `(tr (td ,@body)))]
+      [other             (list other)]))
+
   (define (html-right-items items)
     (mappend html-right-item items))
-  
+
   (define (html-right-item item)
     (match item
-      ['--                      (list '(tr ((height "4")) (td ((colspan "2")))))]
-      [('VERBATIM item)         item]
-      [(body ...)               (list body)]))
-  
+      ['--              (list '(tr ((height "4")) (td ((colspan "2")))))]
+      [('VERBATIM item) item]
+      [(body ...)       (list body)]))
+
 
   (provide make-split-screen
            make-split-page
            make-split-page/internal-browser
            make-simple-page/internal-browser)
-  
+
 )
diff --git a/collects/help/servlets/private/url.ss b/collects/help/servlets/private/url.ss
index b46cf985af..856b6fad1f 100644
--- a/collects/help/servlets/private/url.ss
+++ b/collects/help/servlets/private/url.ss
@@ -1,31 +1,31 @@
 (module url mzscheme
   (require "../../private/internal-hp.ss")
-  
+
   (provide (all-defined))
-  
+
   (define url-helpdesk-root
     (format "http://~a:~a/servlets/" internal-host (internal-port)))
-  
+
   (define url-helpdesk-home    (string-append url-helpdesk-root "home.ss"))
   (define url-helpdesk-results (string-append url-helpdesk-root "results.ss"))
-  
+
   (define (url-home-subpage subpage-str)
     (string-append url-helpdesk-home "?subpage=" subpage-str))
-  
+
   (define (version-major)
     ; TODO: Fix this
     (cond [(regexp-match #px"^(\\d+).*$" (version))
            => cadr]
           [else "352"]))
-  
+
   (define (url-manual-on-doc-server manual)
-    (string-append
-     "http://download.plt-scheme.org/doc/"
-     (version-major) "/html/" manual "/"))
-  
+    (format "http://download.plt-scheme.org/doc/~a/html/~a/"
+            (version-major) manual))
+
   (define (url-static doc manual path)
-    (string-append url-helpdesk-root "static.ss/" doc "/" manual "/" path))
-  
+    (format "~astatic.ss/~a/~a/"
+            url-helpdesk-root doc manual path))
+
   (define url-external-announcement-list-archive     "http://list.cs.brown.edu/pipermail/plt-announce/")
   (define url-external-discussion-list-archive       "http://list.cs.brown.edu/pipermail/plt-scheme/")
   (define url-external-discussion-list-archive-old   "http://www.cs.utah.edu/plt/mailarch/")
@@ -33,11 +33,11 @@
   (define url-external-send-bug-report               "http://bugs.plt-scheme.org/")
   (define url-external-tour-of-drscheme              "http://www.plt-scheme.org/software/drscheme/tour/")
   (define url-external-planet                        "http://planet.plt-scheme.org/")
-  
+
   (define url-helpdesk-acknowledge          (url-home-subpage "acknowledge"))
   (define url-helpdesk-books                (url-home-subpage "books"))
   (define url-helpdesk-documentation        (url-home-subpage "documentation"))
-  (define url-helpdesk-drscheme             (url-home-subpage "drscheme")) 
+  (define url-helpdesk-drscheme             (url-home-subpage "drscheme"))
   (define url-helpdesk-drscheme-faq         (url-static "doc1" "drscheme" "drscheme-Z-H-5.html#node_chap_5"))
   (define url-helpdesk-drscheme-manual      (url-static "doc1" "drscheme" "index.htm"))
   (define url-helpdesk-faq                  (url-home-subpage "faq"))
diff --git a/collects/help/servlets/releaseinfo.ss b/collects/help/servlets/releaseinfo.ss
index f459d8f853..794849935e 100644
--- a/collects/help/servlets/releaseinfo.ss
+++ b/collects/help/servlets/releaseinfo.ss
@@ -1,7 +1,8 @@
 (module releaseinfo mzscheme
   (require "private/util.ss"
            "private/headelts.ss"
-           (lib "servlet.ss" "web-server"))
+           (lib "servlet.ss" "web-server")
+           (lib "dirs.ss" "setup"))
 
   (define (link-stuff url txt)
     `(li (b (a ([href ,url]) ,txt))))
@@ -17,18 +18,13 @@
       (head ,hd-css ,@hd-links (title "Release Information"))
       (body
        (h1 "Release Information")
-       (p)
-       (i "Version: " ,(plt-version))
-       (p)
+       (p (i "Version: " ,(plt-version)))
+       (br)
        (ul ,(link-stuff "/servlets/release/license.ss" "License")
            ,(link-stuff "/servlets/release/notes.ss" "Release Notes")
            ,(link-stuff "/servlets/release/bugs.ss" "Known Bugs")
            (li (a ([mzscheme "((dynamic-require '(lib |bug-report.ss| |help|) 'help-desk:report-bug))"])
                   (b "Submit a bug report")))
            ,(link-stuff "/servlets/release/patches.ss" "Downloadable Patches"))
-       (p)
-       "The PLT software is installed on this machine at" (br)
-       (pre nbsp nbsp
-            ,(let-values ([(base file dir?)
-                           (split-path (collection-path "mzlib"))])
-               (path->string base)))))))))
\ No newline at end of file
+       (p "The PLT software is installed on this machine at" (br)
+          (pre nbsp nbsp ,(path->string (find-collects-dir))))))))))
diff --git a/collects/help/servlets/resources.ss b/collects/help/servlets/resources.ss
index c580ec794f..493b6b985a 100644
--- a/collects/help/servlets/resources.ss
+++ b/collects/help/servlets/resources.ss
@@ -10,15 +10,13 @@
      (lambda ()
        (html-page
         #:title "External Resources"
-        #:bodies 
+        #:bodies
         `((h1  "External Resources")
-          (p)
-          "DrScheme is created by "
-          (a ([href "http://www.plt-scheme.org/"] [target "_top"]) "PLT")
-          " based at Northeastern University, the University of Utah,"
-          " Brown University, and the University of Chicago."
-          " Here are some links related to our activities."
-          (p)
+          (p "DrScheme is created by "
+             (a ([href "http://www.plt-scheme.org/"] [target "_top"]) "PLT")
+             " based at Northeastern University, the University of Utah,"
+             " Brown University, and the University of Chicago."
+             " Here are some links related to our activities.")
           (ul (li (b (a ([href "resources/teachscheme.ss"])
                         "TeachScheme! Workshops"))
                   ": Free summer program")
@@ -26,10 +24,9 @@
                   ": From PLT and contributors")
               (li (b (a ([href "resources/maillist.ss"]) "Mailing Lists"))
                   ": How to subscribe"))
-          (p)
-          "Also, the Schemers.org Web site provides links for "
-          "many Scheme resources, including books, implementations, "
-          "and libraries: "
-          (a ([href "http://www.schemers.org/"] [target "_top"])
-             "http://www.schemers.org/") "."))))))
-  
\ No newline at end of file
+          (p "Also, the Schemers.org Web site provides links for "
+             "many Scheme resources, including books, implementations, "
+             "and libraries: "
+             (a ([href "http://www.schemers.org/"] [target "_top"])
+                "http://www.schemers.org/") ".")))))))
+
diff --git a/collects/help/servlets/scheme/doc.ss b/collects/help/servlets/scheme/doc.ss
index 2a2b1effa0..b52ed6e59b 100644
--- a/collects/help/servlets/scheme/doc.ss
+++ b/collects/help/servlets/scheme/doc.ss
@@ -43,4 +43,4 @@
        (a ([href "/servlets/howtouse.ss#search"]) "Searching")
        " in Help Desk finds documenation from all sources, including "
        (a ([href "/servlets/howtodrscheme.ss"]) "DrScheme")
-       " and the language and library documentation."))))))
\ No newline at end of file
+       " and the language and library documentation."))))))
diff --git a/collects/help/servlets/scheme/langlevels.ss b/collects/help/servlets/scheme/langlevels.ss
index 7a75a7d5b8..56aa3370f9 100644
--- a/collects/help/servlets/scheme/langlevels.ss
+++ b/collects/help/servlets/scheme/langlevels.ss
@@ -59,4 +59,4 @@
        "Please follow the links on this page for more information.  If you"
        " have additional questions or comments, please contact us at "
        (a ((href "mailto:scheme@plt-scheme.org")) "scheme@plt-scheme.org")
-       "."))))))
\ No newline at end of file
+       "."))))))
diff --git a/collects/help/servlets/scheme/misc.ss b/collects/help/servlets/scheme/misc.ss
index 10af1a210b..c40fb8ceeb 100644
--- a/collects/help/servlets/scheme/misc.ss
+++ b/collects/help/servlets/scheme/misc.ss
@@ -35,4 +35,4 @@
                (a ((href "/servlets/howtouse.ss#search")) "searching")
                " in Help Desk.  Also, check "
                (a ((href "http://www.htus.org/")) (i "How to Use Scheme"))
-               "."))))))
\ No newline at end of file
+               "."))))))
diff --git a/collects/help/servlets/scheme/misc/activex.ss b/collects/help/servlets/scheme/misc/activex.ss
index b27a16d24a..a606c6aaa6 100644
--- a/collects/help/servlets/scheme/misc/activex.ss
+++ b/collects/help/servlets/scheme/misc/activex.ss
@@ -11,20 +11,21 @@
     (with-errors-to-browser 
      send/finish
      (lambda ()
-    `(HTML 
-      (HEAD ,hd-css
+    `(html 
+      (head ,hd-css
             ,@hd-links
-            (TITLE "How to use ActiveX components"))
-      (BODY 
-       (H1  "How to use ActiveX components")
-       (A ((NAME "com") (VALUE "COM")))
-       (A ((NAME "activex") (VALUE "ActiveX")))
+            (title "How to use ActiveX components"))
+      (body
+       (h1  "How to use ActiveX components")
+       (a ([name "com"] [value "COM"]))
+       (a ([name "activex"] [value "ActiveX"]))
        "If you run Windows, you can use MysterX, a library for "
        "controlling COM and ActiveX components within DrScheme, "
        "MzScheme, or MrEd.  MysterX is available from "
-       (PRE 
-        'nbsp 'nbsp  (A ((HREF "http://www.plt-scheme.org/software/mysterx/")
-                         (TARGET "_top")) "http://www.plt-scheme.org/software/mysterx/"))
-       (P)
-       ,(collection-doc-link "mysterx"
-                             "The MysterX collection")))))))
\ No newline at end of file
+       (pre
+        nbsp nbsp
+        (a ((href "http://www.plt-scheme.org/software/mysterx/")
+            (target "_top"))
+           "http://www.plt-scheme.org/software/mysterx/"))
+       (p)
+       ,(collection-doc-link "mysterx" "The MysterX collection")))))))
diff --git a/collects/help/servlets/scheme/misc/batch.ss b/collects/help/servlets/scheme/misc/batch.ss
index 87189a5fab..fe42a06385 100644
--- a/collects/help/servlets/scheme/misc/batch.ss
+++ b/collects/help/servlets/scheme/misc/batch.ss
@@ -1,47 +1,47 @@
 (module batch mzscheme
   (require "../../private/headelts.ss"
            "../../private/util.ss")
-  
+
   (require (lib "servlet.ss" "web-server"))
   (provide interface-version timeout start)
   (define interface-version 'v1)
   (define timeout +inf.0)
-  
+
   (define (start initial-request)
-    (with-errors-to-browser 
+    (with-errors-to-browser
      send/finish
      (lambda ()
-    `(HTML 
-      (HEAD ,hd-css
+    `(html
+      (head ,hd-css
             ,@hd-links
-            (TITLE  "How to write Windows batch files"))
-      (BODY 
-       (H1  "How to write Windows batch files")
-       (A ((NAME "sh") (VALUE "Batch files")))
-       (A ((NAME "sh2") (VALUE ".bat files")))
+            (title  "How to write Windows batch files"))
+      (body
+       (h1 "How to write Windows batch files")
+       (a ((name "sh") (value "Batch files")))
+       (a ((name "sh2") (value ".bat files")))
        "You can put MzScheme code in a Windows batch file, that is, a "
        "file with a .BAT extension.  Batch files can be executed "
        "directly from the command line.  In Windows 95, 98, and Me, "
        "the batch file looks like:"
-       (PRE 
-        " ; @echo off" (BR)
-        " ; d:\\plt\\mzscheme -r %0 %1 %2 %3 %4 %5 %6 %7 %8 %9" (BR)
-        " ; goto :end" (BR)
-        "   ... " (I  "scheme-program") " ..." (BR)
+       (pre 
+        " ; @echo off" (br)
+        " ; d:\\plt\\mzscheme -r %0 %1 %2 %3 %4 %5 %6 %7 %8 %9" (br)
+        " ; goto :end" (br)
+        "   ... " (i  "scheme-program") " ..." (br)
         " ; :end")
        "With this code, your batch file can use as many as nine "
        "parameters."
-       (P)
+       (p)
        "In Windows NT, Windows 2000, and Windows XP, you can instead write "
-       (PRE 
-        " ; @echo off" (BR)
-        " ; d:\\plt\\mzscheme -r %0 %*" (BR)
-        " ; goto :end" (BR)
-        "   ... " (I  "scheme-program") " ..." (BR)
+       (pre
+        " ; @echo off" (br)
+        " ; d:\\plt\\mzscheme -r %0 %*" (br)
+        " ; goto :end" (br)
+        "   ... " (i "scheme-program") " ..." (br)
         " ; :end")
        "This code allows an arbitrary number of parameters to your " 
        "batch file."
-       (P)
+       (p)
        "The batch file code works by combining both batch and MzScheme "
        "syntax in a single file.  When invoked from the command line, "
        "the semicolons are ignored.  The second line invokes MzScheme "
@@ -49,4 +49,4 @@
        "lines beginning with semicolons as comments, and runs the "
        "Scheme code.  When the Scheme program is "
        "done, control returns to the batch file, and the "
-       (TT  "goto") " jumps around the Scheme code."))))))
\ No newline at end of file
+       (tt  "goto") " jumps around the Scheme code."))))))
diff --git a/collects/help/servlets/scheme/misc/cgi.ss b/collects/help/servlets/scheme/misc/cgi.ss
index 9fd17e5d0a..0034a1ddf4 100644
--- a/collects/help/servlets/scheme/misc/cgi.ss
+++ b/collects/help/servlets/scheme/misc/cgi.ss
@@ -1,153 +1,151 @@
 (module cgi mzscheme
   (require "../../private/headelts.ss")
-  
+
   (require (lib "servlet.ss" "web-server"))
   (provide interface-version timeout start)
   (define interface-version 'v1)
   (define timeout +inf.0)
-  
+
   (define (start initial-request)
-    (with-errors-to-browser 
+    (with-errors-to-browser
      send/finish
      (lambda ()
-       `(HTML 
-         (HEAD ,hd-css
+       `(html
+         (head ,hd-css
                ,@hd-links
-               (TITLE  "How to write CGI scripts"))
-         (BODY 
-          (H1  "How to write CGI scripts")
-          (A ((NAME "cgi") (VALUE "CGI scripts")))
-          "Type " (TT  "CGI") " in the " (B  "Search for") " "
+               (title  "How to write CGI scripts"))
+         (body
+          (h1  "How to write CGI scripts")
+          (a ([name "cgi"] (value "CGI scripts")))
+          "Type " (tt  "CGI") " in the " (b "Search for") " "
           "field in Help Desk and click on the "
-          (B  (TT  "Search")) " button to get information "
+          (b (tt "Search")) " button to get information "
           "on CGI-related functions."
-          (P)
+          (p)
           "A CGI script is merely a program with funny inputs and "
           "outputs.  Input comes either from an environment variable "
           "or through the standard input port, in a special format. "
           "Output consists of a MIME header followed by the content.  "
           "Everything in-between is pure program."
-          (P)
+          (p)
           "MzScheme comes with a CGI library that is designed to "
           "make it easy to write such scripts.  In the mini-tutorial "
           "below, we'll walk you through the "
           "construction of such a script.  If you have questions or "
           "comments, send email to "
-          (A ((HREF "mailto:sk@plt-scheme.org"))
-             "sk@plt-scheme.org") "."
-                                  (P)
-                                  (HR)
-                                  (P)
-                                  "Let's write a simple \"finger server\" in MzScheme. "
-                                  "The front-end will be a Web form that accepts a username. "
-                                  "The form should supply a username in the field `name'. "
-                                  "The CGI script fingers that user."
-                                  (P)
-                                  "First, make sure you have MzScheme installed on the host "
-                                  "where your Web server is located."
-                                  (P)
-                                  "A CGI script must be an executable.  Each OS has different "
-                                  "ways of launching an application.  Under Unix, it's "
-                                  "probably easiest to make them simple shell scripts.  "
-                                  "Therefore, place the following magic incantation at the "
-                                  "top of your script:"
-                                  (P)
-                                  (PRE 
-                                   " #!/bin/sh" (BR)
-                                   " string=? ; exec /usr/local/bin/mzscheme -r $0 \"$@\"")
-                                  (P)
-                                  "Make sure the path to MzScheme is specified correctly."
-                                  (P)
-                                  "Now we're in Scheme-land.  First, let's load the Scheme "
-                                  "CGI library and define where `finger' resides."
-                                  (P)
-                                  (PRE 
-                                   " (require (lib \"cgi.ss\" \"net\"))" (BR)
-                                   " (define finger-program \"/usr/bin/finger\")")
-                                  (P)
-                                  "Next we must get the names bound by the form, and "
-                                  "extract the username field."
-                                  (P)
-                                  (PRE 
-                                   " (let ((bindings (get-bindings)))" (BR)
-                                   "   (let ((name (extract-binding/single 'name bindings)))")
-                                  (P)
-                                  "We use extract-binding/single to make sure only one name "
-                                  "field was bound.  (You can bind the same field multiple "
-                                  "times using check-boxes.  This is just one kind of "
-                                  "error-checking; a robust CGI script will do more."
-                                  (P)
-                                  "Next we invoke the finger program using `process*'.  "
-                                  "If no username was specified, we just run finger on the host."
-                                  (P)
-                                  (PRE 
-                                   " (let ((results (if (string=? name \"\"))" (BR)
-                                   "   (process* finger-program)" (BR)
-                                   "   (process* finger-program name))))")
-                                  (P)
-                                  "The `process*' function returns a list of several values. "
-                                  "The first of these is the output port.  Let's pull this "
-                                  "out and name it."
-                                  (P)
-                                  (PRE 
-                                   " (let ((proc->self (car results)))")
-                                  (P)
-                                  "Now we extract the output of running finger into a "
-                                  "list of strings."
-                                  (P)
-                                  (PRE 
-                                   " (let ((strings (let loop " (BR)
-                                   "   (let ((l (read-line proc->self)))" (BR)
-                                   "     (if (eof-object? l)" (BR)
-                                   "        null" (BR)
-                                   "        (cons l (loop))))))))")
-                                  (P)
-                                  "All that's left is to print this out to the user.  "
-                                  "We use the `generate-html-output' procedure to do that, "
-                                  "which takes care of generating the appropriate MIME header "
-                                  "(as required of CGI scripts). "
-                                  "Note that the <PRE> tag of HTML doesn't prevent its "
-                                  "contents from being processed.  To avoid this "
-                                  "(i.e., to generate truly verbatim output), "
-                                  "we use `string->html', which knows about HTML quoting "
-                                  "conventions."
-                                  (P)
-                                  (PRE 
-                                   " (generate-html-output \"Finger Gateway Output\"" (BR)
-                                   "   (append " (BR)
-                                   "    '(\"<PRE>\")" (BR)
-                                   "    (map string->html strings)" (BR)
-                                   "    '(\"</PRE>\"))))))))")
-                                  (P)
-                                  "That's all!  This program will work irrespective of "
-                                  "whether the form uses a GET or POST method to send its "
-                                  "data over, which gives designers additional flexibility "
-                                  "(GET provides a weak form of persistence, while "
-                                  "POST is more robust and better suited to large volumes of "
-                                  "data)."
-                                  (P)
-                                  "Here's the entire program, once again:"
-                                  (P)
-                                  (PRE 
-                                   " #!/bin/sh" (BR)
-                                   " string=? ; exec /usr/local/bin/mzscheme -r $0 "$@"" (BR)
-                                   "" (BR)
-                                   " (require (lib \"cgi.ss\" \"net\"))" (BR)
-                                   " (define finger-program \"/usr/bin/finger\")" (BR)
-                                   ""  (BR)
-                                   " (let ((bindings (get-bindings)))" (BR)
-                                   "   (let ((name (extract-binding/single 'name bindings)))" (BR)
-                                   "    (let ((results (if (string=? name "")" (BR)
-                                   "      (process* finger-program)" (BR)
-                                   "     (process* finger-program name))))" (BR)
-                                   "     (let ((proc->self (car results)))" (BR)
-                                   "       (let ((strings (let loop " (BR)
-                                   "                        (let ((l (read-line proc->self)))" (BR)
-                                   "                          (if (eof-object? l)" (BR)
-                                   "                            null" (BR)
-                                   "                            (cons l (loop)))))))" (BR)
-                                   "         (generate-html-output \"Finger Gateway Output\"" (BR)
-                                   "         (append" (BR)
-                                   "           '(\"<PRE>\")" (BR)
-                                   "           (map string->html strings)" (BR)
-                                   "           '(\"</PRE>\"))))))))")))))))
\ No newline at end of file
+          (a ((href "mailto:sk@plt-scheme.org")) "sk@plt-scheme.org") "."
+          (p)
+          (hr)
+          (p)
+          "Let's write a simple \"finger server\" in MzScheme. "
+          "The front-end will be a Web form that accepts a username. "
+          "The form should supply a username in the field `name'. "
+          "The CGI script fingers that user."
+          (p)
+          "First, make sure you have MzScheme installed on the host "
+          "where your Web server is located."
+          (p)
+          "A CGI script must be an executable.  Each OS has different "
+          "ways of launching an application.  Under Unix, it's "
+          "probably easiest to make them simple shell scripts.  "
+          "Therefore, place the following magic incantation at the "
+          "top of your script:"
+          (p)
+          (pre " #!/bin/sh" (br)
+               " string=? ; exec /usr/local/bin/mzscheme -r $0 \"$@\"")
+          (p)
+          "Make sure the path to MzScheme is specified correctly."
+          (p)
+          "Now we're in Scheme-land.  First, let's load the Scheme "
+          "CGI library and define where `finger' resides."
+          (p)
+          (pre 
+           " (require (lib \"cgi.ss\" \"net\"))" (br)
+           " (define finger-program \"/usr/bin/finger\")")
+          (p)
+          "Next we must get the names bound by the form, and "
+          "extract the username field."
+          (p)
+          (pre 
+           " (let ((bindings (get-bindings)))" (br)
+           "   (let ((name (extract-binding/single 'name bindings)))")
+          (p)
+          "We use extract-binding/single to make sure only one name "
+          "field was bound.  (You can bind the same field multiple "
+          "times using check-boxes.  This is just one kind of "
+          "error-checking; a robust CGI script will do more."
+          (p)
+          "Next we invoke the finger program using `process*'.  "
+          "If no username was specified, we just run finger on the host."
+          (p)
+          (pre
+           " (let ((results (if (string=? name \"\"))" (br)
+           "   (process* finger-program)" (br)
+           "   (process* finger-program name))))")
+          (p)
+          "The `process*' function returns a list of several values. "
+          "The first of these is the output port.  Let's pull this "
+          "out and name it."
+          (p)
+          (pre
+           " (let ((proc->self (car results)))")
+          (p)
+          "Now we extract the output of running finger into a "
+          "list of strings."
+          (p)
+          (pre
+           " (let ((strings (let loop " (br)
+           "   (let ((l (read-line proc->self)))" (br)
+           "     (if (eof-object? l)" (br)
+           "        null" (br)
+           "        (cons l (loop))))))))")
+          (p)
+          "All that's left is to print this out to the user.  "
+          "We use the `generate-html-output' procedure to do that, "
+          "which takes care of generating the appropriate MIME header "
+          "(as required of CGI scripts). "
+          "Note that the <pre> tag of HTML doesn't prevent its "
+          "contents from being processed.  To avoid this "
+          "(i.e., to generate truly verbatim output), "
+          "we use `string->html', which knows about HTML quoting "
+          "conventions."
+          (p)
+          (pre
+           " (generate-html-output \"Finger Gateway Output\"" (br)
+           "   (append " (br)
+           "    '(\"<pre>\")" (br)
+           "    (map string->html strings)" (br)
+           "    '(\"</pre>\"))))))))")
+          (p)
+          "That's all!  This program will work irrespective of "
+          "whether the form uses a GET or POST method to send its "
+          "data over, which gives designers additional flexibility "
+          "(GET provides a weak form of persistence, while "
+          "POST is more robust and better suited to large volumes of "
+          "data)."
+          (p)
+          "Here's the entire program, once again:"
+          (p)
+          (pre
+           " #!/bin/sh" (br)
+           " string=? ; exec /usr/local/bin/mzscheme -r $0 \"$@\"" (br)
+           "" (br)
+           " (require (lib \"cgi.ss\" \"net\"))" (br)
+           " (define finger-program \"/usr/bin/finger\")" (br)
+           "" (br)
+           " (let ((bindings (get-bindings)))" (br)
+           "   (let ((name (extract-binding/single 'name bindings)))" (br)
+           "    (let ((results (if (string=? name "")" (br)
+           "      (process* finger-program)" (br)
+           "     (process* finger-program name))))" (br)
+           "     (let ((proc->self (car results)))" (br)
+           "       (let ((strings (let loop " (br)
+           "                        (let ((l (read-line proc->self)))" (br)
+           "                          (if (eof-object? l)" (br)
+           "                            null" (br)
+           "                            (cons l (loop)))))))" (br)
+           "         (generate-html-output \"Finger Gateway Output\"" (br)
+           "         (append" (br)
+           "           '(\"<pre>\")" (br)
+           "           (map string->html strings)" (br)
+           "           '(\"</pre>\"))))))))")))))))
diff --git a/collects/help/servlets/scheme/misc/database.ss b/collects/help/servlets/scheme/misc/database.ss
index 43c961d222..15e7908078 100644
--- a/collects/help/servlets/scheme/misc/database.ss
+++ b/collects/help/servlets/scheme/misc/database.ss
@@ -11,25 +11,27 @@
     (with-errors-to-browser 
      send/finish
      (lambda ()
-       `(HTML 
-         (HEAD ,hd-css
+       `(html 
+         (head ,hd-css
                ,@hd-links
-               (TITLE "How to connect to databases"))
-         (BODY 
-          (H1  "How to connect to databases") 
-          (A ((NAME "db") (VALUE "Database connections")))
+               (title "How to connect to databases"))
+         (body 
+          (h1  "How to connect to databases") 
+          (a ([name "db"] [value "Database connections"]))
           "SrPersist (\"Sister Persist\") is an ODBC interface for "
           "DrScheme and MzScheme. "
           "Download SrPersist from "
-          (PRE  
-           " " 
-           (A ((HREF "http://www.plt-scheme.org/software/srpersist/")
-               (TARGET "_top")) "http://www.plt-scheme.org/software/srpersist/") ". ")
+          (pre
+           " "
+           (a ([href "http://www.plt-scheme.org/software/srpersist/"]
+               [target "_top"])
+              "http://www.plt-scheme.org/software/srpersist/") ". ")
           "ODBC is a very low-level interface. "
           "Francisco Solsona has built a higher-level interface, "
           "SchemeQL, that uses SrPersist.  See "
-          (PRE 
-           " " 
-           (A ((HREF "http://schematics.sourceforge.net/schemeql.html")
-               (TARGET "_top")) "http://schematics.sourceforge.net/schemeql.html"))
-          " for more details."))))))
\ No newline at end of file
+          (pre
+           " "
+           (a ((href "http://schematics.sourceforge.net/schemeql.html")
+               (target "_top"))
+              "http://schematics.sourceforge.net/schemeql.html"))
+          " for more details."))))))
diff --git a/collects/help/servlets/scheme/misc/graphics.ss b/collects/help/servlets/scheme/misc/graphics.ss
index 7bbfbfa318..e7a34c1f9f 100644
--- a/collects/help/servlets/scheme/misc/graphics.ss
+++ b/collects/help/servlets/scheme/misc/graphics.ss
@@ -12,24 +12,24 @@
     (with-errors-to-browser 
      send/finish
      (lambda ()
-       `(HTML 
-         (HEAD ,hd-css
+       `(html 
+         (head ,hd-css
                ,@hd-links
-               (TITLE "How to write graphics programs"))
-         (BODY 
-          (H1 "How to write graphics programs")
-          (A ((NAME "gfx") (VALUE "Graphics")))
-          (A ((NAME "gui") (VALUE "GUIs")))
-          (A ((NAME "gui2") (VALUE "Graphical User Interfaces")))
+               (title "How to write graphics programs"))
+         (body
+          (h1 "How to write graphics programs")
+          (a ([name "gfx"] [value "Graphics"]))
+          (a ([name "gui"] [value "GUIs"]))
+          (a ([name "gui2"] [value "Graphical User Interfaces"]))
           "To write graphics programs, use DrScheme with the "
           "Graphical (MrEd) flavor of the PLT " 
-          (A ((HREF "/servlets/scheme/what.ss")) " language") ". "
+          (a ([href "/servlets/scheme/what.ss"]) " language") ". "
           "MrEd provides a complete GUI toolbox that is described "
-          "in " 
+          "in "
           ,(main-manual-page "mred") ". "
-          (P)
+          (p)
           "For simple graphics programs, you may also use the "
           "viewport-based graphics library, which is described in "
           ,(manual-entry "misclib" "viewport" "Viewport Graphics") ". "
           "The following declaration loads viewport graphics into MrEd:"
-          (PRE " (require (lib \"graphics.ss\" \"graphics\"))")))))))
\ No newline at end of file
+          (pre " (require (lib \"graphics.ss\" \"graphics\"))")))))))
diff --git a/collects/help/servlets/scheme/what.ss b/collects/help/servlets/scheme/what.ss
index 5be774f6e6..685a437ccb 100644
--- a/collects/help/servlets/scheme/what.ss
+++ b/collects/help/servlets/scheme/what.ss
@@ -102,4 +102,4 @@
           (a ([name "lang-sel"] [value "language, setting"]))
           "To change the"
           " language, select the " (b "Choose Language...") " item in the "
-          (B "Language") " menu."))))))
\ No newline at end of file
+          (B "Language") " menu."))))))
diff --git a/collects/help/servlets/static.ss b/collects/help/servlets/static.ss
index 46dc4e028f..5de180bfc0 100644
--- a/collects/help/servlets/static.ss
+++ b/collects/help/servlets/static.ss
@@ -1,6 +1,6 @@
-; Serve static documentation.
-; A search bar is added on top of the screen, when an external browser is used.
-; (which is why we don't let the web-server serve the documentation directly)
+;; Serve static documentation.
+;; A search bar is added on top of the screen, when an external browser is used.
+;; (which is why we don't let the web-server serve the documentation directly)
 
 (module static mzscheme
   (require (lib "private/mime-types.ss" "web-server")
diff --git a/collects/help/servlets/teachpacks.ss b/collects/help/servlets/teachpacks.ss
index 009ca37911..4d3522d0fb 100644
--- a/collects/help/servlets/teachpacks.ss
+++ b/collects/help/servlets/teachpacks.ss
@@ -16,4 +16,4 @@
                (ul (li (b (a ([href ,(get-manual-index "teachpack")])
                              "Teachpacks for \"How to Design Programs\"")))
                    (li (b (a ([href ,(get-manual-index "teachpack-htdc")])
-                             "Teachpacks for \"How to Design Classes\""))))))))))
\ No newline at end of file
+                             "Teachpacks for \"How to Design Classes\""))))))))))