Merge pull request #24 from jan-golda/patch-1

Fix documentation for custom strategies

docs/guide.rst

@@ -80,7 +80,7 @@ Custom Strategies
 Strategies are functions that satisfy the following properties:
 
 * have the function signature (config, path, base, nxt)
-* return the merged object, or None.
+* return the merged object, or `deepmerge.STRATEGY_END`.
 
 Example:
 
@@ -92,7 +92,7 @@ Example:
           base.append(nxt[-1])
           return base
 
-If a strategy fails, an exception should not be raised. This is to
+If a strategy fails, an exception should not be raised, instead it should return `deepmerge.STRATEGY_END`. This is to
 ensure it can be chained with other strategies, or the fall-back.
 
 Uniqueness of elements when merging
@@ -104,4 +104,4 @@ types, this includes structures that are not hashable such as
 dictionaries.
 
 In those cases, built-in deepmerge strategies will call repr()
-on the object and hash that value instead.
+on the object and hash that value instead.