Merge branch 'master' into remove-sentence

bin/build-site.js

@@ -30,7 +30,7 @@ function buildCSS() {
 }
 
 function buildJekyll(path) {
-  // Dont rebuild on website artifacts being written
+  // Don't rebuild on website artifacts being written
   if (path && /^_site/.test(path.relative)) {
     return;
   }

docs/_posts/2014-04-01-pouchdb-2.1.0.md

@@ -26,6 +26,6 @@ This release contains a database migration, which means that once you upgrade yo
  * Improve error reporting from replicator ([#1714](http://github.com/daleharvey/pouchdb/issues/1714))
  * Switch to readAsArrayBuffer for IE binary support ([#1667](http://github.com/daleharvey/pouchdb/issues/1667))
  * Add `npm run shell` for quick shell experimenting ([#1610](http://github.com/daleharvey/pouchdb/issues/1610))
- * Ensure we dont lose data when browsers upgrade from WebSQL to IDB ([#1289](http://github.com/daleharvey/pouchdb/issues/1289))
+ * Ensure we don't lose data when browsers upgrade from WebSQL to IDB ([#1289](http://github.com/daleharvey/pouchdb/issues/1289))
 
 ###### [Complete list of changes](https://github.com/daleharvey/pouchdb/compare/2.0.1...2.1.0)

docs/_posts/2015-08-03-pouchdb-4.0.0-ballast-overboard.md

@@ -72,7 +72,7 @@ replication.on('paused', doneFun);
 * Fix attachment length for stubs ([#3963](https://github.com/pouchdb/pouchdb/issues/3963))
 * Reduce the number of checkpoint mismatches ([#4009](https://github.com/pouchdb/pouchdb/issues/4009))
 * Fallback from checkpoint mismatch correctly (less replication start from the beginning) ([#3999](https://github.com/pouchdb/pouchdb/issues/3999))
-* Dont fail replication when attachment request fails ([#4021](https://github.com/pouchdb/pouchdb/issues/4021))
+* Don't fail replication when attachment request fails ([#4021](https://github.com/pouchdb/pouchdb/issues/4021))
 * Fix check for `localStorage` in Safari private mode ([#4070](https://github.com/pouchdb/pouchdb/issues/4070))
 
 ### Coverage improvements

docs/_posts/2015-11-03-cover-all.md

@@ -24,7 +24,7 @@ We have had issues in the past with how to manage npm dependencies. Version rang
 ### Bugfixes
 
 * Explain http error caused by checking for `_bulk_get` ([#4435](http://github.com/pouchdb/pouchdb/issues/4435))
-* Dont create a database just to delete it ([#4467](http://github.com/pouchdb/pouchdb/issues/4467))
+* Don't create a database just to delete it ([#4467](http://github.com/pouchdb/pouchdb/issues/4467))
 * Add friendly err msg to common leveldown err ([#4447](http://github.com/pouchdb/pouchdb/issues/4447))
 * Avoid empty bulkGet() ([#4474](http://github.com/pouchdb/pouchdb/issues/4474))
 * Fix http url with port 80 ([#247](https://github.com/pouchdb/express-pouchdb/issues/247))

docs/_posts/2016-06-06-pouchdb-5.4.0.md

@@ -92,7 +92,7 @@ This API was not removed, but will log a warning if you try to use it.
 * ([#3923](https://github.com/pouchdb/pouchdb/issues/3923)) - Add ability to set url as prefix
 * ([#4922](https://github.com/pouchdb/pouchdb/issues/4922)) - Do not call 'destroyed' twice for http instances
 * ([#3609](https://github.com/pouchdb/pouchdb/issues/3609)) - opts.view implies filter=_view
-* ([#4444](https://github.com/pouchdb/pouchdb/issues/4444)) - Dont leak event emitters
+* ([#4444](https://github.com/pouchdb/pouchdb/issues/4444)) - Don't leak event emitters
 * ([#5197](https://github.com/pouchdb/pouchdb/issues/5197)) - detect WebSQL invalid on WKWebView
 * ([#5200](https://github.com/pouchdb/pouchdb/issues/5200)) - Don't clone special objects like Workers
 * ([#5196](https://github.com/pouchdb/pouchdb/issues/5196)) - fix excessively long replication loop
@@ -123,7 +123,7 @@ This API was not removed, but will log a warning if you try to use it.
 
 * ([#4575](https://github.com/pouchdb/pouchdb/issues/4575)) - Fix tests against CouchDB master
 * ([#5260](https://github.com/pouchdb/pouchdb/issues/5260)) - Catches unhandled rejections in tests
-* ([#2426](https://github.com/pouchdb/pouchdb/issues/2426)) - Add test to ensure doc_ids dont prevent replication
+* ([#2426](https://github.com/pouchdb/pouchdb/issues/2426)) - Add test to ensure doc_ids don't prevent replication
 * ([#4767](https://github.com/pouchdb/pouchdb/issues/4767)) - 100% code coverage
 * ([#5186](https://github.com/pouchdb/pouchdb/issues/5186)) - build in Node 5, test in other Nodes
 

docs/_posts/2018-01-23-pouchdb-6.4.2.md

@@ -52,7 +52,7 @@ Currently it looks likely that we will remove our [Promise Polyfill](https://git
 
 ## Other Changes
 
-- [#7019](https://github.com/pouchdb/pouchdb/issues/7019) - Dont crash on empty HTTP requests
+- [#7019](https://github.com/pouchdb/pouchdb/issues/7019) - Don't crash on empty HTTP requests
 - [#7008](https://github.com/pouchdb/pouchdb/issues/7008) - Add Glitch bug helper
 - [#6954](https://github.com/pouchdb/pouchdb/issues/6954) - Fix hang when storage quota is exceeded
 - [#6958](https://github.com/pouchdb/pouchdb/issues/6958) - Fix PouchDB find with zero values

docs/getting-started.md

@@ -53,7 +53,7 @@ PouchDB is now installed in your app and ready to use! (In production, you shoul
 The rest of the work will be done inside `app.js`. We will start by creating a database to enter your todos. To create a database simply instantiate a new PouchDB object with the name of the database:
 
 {% highlight js %}
-// EDITING STARTS HERE (you dont need to edit anything above this line)
+// EDITING STARTS HERE (you don't need to edit anything above this line)
 
 var db = new PouchDB('todos');
 var remoteCouch = false;
@@ -100,7 +100,7 @@ Once you have included this code, you should be able to refresh the page to see
 
 {% include anchor.html class="h3" title="Update the UI" hash="update_the_ui" %}
 
-We dont want to refresh the page to see new items. More typically you would update the UI manually when you write data to it, however, in PouchDB you may be syncing data remotely, so you want to make sure you update whenever the remote data changes. To do this we will call `db.changes` which subscribes to updates to the database, wherever they come from. You can enter this code between the `remoteCouch` and `addTodo` declaration:
+We don't want to refresh the page to see new items. More typically you would update the UI manually when you write data to it, however, in PouchDB you may be syncing data remotely, so you want to make sure you update whenever the remote data changes. To do this we will call `db.changes` which subscribes to updates to the database, wherever they come from. You can enter this code between the `remoteCouch` and `addTodo` declaration:
 
 {% highlight js %}
 var remoteCouch = false;
@@ -127,7 +127,7 @@ function checkboxChanged(todo, event) {
 }
 {% endhighlight %}
 
-This is similar to creating a document, however the document must also contain a `_rev` field (in addition to `_id`), otherwise the write will be rejected. This ensures that you dont accidently overwrite changes to a document.
+This is similar to creating a document, however the document must also contain a `_rev` field (in addition to `_id`), otherwise the write will be rejected. This ensures that you don't accidently overwrite changes to a document.
 
 You can test that this works by checking a todo item and refreshing the page. It should stay checked.
 
@@ -189,7 +189,7 @@ You can check that CORS is now enabled by visiting [http://localhost:5984/_utils
 Now we will have the todo list sync. Back in `app.js` we need to specify the address of the remote database. Remember to replace `user`, `pass` and `myname.example.com` with the credentials of your own CouchDB instance:
 
 {% highlight js %}
-// EDITING STARTS HERE (you dont need to edit anything above this line)
+// EDITING STARTS HERE (you don't need to edit anything above this line)
 
 var db = new PouchDB('todos');
 var remoteCouch = 'http://user:[email protected]/todos';

packages/node_modules/pouchdb-adapter-indexeddb/src/allDocs.js

@@ -77,7 +77,7 @@ export default function (txn, metadata, opts, callback) {
     return callback(txn.error);
   }
 
-  // TODO: Weird hack, I dont like it
+  // TODO: Weird hack, I don't like it
   if (opts.limit === 0) {
     var returnVal = {
       total_rows: metadata.doc_count,

packages/node_modules/pouchdb-core/src/adapter.js

@@ -674,7 +674,7 @@ class AbstractPouchDB extends EventEmitter {
       });
     }).bind(this);
 
-    // TODO: I dont like this, it forces an extra read for every
+    // TODO: I don't like this, it forces an extra read for every
     // attachment read and enforces a confusing api between
     // adapter.js and the adapter implementation
     this.getAttachment = adapterFun('getAttachment', function (docId, attachmentId, opts, callback) {

packages/node_modules/pouchdb-merge/src/merge.js

@@ -124,7 +124,7 @@ function doMerge(tree, path, dontExpand) {
       // The paths start at a different position, take the earliest path and
       // traverse up until it as at the same point from root as the path we
       // want to merge.  If the keys match we return the longer path with the
-      // other merged After stemming we dont want to expand the trees
+      // other merged After stemming we don't want to expand the trees
 
       var t1 = branch.pos < path.pos ? branch : path;
       var t2 = branch.pos < path.pos ? path : branch;
@@ -182,7 +182,7 @@ function doMerge(tree, path, dontExpand) {
   };
 }
 
-// To ensure we dont grow the revision tree infinitely, we stem old revisions
+// To ensure we don't grow the revision tree infinitely, we stem old revisions
 function stem(tree, depth) {
   // First we break out the tree into a complete list of root to leaf paths
   var paths = rootToLeaf(tree);
@@ -217,7 +217,7 @@ function stem(tree, depth) {
       };
     }
 
-    // Then we remerge all those flat trees together, ensuring that we dont
+    // Then we remerge all those flat trees together, ensuring that we don't
     // connect trees that would go beyond the depth limit
     if (result) {
       result = doMerge(result, node, true).tree;

packages/node_modules/pouchdb-utils/src/functionName.js

@@ -7,7 +7,7 @@ function f() {}
 var hasName = f.name;
 var res;
 
-// We dont run coverage in IE
+// We don't run coverage in IE
 /* istanbul ignore else */
 if (hasName) {
   res = function (fun) {