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

Conflicts:
	core/sequences/sequences-docs.factor

diff --combined core/sequences/sequences-docs.factor
index a33aaa21d26e565b0c171e61376f9f6d1ff402de,2b0a07739a305cdfa33cea7bf168de96de53331f..9f570f97d5af49645c975d0b328f05c8fadbafea
--- 1/core/sequences/sequences-docs.factor
--- 2/core/sequences/sequences-docs.factor
+++ b/core/sequences/sequences-docs.factor
@@@ -999,7 -999,7 +999,7 @@@ HELP: pushe
       { "quot" quotation } { "accum" vector } }
  { $description "Creates a new vector to accumulate the values which return true for a predicate.  Returns a new quotation which accepts an object to be tested and stored in the accumulator if the test yields true. The accumulator is left on the stack for convenience." }
  { $example "! Find all the even numbers:" "USING: prettyprint sequences math kernel ;"
 -           "10 [ even? ] pusher [ each ] dip ."
 +           "10 iota [ even? ] pusher [ each ] dip ."
             "V{ 0 2 4 6 8 }"
  }
  { $notes "Used to implement the " { $link filter } " word. Compare this word with " { $link accumulator } ", which is an unfiltering version." } ;
@@@ -1241,7 -1241,7 +1241,7 @@@ HELP: binary-reduc
  { $description "Like " { $link reduce } ", but splits the sequence in half recursively until each sequence is small enough, and calls the quotation on these smaller sequences. If the quotation computes values that depend on the size of their input, such as bignum arithmetic, then this algorithm can be more efficient than using " { $link reduce } "." }
  { $examples "Computing factorial:"
      { $example "USING: prettyprint sequences math ;"
 -    "40 rest-slice 1 [ * ] binary-reduce ."
 +    "40 iota rest-slice 1 [ * ] binary-reduce ."
      "20397882081197443358640281739902897356800000000" }
  } ;
  
@@@ -1409,16 -1409,21 +1409,21 @@@ ARTICLE: "virtual-sequences" "Virtual s
  "A virtual sequence is an implementation of the " { $link "sequence-protocol" } " which does not store its own elements, and instead computes them, either from scratch or by retrieving them from another sequence."
  $nl
  "Implementations include the following:"
- { $subsections reversed slice iota }
- "Virtual sequences can be implemented with the " { $link "virtual-sequences-protocol" } ", by translating an index in the virtual sequence into an index in another sequence." ;
+ { $subsections reversed slice }
+ "Virtual sequences can be implemented with the " { $link "virtual-sequences-protocol" } ", by translating an index in the virtual sequence into an index in another sequence."
+ { $see-also "sequences-integers" } ;
  
  ARTICLE: "sequences-integers" "Counted loops"
- "Integers do not support the sequence protocol, but can be turned into virtual sequences using the " { $link iota } " word. For example, the integer 3, when wrapped in an " { $link iota } ", contains the elements 0, 1, and 2. This is very useful for performing counted loops. Note that since this is a virtual sequence, the elements of the sequence are not actually stored, but calculated on demand."
+ "A virtual sequence is defined for iterating over integers from zero."
+ { $subsection iota }
+ "For example, calling " { $link iota } " on the integer 3 produces a sequence containing the elements 0, 1, and 2. This is very useful for performing counted loops."
  $nl
- "As another example, the " { $link each } " combinator, given a sequence, simply calls a quotation on each element of the sequence, ranging from 0 up to the integer wrapped by iota:"
+ "This means the " { $link each } " combinator, given an integer, simply calls a quotation that number of times, pushing a counter on each iteration that ranges from 0 up to that integer:"
  { $example "3 iota [ . ] each" "0\n1\n2" }
  "A common idiom is to iterate over a sequence, while also maintaining a loop counter. This can be done using " { $link each-index } ", " { $link map-index } " and " { $link reduce-index } "."
  $nl
+ "Combinators that produce new sequences, such as " { $link map } ", will output an array if the input is an instance of " { $link iota } "."
+ $nl
  "More elaborate counted loops can be performed with " { $link "math.ranges" } "." ;
  
  ARTICLE: "sequences-if" "Control flow with sequences"