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

diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor
index 11ee46c2273958ab456e95d95e564d220fac421c..9a69614766843c5d9c31958072f88ddcf2471a5b 100644 (file)
--- a/basis/command-line/command-line-docs.factor
+++ b/basis/command-line/command-line-docs.factor
@@ -91,7 +91,7 @@ ARTICLE: "standard-cli-args" "Command line switches for general usage"
 } ;
 
 ARTICLE: "factor-boot-rc" "Bootstrap initialization file"
-"The botstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
+"The bootstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
 $nl
 "A word to run this file from an existing Factor session:"
 { $subsections run-bootstrap-init }

diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index ec190fed187da15b7c51c00c970a1b1cc855f3c2..9927486eb7b7167d5609ec13afa57d1a2cbf522f 100644 (file)
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,11 +1,11 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.smart formatting fry io kernel macros math
-math.functions math.statistics memory sequences tools.time ;
+USING: combinators.smart formatting fry io kernel macros math math.functions
+math.statistics memory sequences tools.time ;
 IN: project-euler.ave-time
 
 MACRO: collect-benchmarks ( quot n -- seq )
-    swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 1000 / ] replicate ] ;
+    swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 6 10^ / ] replicate ] ;
 
 : ave-time ( quot n -- )
     [