Merge pull request #694 from orbitdb/update-docs

WIP update docs

API.md

@@ -99,7 +99,9 @@ const db = await orbitdb.keyvalue('profile')
 > Creates and opens an OrbitDB database.
 
 Returns a `Promise` that resolves to [a database instance](#store-api). `name` (string) should be the database name, not an OrbitDB address (i.e. `user.posts`). `type` is a supported database type (i.e. `eventlog` or [an added custom type](https://github.com/orbitdb/orbit-db#custom-store-types)). `options` is an object with any of the following properties:
-- `write` (array): An array of hex encoded public keys which are used to set write access to the database. `["*"]` can be passed in to give write access to everyone. See the [GETTING STARTED](https://github.com/orbitdb/orbit-db/blob/master/GUIDE.md) guide for more info. (Default: uses the OrbitDB identity public key `orbitdb.identity.publicKey`, which would give write access only to yourself)
+- `accessController` (object): An object, as shown in the example below, containing the key `write` whose value is an array of hex encoded public keys which are used to set write access to the database. `["*"]` can be passed in to give write access to everyone. See the [GETTING STARTED](https://github.com/orbitdb/orbit-db/blob/master/GUIDE.md) guide for more info.
+(Default: uses the OrbitDB identity id `orbitdb.identity.id`, which would give write access only to yourself)
+
 - `overwrite` (boolean): Overwrite an existing database (Default: `false`)
 - `replicate` (boolean): Replicate the database with peers, requires IPFS PubSub. (Default: `true`)
 ```javascript
@@ -107,7 +109,7 @@ const db = await orbitdb.create('user.posts', 'eventlog', {
     accessController: {
       write: [
         // Give access to ourselves
-      orbitdb.identity.publicKey,
+        orbitdb.identity.id,
         // Give access to the second peer
         '042c07044e7ea51a489c02854db5e09f0191690dc59db0afd95328c9db614a2976e088cab7c86d7e48183191258fc59dc699653508ce25bf0369d67f33d5d77839'
       ]
@@ -481,9 +483,9 @@ OrbitDB.parseAddress('/orbitdb/Qmdgwt7w4uBsw8LXduzCd18zfGXeTmBsiR8edQ1hSfzcJC/fi
 
 Every database (store) has the following methods available in addition to their specific methods.
 
-### store.load([amount])
+### store.load([amount], { fetchEntryTimeout })
 
-Load the locally persisted database state to memory. Use the optional `amount` argument to limit the number of entries loaded into memory, starting from the head(s) (Default: `-1` will load all entries)
+Load the locally persisted database state to memory. Use the optional `amount` argument to limit the number of entries loaded into memory, starting from the head(s) (Default: `-1` will load all entries). `fetchEntryTimeout` defines the timeout for fetching an entry.
 
 Returns a `Promise` that resolves once complete
 

GUIDE.md

@@ -383,6 +383,20 @@ Other databases, see:
 - [docs.query()](https://github.com/orbitdb/orbit-db/blob/master/API.md#querymapper)
 - [counter.value](https://github.com/orbitdb/orbit-db/blob/master/API.md#value)
 
+## Entry sorting and conflict resolution
+
+OrbitDB relies on [ipfs-log](https://github.com/orbitdb/ipfs-log) which sorts the entries based on a `sortFn` which determines the order. By default, the `sortFn` is set to [Last Writer Wins](https://github.com/orbitdb/ipfs-log/blob/1d609385f7c5db9926a0388cfcdf7fd2a796c522/src/log-sorting.js#L15) where the entry with the greater clock wins and conflicts are resolved by clock id.
+
+You can pass a custom sorting function to handle conflicts differently as follows:
+
+```javaScript
+const db = await orbitdb.log('sortDifferently', {
+  sortFn: SomeOtherSortFn
+})
+```
+
+`SomeOtherSortFn` takes two entries and should return either `-1` or `1` indicating which of the arguments is greater. The function must not return `0` when comparing entries. See [Log Sorting](https://github.com/orbitdb/ipfs-log/blob/master/src/log-sorting.js#L15)
+
 ## Persistency
 
 OrbitDB saves the state of the database automatically on disk. This means that upon opening a database, the developer can choose to load locally the persisted before using the database. **Loading the database locally before using it is highly recommended!**