Merged changes from main branch

cf8a03e8 · peastman · f7f70136 · 31d02cdc · f7f70136 · f7f70136
Commit cf8a03e8 authored Mar 12, 2014 by peastman
20 changed files
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/pdf_index.frm
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/pdf_index.frm
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.MYD
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.MYD
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.MYI
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.MYI
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.frm
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs.frm
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.MYD
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.MYD
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.MYI
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.MYI
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.frm
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/refs_ext.frm
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.MYD
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.MYD
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.MYI
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.MYI
--- a/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.frm
+++ b/docs/UsersGuide/References.Data/Trash/Trash.Data/rdb/terms.frm
--- a/docs/UsersGuide/References.Data/Trash/Trash.enl
+++ b/docs/UsersGuide/References.Data/Trash/Trash.enl
--- a/docs/UsersGuide/References.Data/rdb/csort.MYD
+++ b/docs/UsersGuide/References.Data/rdb/csort.MYD
--- a/docs/UsersGuide/References.Data/rdb/csort.MYI
+++ b/docs/UsersGuide/References.Data/rdb/csort.MYI
--- a/docs/UsersGuide/References.Data/rdb/csort.frm
+++ b/docs/UsersGuide/References.Data/rdb/csort.frm
--- a/docs/UsersGuide/References.Data/rdb/db.opt
+++ b/docs/UsersGuide/References.Data/rdb/db.opt
-default-character-set=utf8
-default-collation=utf8_general_ci
--- a/docs/UsersGuide/References.Data/rdb/jterms.MYD
+++ b/docs/UsersGuide/References.Data/rdb/jterms.MYD
--- a/docs/UsersGuide/References.Data/rdb/jterms.MYI
+++ b/docs/UsersGuide/References.Data/rdb/jterms.MYI
--- a/docs/UsersGuide/References.Data/rdb/jterms.frm
+++ b/docs/UsersGuide/References.Data/rdb/jterms.frm
--- a/docs/UsersGuide/References.Data/rdb/misc.MYD
+++ b/docs/UsersGuide/References.Data/rdb/misc.MYD
--- a/docs/UsersGuide/References.Data/rdb/misc.MYI
+++ b/docs/UsersGuide/References.Data/rdb/misc.MYI