diff --git a/collects/handin-server/scribblings/checker.scrbl b/collects/handin-server/scribblings/checker.scrbl
index 98a45a4fa1..e2816a603e 100644
--- a/collects/handin-server/scribblings/checker.scrbl
+++ b/collects/handin-server/scribblings/checker.scrbl
@@ -184,7 +184,7 @@ Keywords for configuring @scheme[check:]:
   if it does not raise an exception, then the checker will proceed as
   usual.  For example:
 
-  @schemeblock{
+  @schemeblock[
     (lambda (msg)
       (add-header-line! "Erroneous submission!")
       (add-header-line! (format "  --> ~a" msg))
@@ -196,7 +196,7 @@ Keywords for configuring @scheme[check:]:
                 "(The submission has been saved but marked as"
                 " erroneous.)")
                '(ok))
-      (message "Handin saved as erroneous." 'final))}
+      (message "Handin saved as erroneous." 'final))]
 
   (Note that if you do this, then additional tests should be adjusted
   to not raise an exception too.)}
diff --git a/collects/planet/planet.scrbl b/collects/planet/planet.scrbl
index f40253a2ea..1f740ba79e 100644
--- a/collects/planet/planet.scrbl
+++ b/collects/planet/planet.scrbl
@@ -82,11 +82,11 @@ written using a new shorter syntax:
 @schemeblock[(require (planet schematics/spgsql:2:3/spgsql))]
 
 The two forms behave identically. In the abbreviated syntax, however,
-it is illegal to write the trailing @scheme{.ss} suffix on the file
-name to be required or the trailing @scheme{.plt} on the package file
+it is illegal to write the trailing @filepath{.ss} suffix on the file
+name to be required or the trailing @filepath{.plt} on the package file
 name. (They are mandatory for the long-form syntax.) It is also legal
 in the abbreviated syntax to omit a filename to be required entirely;
-in that case, PLaneT requires the file @scheme{main.ss} in the given
+in that case, PLaneT requires the file @filepath{main.ss} in the given
 package.
 
 @subsection{Fine-Grained Control Over Package Imports}
diff --git a/collects/scribblings/drscheme/languages.scrbl b/collects/scribblings/drscheme/languages.scrbl
index aed51a4357..1fa940a4c6 100644
--- a/collects/scribblings/drscheme/languages.scrbl
+++ b/collects/scribblings/drscheme/languages.scrbl
@@ -283,9 +283,9 @@ language through the detail section of language-selection dialog.
 
 }
 
-A program in the teaching languages should be tested using the check forms --
- @scheme{(check-expect value value)}, @scheme{(check-within value value value)}, or
- @scheme{(check-error value string)}. Tests are evaluated when running the program:
+A program in the teaching languages should be tested using the check forms ---
+ @scheme[(check-expect value value)], @scheme[(check-within value value value)], or
+ @scheme[(check-error value string)]. Tests are evaluated when running the program:
  when there are no tests, a warning appears in the interactions window;
  when all tests succeed, an acknowledgement appears in the interactions window;
  otherwise, a testing window appears to report the results. See @secref["menu:view"] 
diff --git a/collects/scribblings/guide/scripts.scrbl b/collects/scribblings/guide/scripts.scrbl
index 087d8d474d..99499db709 100644
--- a/collects/scribblings/guide/scripts.scrbl
+++ b/collects/scribblings/guide/scripts.scrbl
@@ -89,7 +89,7 @@ command-line arguments are allowed by the script.
 An even more general trampoline uses @exec{/bin/sh} plus some lines
 that are comments in one language and expressions in the other. This
 trampoline is more complicated, but it provides more control over
-command-line arguments to @scheme{mzscheme}:
+command-line arguments to @exec{mzscheme}:
 
 @verbatim[#:indent 2]|{
   #! /bin/sh
diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl
index 4b066c366f..8f50eacd4b 100644
--- a/collects/scribblings/reference/class.scrbl
+++ b/collects/scribblings/reference/class.scrbl
@@ -1666,7 +1666,7 @@ Returns @scheme[#t] if @scheme[v] is a @tech{generic}, @scheme[#f] otherwise.}
 @defproc[(object=? [a object?][b object?]) eq?]{
 
 Determines if two objects are the same object, or not; this procedure uses
-@scheme{eq?}, but also works properly with contracts.}
+@scheme[eq?], but also works properly with contracts.}
 
 
 @defproc[(object->vector [object object?][opaque-v any/c #f]) vector?]{
diff --git a/collects/scribblings/reference/collects.scrbl b/collects/scribblings/reference/collects.scrbl
index 7b96a18cad..502a8ad89f 100644
--- a/collects/scribblings/reference/collects.scrbl
+++ b/collects/scribblings/reference/collects.scrbl
@@ -39,7 +39,7 @@ a final path element that names a library file; the path elements are
 separated by @litchar{/}. If the final element has no file suffix,
 then @litchar{/main.ss} is implicitly appended to the path.
 
-The translation of a @scheme{planet} or @scheme{lib} path to a
+The translation of a @scheme[planet] or @scheme[lib] path to a
 @scheme[module] declaration is determined by the @tech{module name
 resolver}, as specified by the @scheme[current-module-name-resolver]
 parameter.
diff --git a/collects/scribblings/reference/package.scrbl b/collects/scribblings/reference/package.scrbl
index a79f078399..d6f7e3d150 100644
--- a/collects/scribblings/reference/package.scrbl
+++ b/collects/scribblings/reference/package.scrbl
@@ -45,7 +45,7 @@ refer to each other). However, @scheme[define-package] handles
 forms within a @scheme[define-package] body are visible only to
 @scheme[form]s that appear later in the body, and they can shadow any
 binding from preceding @scheme[form]s (even if the preceding binding
-did not use one of the special @schemeidfont[*] definition forms).  If
+did not use one of the special @schemeidfont{*} definition forms).  If
 an exported identifier is defined multiple times, the last definition
 is the exported one.
 
diff --git a/collects/scribblings/reference/printer.scrbl b/collects/scribblings/reference/printer.scrbl
index 4970a932c2..31c60110ae 100644
--- a/collects/scribblings/reference/printer.scrbl
+++ b/collects/scribblings/reference/printer.scrbl
@@ -37,7 +37,7 @@ symbols containing uppercase characters also use escaping escaping
 @litchar{\} and quoting @litchar{|}s. In addition, symbols are
 quoted with @litchar{|}s or leading @litchar{\} when they would
 otherwise print the same as a numerical constant or as a delimited
-@scheme{.} (when @scheme[read-accept-dot] is @scheme[#t]).
+@litchar{.} (when @scheme[read-accept-dot] is @scheme[#t]).
 
 When @scheme[read-accept-bar-quote] is @scheme[#t], @litchar{|}s are
 used in printing when one @litchar{|} at the beginning and one
@@ -73,10 +73,10 @@ as @nonterm{m}@litchar{+}@nonterm{n}@litchar{i}, where @nonterm{m} and
 @nonterm{n} are the printed forms of its real and imaginary parts,
 respectively.
 
-An inexact real number prints with either a @litchar{.}  decimal
+An inexact real number prints with either a @litchar{.} decimal
 point, an @litchar{e} exponent marker, or both.  The form is selected
 so that the output is as short as possible, with the constraint that
-reading the printed form back in produces an @scheme{equal?} number.
+reading the printed form back in produces an @scheme[equal?] number.
 
 An exact @scheme[0] prints as @litchar{0}.
 
diff --git a/collects/scribblings/reference/sandbox.scrbl b/collects/scribblings/reference/sandbox.scrbl
index 4f71435cc0..34eb823c43 100644
--- a/collects/scribblings/reference/sandbox.scrbl
+++ b/collects/scribblings/reference/sandbox.scrbl
@@ -215,7 +215,7 @@ exceptions happen in the same way, so you don't need special code to
 catch syntax errors.
 
 Finally, the fact that a sandboxed evaluator accept syntax objects
-makes it usable as the value for @scheme{current-eval}, which means
+makes it usable as the value for @scheme[current-eval], which means
 that you can easily start a sandboxed read-eval-print-loop.  For
 example, here is a quick implementation of a networked REPL:
 
diff --git a/collects/scribblings/scribble/how-to.scrbl b/collects/scribblings/scribble/how-to.scrbl
index a59204b2b6..7695db8a50 100644
--- a/collects/scribblings/scribble/how-to.scrbl
+++ b/collects/scribblings/scribble/how-to.scrbl
@@ -303,7 +303,7 @@ and they declare hyperlink targets for @scheme[scheme]-based
 hyperlinks.
 
 To document a @scheme[my-helper] procedure that is exported by
-@filepath{helper.ss} in the @scheme{my-lib} collection that contains
+@filepath{helper.ss} in the @schemeidfont{my-lib} collection that contains
 @filepath{manual.scrbl}:
 
 @itemize[
@@ -433,7 +433,7 @@ via @scheme[require-for-label] and @scheme[require]:
 
 In general, a @filepath{.scrbl} file produces a @techlink{part}. A part
 produced by a document's main source (as specified in the
-@scheme{info.ss} file) represents the whole document. The
+@filepath[info.ss] file) represents the whole document. The
 @scheme[include-section] procedure can be used to incorporate a part
 as a sub-part of the enclosing part.
 
diff --git a/collects/scribblings/setup-plt/setup-plt.scrbl b/collects/scribblings/setup-plt/setup-plt.scrbl
index 85f5cd506c..4820284429 100644
--- a/collects/scribblings/setup-plt/setup-plt.scrbl
+++ b/collects/scribblings/setup-plt/setup-plt.scrbl
@@ -722,7 +722,7 @@ interface.
 @subsubsection[#:tag "gui-unpacking"]{GUI Installer}
 
 @defmodule[setup/plt-installer]{ The
-  @schememodname{setup/plt-installer} library in the setup collection
+  @schememodname[setup/plt-installer] library in the setup collection
   defines procedures for installing a @filepath{.plt} archive with a
   GUI (using the facilities of @schememodname[scheme/gui/base]).}
 
diff --git a/collects/scribblings/tools/tools.scrbl b/collects/scribblings/tools/tools.scrbl
index cda543796f..dae6cbf340 100644
--- a/collects/scribblings/tools/tools.scrbl
+++ b/collects/scribblings/tools/tools.scrbl
@@ -232,15 +232,15 @@ This is
   optional. If present, it must be a list of strings. Each
   string is displayed at the bottom of the language dialog
   when the corresponding language is selected.
-}  
+}
 @item/cap['drscheme-language-urls]{
 @index{drscheme-language-urls}
 This is
   optional. If present, it must be a list whose elements are
-  either strings or @scheme{#f}.
+  either strings or @scheme[#f].
   Clicking the corresponding language's name in
   the interactions window opens a web browser to the url.
-}  
+}
 @item/cap['drscheme-language-readers]{
 @index{drscheme-language-readers}
 This is optional. If
diff --git a/collects/syntax/scribblings/modcode.scrbl b/collects/syntax/scribblings/modcode.scrbl
index 5cb90bb790..b34817de1f 100644
--- a/collects/syntax/scribblings/modcode.scrbl
+++ b/collects/syntax/scribblings/modcode.scrbl
@@ -24,7 +24,7 @@
 Returns a compiled expression for the declaration of the module
 specified by @scheme[module-path-v].
 
-The @scheme[compiled-subdir] argument defaults to @scheme{compiled};
+The @scheme[compiled-subdir] argument defaults to @scheme["compiled"];
 it specifies the sub-directory to search for a compiled version of the
 module.