diff --git a/collects/compiler/embed.ss b/collects/compiler/embed.ss
index ac613f7bb0..0cee01092c 100644
--- a/collects/compiler/embed.ss
+++ b/collects/compiler/embed.ss
@@ -25,6 +25,7 @@
   (provide write-module-bundle
 	   create-embedding-executable
            embedding-executable-is-directory?
+           embedding-executable-is-actually-directory?
            embedding-executable-put-file-extension+style+filters
 	   embedding-executable-add-suffix))
 
diff --git a/collects/drscheme/acks.ss b/collects/drscheme/acks.ss
index b51bc73ab5..88af00b371 100644
--- a/collects/drscheme/acks.ss
+++ b/collects/drscheme/acks.ss
@@ -22,6 +22,7 @@
      "Ryan Culpepper, "
      "Carl Eastlund, "
      "Moy Easwaran, "
+     "Will Farr, "
      "Matthias Felleisen, "
      "Robby Findler, "
      "Kathi Fisler, "
@@ -42,6 +43,7 @@
      "Philippe Meunier, "
      "Scott Owens, "
      "Jamie Raymond, "
+     "Grant Rettke, "
      "Paul Schlie, "
      "Dorai Sitaram, "
      "Mike Sperber, "
diff --git a/collects/scribble/basic.ss b/collects/scribble/basic.ss
index f90073da9b..2c37884ed0 100644
--- a/collects/scribble/basic.ss
+++ b/collects/scribble/basic.ss
@@ -251,19 +251,20 @@
                                  (loop (cdr i) (cdr alpha)))]
                          [else (loop (cdr i) alpha)]))]))
         (list 'nbsp)
-        (apply append
-               (map (lambda (i)
-                      (define e (make-link-element
-                                 "indexlink" (commas (caddr i)) (car i)))
-                      (list (cond [(hash-table-get alpha-starts i #f)
-                                   => (lambda (let)
-                                        (make-element
-                                         (make-url-anchor
-                                          (format "alpha:~a" (char-upcase let)))
-                                         (list e)))]
-                                  [else e])
-                            'newline))
-                    l))))))
+        ((if (null? l) values cdr) ; drop one 'newline
+         (apply append
+                (map (lambda (i)
+                       (define e (make-link-element
+                                  "indexlink" (commas (caddr i)) (car i)))
+                       (list (make-element 'newline '("/n"))
+                             (cond [(hash-table-get alpha-starts i #f)
+                                    => (lambda (let)
+                                         (make-element
+                                          (make-url-anchor
+                                           (format "alpha:~a" (char-upcase let)))
+                                          (list e)))]
+                                   [else e])))
+                     l)))))))
   (list contents))
 
 ;; ----------------------------------------
diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss
index 309e2ba3e9..764e867cbd 100644
--- a/collects/scribble/html-render.ss
+++ b/collects/scribble/html-render.ss
@@ -457,6 +457,7 @@
               [(hspace) `((span ([class "hspace"])
                                 ,@(let ([str (content->string (element-content e))])
                                     (map (lambda (c) 'nbsp) (string->list str)))))]
+              [(newline) `((br))]
               [else (error 'html-render "unrecognized style symbol: ~e" style)])]
            [(string? style) 
             `((span ([class ,style]) ,@(super render-element e part ri)))]
@@ -507,7 +508,6 @@
                       [(centered) '((align "center"))]
                       [(at-right) '((align "right"))]
                       [(at-left)  '((align "left"))]
-                      [(index)    '((align "right"))]
                       [else null])
                   ,@(let ([a (and (list? (table-style t))
                                   (assoc 'style (table-style t)))])
@@ -601,8 +601,6 @@
                      (render-other (substring i (cdar m)) part ri))
               (ascii-ize i)))]
          [(eq? i 'mdash) `(" " ndash " ")]
-         [(eq? i 'hline) `((hr))]
-         [(eq? i 'newline) `((br))]
          [(symbol? i) (list i)]
          [else (list (format "~s" i))]))
 
diff --git a/collects/scribble/latex-render.ss b/collects/scribble/latex-render.ss
index da3920166e..5a90c10d08 100644
--- a/collects/scribble/latex-render.ss
+++ b/collects/scribble/latex-render.ss
@@ -180,6 +180,7 @@
                                 [else
                                  (printf "{\\mytexttt{~a}}"
                                          (regexp-replace* #rx"." s "~"))]))]
+                  [(newline) (printf "\\\\")]
                   [else (error 'latex-render "unrecognzied style symbol: ~s" style)])]
                [(string? style)
                 (wrap e style (regexp-match? #px"^scheme(?!error)" style))]
@@ -343,7 +344,6 @@
          [(string? i) (display-protected i)]
          [(symbol? i) (display
                        (case i
-                         [(newline) "\\\\"]
                          [(nbsp) "~"]
                          [(mdash) "---"]
                          [(ndash) "--"]
diff --git a/collects/scribble/scribble.css b/collects/scribble/scribble.css
index 63136677bc..cf3bde6803 100644
--- a/collects/scribble/scribble.css
+++ b/collects/scribble/scribble.css
@@ -16,7 +16,7 @@
 }
 
 /* Serif: */
-.main, .refcontent, .tocview, .tocsub, i {
+.main, .refcontent, .tocview, .tocsub, .inheritedlbl, i {
   font-family: serif;
 }
 
@@ -142,7 +142,7 @@ font-weight: bold;
 }
 
 .tocviewtitle {
-  font-size: 80%;
+  font-size: 82%;
   font-weight: bold;
   margin: 0.2em 0.2em 0.2em 0.2em;
 }
@@ -152,7 +152,7 @@ font-weight: bold;
 }
 
 .tocviewlist td {
-  font-size: 80%;
+  font-size: 82%;
   vertical-align: top;
 }
 
@@ -171,15 +171,16 @@ font-weight: bold;
 }
 
 .tocsublinknumber {
-  font-size: 80%;
+  font-size: 82%;
 }
 
 .tocsublink {
+  font-size: 82%;
   text-decoration: none;
 }
 
 .tocsubseclink {
-  font-size: 80%;
+  font-size: 82%;
   text-decoration: none;
 }
 
@@ -189,7 +190,7 @@ font-weight: bold;
 }
 
 .tocsubtitle {
-  font-size: 80%;
+  font-size: 82%;
   font-style: italic;
   margin: 0.2em 0.2em 0.2em 0.2em;
 }
@@ -205,6 +206,7 @@ font-weight: bold;
 }
 
 .inherited td {
+  font-size: 82%;
   padding-left: 1em;
   text-indent: -0.8em;
   padding-right: 0.2em;
@@ -212,7 +214,6 @@ font-weight: bold;
 
 .inheritedlbl {
   font-style: italic;
-  font-size: 85%;
 }
 
 /* ---------------------------------------- */
@@ -441,13 +442,13 @@ i {
   margin-right: 0.3em;
 }
 
-.compact li p { 
-  margin: 0 0 0 0;
-  padding: 0 0 0 0;
-}
-
 /* A hack, inserted to break some Scheme ids: */
 .mywbr {
   width: 0;
   font-size: 1px;
 }
+
+.compact li p { 
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}
diff --git a/collects/scribblings/mzc/api.scrbl b/collects/scribblings/mzc/api.scrbl
index 825609c2a5..2d03ed14ce 100644
--- a/collects/scribblings/mzc/api.scrbl
+++ b/collects/scribblings/mzc/api.scrbl
@@ -6,6 +6,7 @@
                      compiler/compiler
                      compiler/sig
                      compiler/compiler-unit
+                     compiler/option
                      compiler/option-unit
                      compiler/comp-unit
                      launcher/launcher))
diff --git a/collects/scribblings/mzc/exe-api.scrbl b/collects/scribblings/mzc/exe-api.scrbl
index 622969e900..28966eaf17 100644
--- a/collects/scribblings/mzc/exe-api.scrbl
+++ b/collects/scribblings/mzc/exe-api.scrbl
@@ -10,6 +10,9 @@
                      compiler/comp-unit
                      compiler/distribute
                      compiler/bundle-dist
+                     compiler/embed
+                     compiler/embed-sig
+                     compiler/embed-unit
                      scheme/runtime-path
                      launcher/launcher))
 
diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl
index 0fad019d69..dae113de4f 100644
--- a/collects/scribblings/scribble/struct.scrbl
+++ b/collects/scribblings/scribble/struct.scrbl
@@ -339,8 +339,9 @@ The @scheme[style] field is normally either
 
  @item{one of the symbols that all renderers recognize: @scheme['tt],
        @scheme['italic], @scheme['bold], @scheme['sf],
-       @scheme['subscript], @scheme['superscript], or
-       @scheme['hspace];}
+       @scheme['subscript], @scheme['superscript], @scheme['hspace],
+       or @scheme['newline] (which renders a line break independent of
+       the @scheme[content]);}
 
  @item{a list of the form @scheme[(list 'color _name)] or
        @scheme[(list 'color _byte _byte _byte)] to set the text color,