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

diff --combined basis/farkup/farkup.factor
index 5c446c6a22e5e901e31c1967027233fde6639cc7,ebd0bdb7487f0404721aa6b5f07ceee0d992216e..a752694764573c219a8afcc7bcf80a83c8ab2ffb
mode 100644,100755..100755
--- 1/basis/farkup/farkup.factor
--- 2/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@@ -2,7 -2,7 +2,7 @@@
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors arrays combinators html.elements io
  io.streams.string kernel math namespaces peg peg.ebnf
 -sequences sequences.deep strings xml.entities xml.interpolate
 +sequences sequences.deep strings xml.entities xml.literals
  vectors splitting xmode.code2html urls.encoding xml.data
  xml.writer ;
  IN: farkup
@@@ -34,7 -34,7 +34,7 @@@ TUPLE: line 
  TUPLE: line-break ;
  
  : absolute-url? ( string -- ? )
-     { "http://" "https://" "ftp://" } [ head? ] with contains? ;
+     { "http://" "https://" "ftp://" } [ head? ] with any? ;
  
  : simple-link-title ( string -- string' )
      dup absolute-url? [ "/" split1-last swap or ] unless ;
@@@ -162,7 -162,7 +162,7 @@@ stand-alon
  : check-url ( href -- href' )
      {
          { [ dup empty? ] [ drop invalid-url ] }
-         { [ dup [ 127 > ] contains? ] [ drop invalid-url ] }
+         { [ dup [ 127 > ] any? ] [ drop invalid-url ] }
          { [ dup first "/\\" member? ] [ drop invalid-url ] }
          { [ CHAR: : over member? ] [ dup absolute-url? [ drop invalid-url ] unless ] }
          [ relative-link-prefix get prepend "" like ]

diff --combined basis/syndication/syndication.factor
index 13312d6cf2691b073553c90a3982e71f7b393bda,76da6f049d491c314932ce52a0bef4d400bf94a0..4cd5ef17b36d66047ec9229d289987bfe300d6c8
mode 100644,100755..100755
--- 1/basis/syndication/syndication.factor
--- 2/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor
@@@ -4,7 -4,7 +4,7 @@@
  USING: xml.utilities kernel assocs math.order
      strings sequences xml.data xml.writer
      io.streams.string combinators xml xml.entities.html io.files io
 -    http.client namespaces make xml.interpolate hashtables
 +    http.client namespaces make xml.literals hashtables
      calendar.format accessors continuations urls present ;
  IN: syndication
  
@@@ -80,7 -80,7 +80,7 @@@ TUPLE: entry title url description dat
          [ atom-entry-link >>url ]
          [
              { "content" "summary" } any-tag-named
-             dup children>> [ string? not ] contains?
+             dup children>> [ string? not ] any?
              [ children>> xml>string ]
              [ children>string ] if >>description
          ]