diff --git a/collects/scribblings/framework/frame.scrbl b/collects/scribblings/framework/frame.scrbl
index 85387802..198731f4 100644
--- a/collects/scribblings/framework/frame.scrbl
+++ b/collects/scribblings/framework/frame.scrbl
@@ -539,7 +539,7 @@ framework)) @(require (for-label scheme/gui)) @(require
 
 
 
-    Calls @scheme[(make-object #, @method[frame:editor<%> get-editor%])].
+    Calls @scheme[(make-object @#,method[frame:editor<%> get-editor%])].
 
   }
   @defmethod*[(((revert) void))]{
diff --git a/collects/scribblings/framework/framework.scrbl b/collects/scribblings/framework/framework.scrbl
index 514b3cf9..8eac4c39 100644
--- a/collects/scribblings/framework/framework.scrbl
+++ b/collects/scribblings/framework/framework.scrbl
@@ -17,7 +17,7 @@ program on top of the @scheme[scheme/gui] library.
 
 @itemize[
 
-@item{@scheme[(require #, @schememodname[framework])]
+@item{@scheme[(require @#,schememodname[framework])]
 
   This library provides all of the definitions and syntax
   described in this manual.
@@ -45,19 +45,19 @@ program on top of the @scheme[scheme/gui] library.
 @item{
  @bold{Test Suite Engine}
 
-@scheme[(require #, @schememodname[framework/test])]
+@scheme[(require @#,schememodname[framework/test])]
 
 This library provides all of the definitions beginning with
 @scheme[test:] described in this manual.
 }
 @item{ @bold{GUI Utilities}
-@scheme[(require #, @schememodname[framework/gui-utils])]
+@scheme[(require @#,schememodname[framework/gui-utils])]
     
     This libraries provides all of the definitions beginning
     with @scheme[gui-utils:] described in this manual.
 }
 @item{ @bold{Preferences}
-@scheme[(require #, @schememodname[framework/preferences])]
+@scheme[(require @#,schememodname[framework/preferences])]
     
   This library provides a subset of the names of the
   @tt{framework.ss} library, namely those for
diff --git a/collects/scribblings/gui/editor-overview.scrbl b/collects/scribblings/gui/editor-overview.scrbl
index dcbb0602..b19728ba 100644
--- a/collects/scribblings/gui/editor-overview.scrbl
+++ b/collects/scribblings/gui/editor-overview.scrbl
@@ -120,7 +120,7 @@ We can insert the old text editor (which we recently removed from the
  creating an editor snip:
 
 @schemeblock[
-(define s (make-object editor-snip% t)) (code:comment #, @t{@scheme[t] is the old text editor})
+(define s (make-object editor-snip% t)) (code:comment @#,t{@scheme[t] is the old text editor})
 (send pb #,(:: editor<%> insert) s)
 ]
 
@@ -128,7 +128,7 @@ An individual snip cannot be inserted into different editors at the
  same time, or inserted multiple times in the same editor:
 
 @schemeblock[
-(send pb #,(:: editor<%> insert) s) (code:comment #, @t{no effect})
+(send pb #,(:: editor<%> insert) s) (code:comment @#,t{no effect})
 ]
 
 However, we can make a deep copy of the snip and insert the copy into
diff --git a/collects/scribblings/gui/frame-class.scrbl b/collects/scribblings/gui/frame-class.scrbl
index ae784988..927307c6 100644
--- a/collects/scribblings/gui/frame-class.scrbl
+++ b/collects/scribblings/gui/frame-class.scrbl
@@ -250,9 +250,9 @@ If the event does not correspond to a complete shortcut combination,
 Returns the result of
 
 @schemeblock[
-(or (send this #, @method[frame% on-menu-char] event)
-    (send this #, @method[top-level-window<%> on-system-menu-char] event)
-    (send this #, @method[top-level-window<%> on-traverse-char] event))
+(or (send this @#,method[frame% on-menu-char] event)
+    (send this @#,method[top-level-window<%> on-system-menu-char] event)
+    (send this @#,method[top-level-window<%> on-traverse-char] event))
 ]
 }
 
diff --git a/collects/scribblings/gui/text-field-class.scrbl b/collects/scribblings/gui/text-field-class.scrbl
index 555e1bef..3519d102 100644
--- a/collects/scribblings/gui/text-field-class.scrbl
+++ b/collects/scribblings/gui/text-field-class.scrbl
@@ -103,13 +103,13 @@ For a text field, the most useful methods of a @scheme[text%] object
  are the following:
 @itemize[
  
- @item{@scheme[(send a-text #, @method[text% get-text])] returns
+ @item{@scheme[(send a-text @#,method[text% get-text])] returns
  the current text of the editor.}
 
- @item{@scheme[(send a-text #, @method[text% erase])] deletes all text from
+ @item{@scheme[(send a-text @#,method[text% erase])] deletes all text from
  the editor.}
 
- @item{@scheme[(send a-text #, @method[text% insert] _str)] inserts
+ @item{@scheme[(send a-text @#,method[text% insert] _str)] inserts
  @scheme[_str] into the editor at the current caret position.}
 
 ]
diff --git a/collects/scribblings/gui/win-overview.scrbl b/collects/scribblings/gui/win-overview.scrbl
index 30d3195c..674db724 100644
--- a/collects/scribblings/gui/win-overview.scrbl
+++ b/collects/scribblings/gui/win-overview.scrbl
@@ -12,10 +12,10 @@ The PLT Scheme windowing toolbox provides the basic building blocks of GUI
  @scheme[frame%] class:
 
 @schemeblock[
-(code:comment #, @t{Make a frame by instantiating the @scheme[frame%] class})
+(code:comment @#,t{Make a frame by instantiating the @scheme[frame%] class})
 (define frame (new frame% [label "Example"]))
  
-(code:comment #, @t{Show the frame by calling its @method[top-level-window<%> show] method})
+(code:comment @#,t{Show the frame by calling its @method[top-level-window<%> show] method})
 (send frame #,(:: top-level-window<%> show) #t)
 ]
 
@@ -27,21 +27,21 @@ The built-in classes provide various mechanisms for handling GUI
  clicks the button, the message changes:
 
 @schemeblock[
-(code:comment #, @t{Make a frame by instantiating the @scheme[frame%] class})
+(code:comment @#,t{Make a frame by instantiating the @scheme[frame%] class})
 (define frame (new frame% [label "Example"]))
 
-(code:comment #, @t{Make a static text message in the frame})
+(code:comment @#,t{Make a static text message in the frame})
 (define msg (new message% [parent frame]
                           [label "No events so far..."]))
 
-(code:comment #, @t{Make a button in the frame})
+(code:comment @#,t{Make a button in the frame})
 (new button% [parent frame] 
              [label "Click Me"]
-             (code:comment #, @t{Callback procedure for a button click:})
+             (code:comment @#,t{Callback procedure for a button click:})
              (callback (lambda (button event) 
                          (send msg #,(method message% set-label) "Button click"))))
 
-(code:comment #, @t{Show the frame by calling its @scheme[show] method})
+(code:comment @#,t{Show the frame by calling its @scheme[show] method})
 (send frame #,(:: top-level-window<%> show) #t)
 ]
 
@@ -63,19 +63,19 @@ If a window receives multiple kinds of events, the events are
  that handles mouse and keyboard events:
 
 @schemeblock[
-(code:comment #, @t{Derive a new canvas (a drawing window) class to handle events})
+(code:comment @#,t{Derive a new canvas (a drawing window) class to handle events})
 (define my-canvas%
-  (class canvas% (code:comment #, @t{The base class is @scheme[canvas%]})
-    (code:comment #, @t{Define overriding method to handle mouse events})
+  (class canvas% (code:comment @#,t{The base class is @scheme[canvas%]})
+    (code:comment @#,t{Define overriding method to handle mouse events})
     (define/override (#,(:: canvas<%> on-event) event)
       (send msg #,(:: message% set-label) "Canvas mouse"))
-    (code:comment #, @t{Define overriding method to handle keyboard events})
+    (code:comment @#,t{Define overriding method to handle keyboard events})
     (define/override (#,(:: canvas<%> on-char) event)
       (send msg #,(:: message% set-label) "Canvas keyboard"))
-    (code:comment #, @t{Call the superclass init, passing on all init args})
+    (code:comment @#,t{Call the superclass init, passing on all init args})
     (super-new)))
 
-(code:comment #, @t{Make a canvas that handles events in the frame})
+(code:comment @#,t{Make a canvas that handles events in the frame})
 (new my-canvas% [parent frame])
 ]
 
@@ -344,23 +344,23 @@ The built-in container classes include horizontal panels (and panes),
 with the following program:
 
 @schemeblock[
-(code:comment #, @t{Create a dialog})
+(code:comment @#,t{Create a dialog})
 (define dialog (instantiate dialog% ("Example")))
 
-(code:comment #, @t{Add a text field to the dialog})
+(code:comment @#,t{Add a text field to the dialog})
 (new text-field% [parent dialog] [label "Your name"])
 
-(code:comment #, @t{Add a horizontal panel to the dialog, with centering for buttons})
+(code:comment @#,t{Add a horizontal panel to the dialog, with centering for buttons})
 (define panel (new horizontal-panel% [parent dialog]
                                      [alignment '(center center)]))
 
-(code:comment #, @t{Add @onscreen{Cancel} and @onscreen{Ok} buttons to the horizontal panel})
+(code:comment @#,t{Add @onscreen{Cancel} and @onscreen{Ok} buttons to the horizontal panel})
 (new button% [parent panel] [label "Cancel"])
 (new button% [parent panel] [label "Ok"])
 (when (system-position-ok-before-cancel?)
   (send panel #,(:: area-container<%> change-children) reverse))
 
-(code:comment #, @t{Show the dialog})
+(code:comment @#,t{Show the dialog})
 (send dialog #,(:: dialog% show) #t)
 ]
 
@@ -883,7 +883,7 @@ Whenever the system dispatches an event, the call to the handler
 
 @def+int[
 (define (block f)
-  (code:comment #, @t{calls @scheme[f] and returns void if @scheme[f] tries to escape})
+  (code:comment @#,t{calls @scheme[f] and returns void if @scheme[f] tries to escape})
   (let ([done? #f])
     (let/ec k
       (dynamic-wind