Docs problem, about the value type of BuildmasterConfig 's key [ 'mergeRequests' ]

[dreamfly912]

In the buildbot 0.8.2 docs' says: 4.5.6 Merging BuildRequests?
....
....
If desired, request merging can be disabled globally by setting c[ 'mergeRequests' ] = False instead of a callable function.

---

Actually, the value of c[ 'mergeRequests' ] should be set to None, or a callable function. If u set it to False, then exception occur when load config:

2010-12-16 09:24:47+0800 [-] error during loadConfig
2010-12-16 09:24:47+0800 [-] Unhandled Error
	Traceback (most recent call last):
	  File "/usr/local/lib/python2.6/site-packages/Twisted-10.2.0-py2.6-linux-x86_64.egg/twisted/scripts/_twistd_unix.py", line 317, in startApplication
	    app.startApplication(application, not self.config['no_save'])
	  File "/usr/local/lib/python2.6/site-packages/Twisted-10.2.0-py2.6-linux-x86_64.egg/twisted/application/app.py", line 653, in startApplication
	    service.IService(application).startService()
	  File "/usr/local/lib/python2.6/site-packages/Twisted-10.2.0-py2.6-linux-x86_64.egg/twisted/application/service.py", line 277, in startService
	    service.startService()
	  File "/usr/local/lib/python2.6/site-packages/buildbot-0.8.2-py2.6.egg/buildbot/master.py", line 567, in startService
	    self.loadTheConfigFile()
	--- <exception caught here> ---
	  File "/usr/local/lib/python2.6/site-packages/buildbot-0.8.2-py2.6.egg/buildbot/master.py", line 600, in loadTheConfigFile
	    d = self.loadConfig(f)
	  File "/usr/local/lib/python2.6/site-packages/buildbot-0.8.2-py2.6.egg/buildbot/master.py", line 690, in loadConfig
	    raise ValueError("mergeRequests must be a callable")
	exceptions.ValueError: mergeRequests must be a callable

[dustin]

Thanks! Amber already fixed this up a while back:

commit f5e188c15c407f9cd305010f3b0e3d5f7ab1a072
Author: Amber Yust <ayust@yelp.com>
Date:   Tue Oct 26 15:07:12 2010 -0700

    Allow c['mergeRequests'] = False