Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/.gitignore b/.gitignore
index 435595f502cbdcec6f019cae08b41d2d1d4555dc..22dda8efb4b7d80d0abffccb5a77eeb385b6d221 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ build-support/wordsize
 *.bak
 .#*
 *.swo
+checksums.txt

diff --git a/basis/html/html-docs.factor b/basis/html/html-docs.factor
index 8c4b2934d05ef2ad0c4060c3e3d3844da4510631..83fe4d3a631ef87fa54730578745d8641932bb50 100644 (file)
--- a/basis/html/html-docs.factor
+++ b/basis/html/html-docs.factor
@@ -1,6 +1,7 @@
+USING: help.markup help.syntax strings xml.data ;
 IN: html
-USING: help.markup help.syntax strings ;
 
 HELP: simple-page
-{ $values { "title" string } { "head" "XML data" } { "body" "XML data" } }
-{ $description "Constructs a simple XHTML page with a " { $snippet "head" } " and " { $snippet "body" } " tag. The given XML data is spliced into the two child tags, and a title is also added to the head tag." } ;
\ No newline at end of file
+{ $values { "title" string } { "head" "XML data" } { "body" "XML data" }
+{ "xml" xml } }
+{ $description "Constructs a simple XHTML page with a " { $snippet "head" } " and " { $snippet "body" } " tag. The given XML data is spliced into the two child tags, and a title is also added to the head tag." } ;