Merge commit 'dharmatech/master'

extra/multiline/multiline-docs.factor

@@ -1,4 +1,6 @@
-USING: help.markup help.syntax multiline ;
+USING: help.markup help.syntax ;
+
+IN: multiline
 
 HELP: STRING:
 { $syntax "STRING: name\nfoo\n;" }

extra/multiline/multiline.factor

@@ -16,7 +16,7 @@ IN: multiline
 
 : STRING:
     CREATE dup reset-generic
-    parse-here 1quotation define-compound ; parsing
+    parse-here 1quotation define ; parsing
 
 : (parse-multiline-string) ( start-index end-text -- end-index )
     lexer get line-text 2dup start

extra/odbc/odbc-docs.factor

@@ -1,6 +1,8 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.syntax help.markup odbc threads ;
+USING: help.syntax help.markup threads ;
+
+IN: odbc
 
 HELP: odbc-init 
 { $values { "env" "an ODBC environment handle" } } 

misc/factor.el

@@ -102,7 +102,7 @@
   (setq font-lock-defaults
 	'(factor-font-lock-keywords nil nil nil nil))
   (set-syntax-table factor-mode-syntax-table)
-  (run-hooks 'factor-mode-hooks))
+  (run-hooks 'factor-mode-hook))
 
 (add-to-list 'auto-mode-alist '("\\.factor\\'" . factor-mode))