Merge pull request #1965 from wiredtiger/2.6.0-release2.6.0

Draft of 2.6.0 release

1 files changed, 15 insertions, 4 deletions

diff --git a/dist/s_string b/dist/s_string
index 2e226b21094..08d066f5929 100644
--- a/dist/s_string
+++ b/dist/s_string
@@ -16,7 +16,11 @@ type aspell > /dev/null 2>&1 || {
 }
 
 # replace:
-#	Create a replacement list of spelling words.
+#	Create a replacement list of spelling words. This is here because the
+# words we ignore changes over time and it's worth periodically collapsing
+# the list. Don't it too often, the list is correct for many different aspell
+# catalogs and generating a shorter list on any single system will break other
+# systems.
 replace() {
 	aspell --mode=ccpp --lang=en list < ../$1 |
 	sort -u |
@@ -26,11 +30,11 @@ replace() {
 # check:
 #	Check the spelling of an individual file.
 check() {
-	aspell --mode=ccpp --lang=en list < ../$1 |
+	aspell --lang=en $1 list < ../$2 |
 	sort -u |
 	comm -23 /dev/stdin s_string.ok > $t
 	test -s $t && {
-		echo "==== $1"
+		echo "==== $2"
 		cat $t
 	}
 }
@@ -59,8 +63,15 @@ while :
 	esac
 done
 
+# Check source files.
+for f in $l; do
+	check "--mode=ccpp" $f
+done
+
+l="NEWS"
+# Check other files.
 for f in $l; do
-	check $f
+	check "" $f
 done
 
 exit 0