Change "upsert" to "conflict"
Add other languages; fixes #424
Document array_limit; closes #433
Change "upsert" to "conflict"
Add other languages; fixes #424
Document array_limit; closes #433
Update migrations for v1.14; fixes #267
Merge branch 'v1.14' of github.com:rethinkdb/docs into v1.14
Merge branch 'issue-267-migration' into v1.14
Change "upsert" to "conflict"
Add other languages; fixes #424
Document array_limit; closes #433
Update migrations for v1.14; fixes #267
Merge branch 'v1.14' of github.com:rethinkdb/docs into v1.14
Change return_vals -> return_changes; fixes #440
Add info about downloading older versions; fixes #260
Adding a couple missed changes in #440
Add documentation for r.binary
Add documentation for r.binary
Merge branch 'issue-432-rbinary' of https://github.com/rethinkdb/docs into issue-432-rbinary