Merge branch 'unicode' of git://factorcode.org/git/littledan into unicode

diff --git a/core/io/encodings/utf8/utf8-docs.factor b/core/io/encodings/utf8/utf8-docs.factor
index 3e901ec83b454467c6930cd6609ae9660a038ecc..dbbc193a02f91fb461cb36f33c5eeb35f75dafa0 100755 (executable)
--- a/core/io/encodings/utf8/utf8-docs.factor
+++ b/core/io/encodings/utf8/utf8-docs.factor
@@ -6,6 +6,6 @@ ARTICLE: "io.encodings.utf8" "Working with UTF8-encoded data"
 { $subsection utf8 } ;
 
 HELP: utf8
-{ $class-description "This is the class of encoding tuples which denote a UTF-8 encoding. You can pass this class symbol as an encoding descriptor to words like " { $link <file-reader> } " and " { $link encode-string } ". This conforms to the " { $link "encodings-protocol" } "." } ;
+{ $class-description "This is the class of encoding tuples which denote a UTF-8 encoding. This conforms to the " { $link "encodings-protocol" } "." } ;
 
 ABOUT: "io.encodings.utf8"

diff --git a/extra/io/encodings/ascii/ascii.factor b/extra/io/encodings/ascii/ascii.factor
index f310f53e299caf15abcb458a7281e6efe72f42b0..fdefc356344a530acd5a3af460dbdab016d06e14 100644 (file)
--- a/extra/io/encodings/ascii/ascii.factor
+++ b/extra/io/encodings/ascii/ascii.factor
@@ -4,7 +4,7 @@ USING: io io.encodings strings kernel math sequences byte-arrays io.encodings ;
 IN: io.encodings.ascii
 
 : encode-check<= ( string stream max -- )
-    [ pick > [ encode-error ] [ stream-write1 ] if ] 2curry each ;
+    [ pick <= [ encode-error ] [ stream-write1 ] if ] 2curry each ;
 
 TUPLE: ascii ;