Merge branch 'master' of git://github.com/mrjbq7/factor

extra/formatting/formatting-docs.factor

@@ -49,27 +49,27 @@ HELP: printf
 }
 { $examples 
     { $example
-        "USING: printf ;"
+        "USING: formatting ;"
         "123 \"%05d\" printf"
         "00123" }
     { $example
-        "USING: printf ;"
+        "USING: formatting ;"
         "HEX: ff \"%04X\" printf"
         "00FF" }
     { $example
-        "USING: printf ;"
+        "USING: formatting ;"
         "1.23456789 \"%.3f\" printf"
         "1.235" }
     { $example 
-        "USING: printf ;"
+        "USING: formatting ;"
         "1234567890 \"%.5e\" printf"
         "1.23457e+09" }
     { $example
-        "USING: printf ;"
+        "USING: formatting ;"
         "12 \"%'#4d\" printf"
         "##12" }
     { $example
-        "USING: printf ;"
+        "USING: formatting ;"
         "1234 \"%+d\" printf"
         "+1234" }
 } ;
@@ -109,6 +109,12 @@ HELP: strftime
         { "%Z"     "Time zone name (no characters if no time zone exists)." }
         { "%%"     "A literal '%' character." }
     } 
+} 
+{ $examples 
+    { $example
+        "USING: calendar formatting ;"
+        "now \"%c\" strftime"
+        "Mon Dec 15 14:40:43 2008" }
 } ;
 
 ARTICLE: "formatting" "Formatted printing"

extra/webapps/irc-log/irc-log.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: calendar kernel http.server.dispatchers prettyprint
-sequences printf furnace.actions html.forms accessors
+sequences formatting furnace.actions html.forms accessors
 furnace.redirection ;
 IN: webapps.irc-log