(#2766) - respond to Dale's comments
diff --git a/docs/_guides/attachments.md b/docs/_guides/attachments.md index 16bef80..d842313 100644 --- a/docs/_guides/attachments.md +++ b/docs/_guides/attachments.md
@@ -142,7 +142,7 @@ {% include alert_start.html variant="info" %} -<strong>Node.js</strong>: in Node.js, PouchDB uses <a href='http://nodejs.org/api/buffer.html'><code>Buffer</code>s</a> instead of <code>Blob</code>s. Otherwise, the same rules apply. +<strong>Node.js</strong>: in Node.js, PouchDB uses <a href='http://nodejs.org/api/buffer.html'>Buffers</a> instead of Blobs. Otherwise, the same rules apply. {% include alert_end.html %}
diff --git a/docs/_guides/compact-and-destroy.md b/docs/_guides/compact-and-destroy.md index 390c2f6..97a690d 100644 --- a/docs/_guides/compact-and-destroy.md +++ b/docs/_guides/compact-and-destroy.md
@@ -106,9 +106,4 @@ -------- * [compact()](/api.html#compaction) -* [destroy()](/api.html#delete_database) - -Next ------ - -Now that the nasty business of compaction and destruction is out of the way, let's explore the exciting world of PouchDB plugins. \ No newline at end of file +* [destroy()](/api.html#delete_database) \ No newline at end of file
diff --git a/docs/_guides/conflicts.md b/docs/_guides/conflicts.md index 22ec510..7632132 100644 --- a/docs/_guides/conflicts.md +++ b/docs/_guides/conflicts.md
@@ -121,11 +121,13 @@ To fetch the losing revision, you simply `get()` it using the `rev` option: +```js db.get('docid', {rev: '2-f3d4c66dcd7596419c76b2498b3ba21f'}).then(function (doc) { // do something with the doc }).catch(function (err) { // handle any errors }); +``` At this point, you can present both versions to the user, or resolve the conflict automatically using your preferred conflict resolution strategy: last write wins, first write wins, [RCS](https://www.gnu.org/software/rcs/), etc.