diff --git a/collects/web-server/docs/reference/configuration.scrbl b/collects/web-server/docs/reference/configuration.scrbl
index fe7cde6943..56d6a76f12 100644
--- a/collects/web-server/docs/reference/configuration.scrbl
+++ b/collects/web-server/docs/reference/configuration.scrbl
@@ -13,7 +13,7 @@ configuring the @file{web-server}.
 @section[#:tag "configuration-table-structs.ss"]{Configuration Table Structure}
 
 @file{configuration/configuration-table-structs.ss} provides the following structures that
-represent a standard configuration (see @secref["XXX"]) of the @file{web-server}.
+represent a standard configuration (see @secref["web-server-unit.ss"]) of the @file{web-server}.
 The contracts on this structure influence the valid types of values in
 the configuration table S-expression file format described in 
 @secref["configuration-table.ss"].
@@ -184,14 +184,14 @@ implements structures.
 
 Since, on occasion, a user will actually wanted servlets A and B to interact through module C.
 A custom @scheme[make-servlet-namespace] can be created, through this procedure, that attaches
-module C to all servlet namespaces. Through other means (see @secref["pipelines"]) different sets
+module C to all servlet namespaces. Through other means (see @secref["dispatchers"]) different sets
 of servlets can share different sets of modules.
 
 @; ------------------------------------------------------------
 @section[#:tag "responders.ss"]{Standard Responders}
 
 @file{configuration/responders.ss} provides some functions that help constructing HTTP responders.
-These functions are used by the default dispatcher constructor (see @secref["web-server-unit"]) to
+These functions are used by the default dispatcher constructor (see @secref["web-server-unit.ss"]) to
 turn the paths given in the @scheme[configuration-table] into responders for the associated circumstance.
 
 @; XXX Include response/full
diff --git a/collects/web-server/docs/reference/dispatchers.scrbl b/collects/web-server/docs/reference/dispatchers.scrbl
index 5ca6741377..f0c85eacc8 100644
--- a/collects/web-server/docs/reference/dispatchers.scrbl
+++ b/collects/web-server/docs/reference/dispatchers.scrbl
@@ -1,7 +1,8 @@
 #reader(lib "docreader.ss" "scribble")
 @require["../web-server.ss"]
 
-@title[#:style 'toc]{Dispatchers}
+@title[#:tag "dispatchers"
+       #:style 'toc]{Dispatchers}
 
 The @file{web-server} is really just a peculiar configuration of a
 dispatching server. There are a number of dispatchers that are defined
@@ -102,7 +103,7 @@ that invokes a sequence of dispatchers until one applies.
 @; ------------------------------------------------------------
 @section[#:tag "dispatch-filter.ss"]{Filtering Requests}
 
-@file{dispatchers/dispatch-filter.ss} defines a dispatcher constructer 
+@file{dispatchers/dispatch-filter.ss} defines a dispatcher constructor 
 that calls an underlying dispatcher
 with all requests that pass a predicate.
 
@@ -131,10 +132,10 @@ a URL that refreshes the password file, servlet cache, etc.
 @; ------------------------------------------------------------
 @section[#:tag "dispatch-log.ss"]{Logging}
 
-@file{dispatchers/dispatch-log.ss} defines a dispatcher constructer
+@file{dispatchers/dispatch-log.ss} defines a dispatcher constructor
 for transparent logging of requests.
 
-@; XXX Take formating procedure
+@; XXX Take formatting procedure
 @defproc[(make [#:log-format log-format symbol? 'parenthesized-default]
                [#:log-path log-path (or/c path-string? false/c) #f])
          dispatcher?]{
diff --git a/collects/web-server/docs/reference/lang.scrbl b/collects/web-server/docs/reference/lang.scrbl
index 0e1b818d9e..5bac22c1d1 100644
--- a/collects/web-server/docs/reference/lang.scrbl
+++ b/collects/web-server/docs/reference/lang.scrbl
@@ -1,7 +1,8 @@
 #reader(lib "docreader.ss" "scribble")
 @require["../web-server.ss"]
 
-@title[#:style 'toc]{Web Language Servlets}
+@title[#:tag "lang"
+       #:style 'toc]{Web Language Servlets}
 
 The @file{web-server} allows servlets to be written in a special Web
 language that is nearly identical to Scheme. Herein we discuss how it
@@ -113,7 +114,7 @@ by the Web language API.
  form that includes the serialization as a hidden form.
  Calls @scheme[response-generator] with this URL and form field and delivers
  the response to the client. If the URL is invoked with form data containing
- the hiddden form,
+ the hidden form,
  the request is returned to this continuation.
  
  Note: The continuation is NOT stuffed.
@@ -128,8 +129,8 @@ by the Web language API.
               
 @defproc[(extract-proc/url [req request?])
          any/c]{
- Inspects the URL of @scheme[req] and attempts to extract the procedured
- embeded with @scheme[embed-proc/url]. If sucessful, it is invoked with
+ Inspects the URL of @scheme[req] and attempts to extract the procedure
+ embedded with @scheme[embed-proc/url]. If successful, it is invoked with
  @scheme[req] as an argument.
 } 
 
diff --git a/collects/web-server/docs/reference/managers.scrbl b/collects/web-server/docs/reference/managers.scrbl
index 02f71e9d2d..1f712bc99b 100644
--- a/collects/web-server/docs/reference/managers.scrbl
+++ b/collects/web-server/docs/reference/managers.scrbl
@@ -82,7 +82,7 @@ the users and implementers of managers.
 } 
 
 If you are considering using this manager, also consider using the
-Web Language. (See @secref["lang.ss"].)
+Web Language. (See @secref["lang"].)
 
 @; ------------------------------------------------------------
 @section[#:tag "timeouts.ss"]{Timeouts}
diff --git a/collects/web-server/docs/reference/servlet.scrbl b/collects/web-server/docs/reference/servlet.scrbl
index 41e8346bd1..24ee634ca2 100644
--- a/collects/web-server/docs/reference/servlet.scrbl
+++ b/collects/web-server/docs/reference/servlet.scrbl
@@ -354,7 +354,7 @@ servlet developer.
  Determines if @scheme[v] is one of the following values.
 }
                   
-@defthing[permanently redirection-status?]{A @scheme[redirection-status?] for permant redirections.}
+@defthing[permanently redirection-status?]{A @scheme[redirection-status?] for permanent redirections.}
 
 @defthing[temporarily redirection-status?]{A @scheme[redirection-status?] for temporary redirections.}
 
@@ -362,7 +362,7 @@ servlet developer.
 
 @defproc[(with-errors-to-browser [send/finish-or-back (response? . -> . void?)]
                                  [thunk (-> any)])]{
- Calls @scheme[thunk] with an exeception handler that generates an HTML error page
+ Calls @scheme[thunk] with an exception handler that generates an HTML error page
  and calls @scheme[send/finish-or-back].
 } 
 
diff --git a/collects/web-server/docs/reference/web-server-unit.scrbl b/collects/web-server/docs/reference/web-server-unit.scrbl
index 60d7df5bce..687fdc71a1 100644
--- a/collects/web-server/docs/reference/web-server-unit.scrbl
+++ b/collects/web-server/docs/reference/web-server-unit.scrbl
@@ -1,8 +1,8 @@
 #reader(lib "docreader.ss" "scribble")
 @require["../web-server.ss"]
 
-@; XXX web-server-unit.ss
-@title[#:style 'toc]{Web Server Unit}
+@title[#:tag "web-server-unit.ss"
+       #:style 'toc]{Web Server Unit}
 
 The @file{web-server} offers a unit-based approach to running the server.
 
@@ -27,7 +27,7 @@ sets up one virtual host dispatcher, for each virtual host in the @scheme[web-co
 that sequences the following operations:
 @itemize[
  @item{Logs the incoming request with the given format to the given file}
- @item{Performs HTTP Basic Authentization with the given password file}
+ @item{Performs HTTP Basic Authentication with the given password file}
  @item{Allows the @scheme["/conf/refresh-passwords"] URL to refresh the password file.}
  @item{Allows the @scheme["/conf/collect-garbage"] URL to call the garbage collector.}
  @item{Allows the @scheme["/conf/refresh-servlets"] URL to refresh the servlets cache.}