diff --git a/collects/scribble/basic.ss b/collects/scribble/basic.ss
index 781d6693..b4f4bdb3 100644
--- a/collects/scribble/basic.ss
+++ b/collects/scribble/basic.ss
@@ -191,11 +191,10 @@
                     key
                     content)))
 
-  (define (index-section tag)
+  (define (index-section #:tag [tag #f])
     (make-unnumbered-part
      #f
-     `((part , (or tag 
-                   (make-generated-tag))))
+     `((part ,(or tag "doc-index")))
      '("Index")
      'index
      null
diff --git a/collects/scribble/manual.ss b/collects/scribble/manual.ss
index eb9f1937..9e964ac2 100644
--- a/collects/scribble/manual.ss
+++ b/collects/scribble/manual.ss
@@ -998,16 +998,15 @@
                                           (map (lambda (f)
                                                  (list 'accessor name '- (field-name f)))
                                                fields)
-                                          (if immutable?
-                                              null
-                                              (filter 
-                                               values
-                                               (map (lambda (f)
-                                                      (if (and (pair? (car f))
-                                                               (memq '#:mutable (car f)))
-                                                          (list 'mutator 'set- name '- (field-name f) '!)
-                                                          #f))
-                                                    fields)))))))])
+                                          (filter 
+                                           values
+                                           (map (lambda (f)
+                                                  (if (or (not immutable?)
+                                                          (and (pair? (car f))
+                                                                (memq '#:mutable (car f))))
+                                                      (list 'mutator 'set- name '- (field-name f) '!)
+                                                      #f))
+                                                fields))))))])
                           (if (pair? name)
                               (to-element (list just-name
                                                 (make-just-context (cadr name) stx-id)))
diff --git a/collects/scribblings/scribble/basic.scrbl b/collects/scribblings/scribble/basic.scrbl
index bc2d52ca..baf5a0a8 100644
--- a/collects/scribblings/scribble/basic.scrbl
+++ b/collects/scribblings/scribble/basic.scrbl
@@ -178,11 +178,10 @@ section by @scheme[decode]. The @scheme[word]s serve as both the keys
 and as the rendered forms of the keys.}
 
 
-@defproc[(index-section [tag string?])]{
+@defproc[(index-section [#:tag tag (or/c false/c string?) "doc-index"])]{
 
 Produces a section that shows the index the enclosing document. The
-@scheme[tag] is required to be unique for each index among a set of
-documents that share ``collected'' information.}
+optional @scheme[tag] argument is used as the index section's tag.}
 
 
 @; ------------------------------------------------------------------------
diff --git a/collects/scribblings/scribble/manual.scrbl b/collects/scribblings/scribble/manual.scrbl
index db79eab9..cf3db754 100644
--- a/collects/scribblings/scribble/manual.scrbl
+++ b/collects/scribblings/scribble/manual.scrbl
@@ -448,6 +448,21 @@ Like @scheme[defproc], but for a method within a @scheme[defclass] or
 Like @scheme[defproc*], but for a method within a @scheme[defclass] or
 @scheme[definterface] body.}
 
+
+@defform[(method class/intf-id method-id)]{
+
+Creates a hyperlink to the method named by @scheme[method-id] in the
+class or interface named by @scheme[class/intf-id]. The hyperlink
+names the method, only; see also @scheme[xmethod].
+
+For-label binding information is used with @scheme[class/intf-id], but
+not @scheme[method-id].}
+
+@defform[(xmethod class/intf-id method-id)]{
+
+Like @scheme[method], but the hyperlink shows both the method name and
+the containing class/interface.}
+
 @; ------------------------------------------------------------------------
 @section{Various String Forms}
 
diff --git a/collects/scribblings/scribble/scribble.scrbl b/collects/scribblings/scribble/scribble.scrbl
index 8c07bc38..aa46fdcf 100644
--- a/collects/scribblings/scribble/scribble.scrbl
+++ b/collects/scribblings/scribble/scribble.scrbl
@@ -94,4 +94,4 @@ information.
 @include-section["manual.scrbl"]
 @include-section["eval.scrbl"]
 
-@index-section["scribble-index"]
+@index-section[]