From 7dac7bbd48bb56971c2fddfcf13d439d577740c1 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Tue, 2 Apr 2013 11:51:54 -0700
Subject: Fix the default string used for merging.

It had been changed in code, but not in docs. So we needed
to reflect the change in docs as well so that both are in
sync.
---
 doc/merging.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/merging.rst b/doc/merging.rst
index 6344facd..d4d5cd05 100644
--- a/doc/merging.rst
+++ b/doc/merging.rst
@@ -145,7 +145,7 @@ For example, the default string that is used when none is provided is the follow
 
 ::
     
-   list(extend)+dict()+str(append)
+   list()+dict()+str()
 
 Dictionary format
 ********
-- 
cgit v1.2.3