Shuffle upgrading doc and spelling updates.

3 files changed, 24 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index 172f1b6943a..8fd06136b18 100644
--- a/NEWS
+++ b/NEWS
@@ -230,7 +230,7 @@ refs SERVER-17424
   refs WT-1745
 
 * Fix when aggregation is set on statistics fields. Fixes problems with
-  visualising statistics via wtstats graphs.
+  visualizing statistics via wtstats graphs.
   refs WT-1742
 
 * Change how checkpoints use empty blocks in on-disk files. Use a first-fit
diff --git a/dist/s_string.ok b/dist/s_string.ok
index f089f1944f3..d57b19aa029 100644
--- a/dist/s_string.ok
+++ b/dist/s_string.ok
@@ -215,6 +215,7 @@ ObWgfvgw
 Obama
 PARAM
 POSIX
+PREDEFINE
 PRIu
 PTHREAD
 PTR
@@ -345,6 +346,7 @@ argv
 async
 asyncopp
 asyncops
+atomicity
 autocommit
 autoconf
 automake
@@ -638,6 +640,7 @@ kvraw
 kvs
 kvsbdb
 lang
+latencies
 lbrace
 lbracket
 len
@@ -746,6 +749,7 @@ onpage
 oo
 opendir
 openfile
+optimizations
 optype
 os
 ovfl
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index 0e9563e36b5..36ce2debace 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -3,6 +3,21 @@
 @section version_260 Upgrading to Version 2.6.0
 
 <dl>
+<dt>LZ4 compression</dt>
+<dd>
+The LZ4 compression support has been updated in this release in non-backward
+compatible ways; <b>tables and files compressed using LZ4 compression with
+WiredTiger 2.5.3 must be dumped then re-loaded using WiredTiger 2.6.0.</b>
+</dd>
+
+<dt>wiredtiger_open file manager configuration changes</dt>
+<dd>
+The configuration settings related to file handle management have changed
+significantly in this release. If your application uses the file_manager
+configuration setting, please refer to the API documentation for the latest
+settings.
+</dd>
+
 <dt>Statistic change</dt>
 <dd>
 The statistic "log read operations" was removed.  The function that
@@ -23,19 +38,11 @@ triggered, can be configured using the \c file_manager configuration
 values to the ::wiredtiger_open call.
 </dd>
 
-<dt>LZ4 compression</dt>
+<dt>Table drop changes</dt>
 <dd>
-The LZ4 compression support has been updated in this release in non-backward
-compatible ways; <b>tables and files compressed using LZ4 compression with
-WiredTiger 2.5.3 must be dumped then re-loaded using WiredTiger 2.6.0.</b>
-</dd>
-
-<dt>wiredtiger_open file manager configuration changes</dt>
-<dd>
-The configuration settings related to file handle management have changed
-significantly in this release. If your application uses the file_manager
-configuration setting, please refer to the API documentation for the latest
-settings.
+There has been a functionality change to the WT_SESSION::drop API when the
+\c force configuration option is included. The table is now dropped in the
+background and does not flush data from cache.
 </dd>
 
 </dl><hr>