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

diff --combined basis/db/tuples/tuples-docs.factor
index 2c5db1c90d904a3243d61692fdbc8a833669cfa0,ebf86371a7b48031dcbc80ed54fbfa3ce76edd2d..3f77f9abaf6b51b6e5aa2f2f628125ee48147f85
--- 1/basis/db/tuples/tuples-docs.factor
--- 2/basis/db/tuples/tuples-docs.factor
+++ b/basis/db/tuples/tuples-docs.factor
@@@ -51,7 -51,7 +51,7 @@@ HELP: <insert-user-assigned-statement
  HELP: <select-by-slots-statement>
  { $values
       { "tuple" tuple } { "class" class }
 -     { "tuple" tuple } }
 +     { "statement" tuple } }
  { $description "A database-specific hook for generating the SQL for a select statement." } ;
  
  HELP: <update-tuple-statement>
@@@ -267,7 -267,7 +267,7 @@@ T{ boo
  { $list
      "Make a new tuple to represent your data"
      { "Map the Factor types to the database types with " { $link define-persistent } }
-     { "Make a custom database combinator (see" { $link "db-custom-database-combinators" } ") to open your database and run a " { $link quotation } }
+     { "Make a custom database combinator (see " { $link "db-custom-database-combinators" } ") to open your database and run a " { $link quotation } }
      { "Create a table with " { $link create-table } ", " { $link ensure-table } ", or " { $link recreate-table } }
      { "Start making and storing objects with " { $link insert-tuple } ", " { $link update-tuple } ", " { $link delete-tuples } ", and " { $link select-tuples } }
  } ;