diff --git a/collects/scribblings/scribble/basic.scrbl b/collects/scribblings/scribble/basic.scrbl
index 125abf15..d1f7e52c 100644
--- a/collects/scribblings/scribble/basic.scrbl
+++ b/collects/scribblings/scribble/basic.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require["utils.ss"]
-@require[(for-syntax scheme/base)]
+@(require scribble/manual
+          "utils.ss"
+          (for-syntax scheme/base))
 
 @define-syntax[def-section-like
                (syntax-rules ()
diff --git a/collects/scribblings/scribble/decode.scrbl b/collects/scribblings/scribble/decode.scrbl
index f9174667..44d0abc6 100644
--- a/collects/scribblings/scribble/decode.scrbl
+++ b/collects/scribblings/scribble/decode.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require["utils.ss"]
+@(require scribble/manual
+          "utils.ss")
 
 @title[#:tag "decode"]{Decoding Text}
 
diff --git a/collects/scribblings/scribble/doclang.scrbl b/collects/scribblings/scribble/doclang.scrbl
index 68055313..09c24dfc 100644
--- a/collects/scribblings/scribble/doclang.scrbl
+++ b/collects/scribblings/scribble/doclang.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require["utils.ss"]
+@(require scribble/manual
+          "utils.ss")
 
 @title[#:tag "doclang"]{Document Language}
 
diff --git a/collects/scribblings/scribble/docreader.scrbl b/collects/scribblings/scribble/docreader.scrbl
index 5e484d88..244ff3eb 100644
--- a/collects/scribblings/scribble/docreader.scrbl
+++ b/collects/scribblings/scribble/docreader.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require[scribble/bnf]
-@require["utils.ss"]
+@(require scribble/manual
+          scribble/bnf
+          "utils.ss")
 
 @title[#:tag "docreader"]{Document Reader}
 
diff --git a/collects/scribblings/scribble/how-to.scrbl b/collects/scribblings/scribble/how-to.scrbl
index 0529b762..afcdbd05 100644
--- a/collects/scribblings/scribble/how-to.scrbl
+++ b/collects/scribblings/scribble/how-to.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
-@require[scribble/manual
-         scribble/bnf]
-@require["utils.ss"]
+@(require scribble/manual
+          scribble/bnf
+          "utils.ss")
 
 @title{How to Scribble Documentation}
 
@@ -154,13 +154,13 @@ means
 For more information on the syntax of @litchar["@"], see
 @secref["reader"].
 
-In a document that starts @tt{#lang scribble/doc},
+In a document that starts @hash-lang[] @schememodname[scribble/doc],
 the top level is a text-mode sequence. The parsed sequence is further
 decoded to turn it into a hierarchy of sections and paragraphs. For
 example, a linear sequence of @scheme[section] declarations with
 interleaved text is turned into a list of @scheme[part] instances with
-all text assigned to a particular part. See @secref["decode"] for more
-information on the decoding process.
+all text assigned to a particular part. See @secref["layers"] for more
+information on these layers.
 
 @; ----------------------------------------
 @section[#:tag "scheme-hyperlinks"]{Scheme Typesetting and Hyperlinks}
diff --git a/collects/scribblings/scribble/layers.scrbl b/collects/scribblings/scribble/layers.scrbl
index fb9989ff..d92ef982 100644
--- a/collects/scribblings/scribble/layers.scrbl
+++ b/collects/scribblings/scribble/layers.scrbl
@@ -3,7 +3,7 @@
           scribble/bnf
           "utils.ss")
 
-@title{Scribble Layers}
+@title[#:tag "layers"]{Scribble Layers}
 
 Scribble is made of independently usable parts.  For example, the
 Scribble reader can be used in any situation that requires lots of
diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl
index d4868625..2e2a8a4d 100644
--- a/collects/scribblings/scribble/reader.scrbl
+++ b/collects/scribblings/scribble/reader.scrbl
@@ -1,9 +1,9 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require[scribble/bnf]
-@require[scribble/eval]
-@require["utils.ss"]
-@require[(for-syntax scheme/base)]
+@(require scribble/manual
+          scribble/bnf
+          scribble/eval
+          "utils.ss"
+          (for-syntax scheme/base))
 
 @(define read-eval (make-base-eval))
 @interaction-eval[#:eval read-eval (require (for-syntax scheme/base))]
diff --git a/collects/scribblings/scribble/renderer.scrbl b/collects/scribblings/scribble/renderer.scrbl
index 2e6fe41b..af744661 100644
--- a/collects/scribblings/scribble/renderer.scrbl
+++ b/collects/scribblings/scribble/renderer.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require["utils.ss"]
-@require[(for-label scheme/class)]
+@(require scribble/manual
+          "utils.ss"
+          (for-label scheme/class))
 
 @(define-syntax-rule (defmodule/local lib . content)
    (begin
diff --git a/collects/scribblings/scribble/scheme.scrbl b/collects/scribblings/scribble/scheme.scrbl
index 7da38229..364cefc7 100644
--- a/collects/scribblings/scribble/scheme.scrbl
+++ b/collects/scribblings/scribble/scheme.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require["utils.ss"]
+@(require scribble/manual
+          "utils.ss")
 
 @title[#:tag "scheme"]{Scheme}
 
diff --git a/collects/scribblings/scribble/scribble.scrbl b/collects/scribblings/scribble/scribble.scrbl
index 86c8361a..c4698ab2 100644
--- a/collects/scribblings/scribble/scribble.scrbl
+++ b/collects/scribblings/scribble/scribble.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
-@require[scribble/manual]
-@require[scribble/bnf]
-@require["utils.ss"]
+@(require scribble/manual
+          scribble/bnf
+          "utils.ss")
 
 @title{@bold{Scribble}: PLT Documentation Tool}