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

basis/tools/deploy/test/17/17.factor

@@ -11,7 +11,7 @@ person "PEOPLE" {
     { "occupation" "OCCUPATION" { VARCHAR 256 } +not-null+ }
 } define-persistent
 
-: db-deploy-test ( -- ) ;
+: db-deploy-test ( -- )
     "test.db" temp-file <sqlite-db> [
         person recreate-table
         

extra/mason/report/report.factor

@@ -86,9 +86,16 @@ IN: mason.report
 
 : benchmarks-table ( assoc -- xml )
     [
-        1000000 /f
+        1,000,000,000 /f
         [XML <tr><td><-></td><td><-></td></tr> XML]
-    ] { } assoc>map [XML <h2>Benchmarks</h2> <table><-></table> XML] ;
+    ] { } assoc>map
+    [XML
+        <h2>Benchmarks</h2>
+        <table>
+            <tr><th>Benchmark</th><th>Time (seconds)</th></tr>
+            <->
+        </table>
+    XML] ;
 
 : successful-report ( -- )
     [