From: Georg Brandl <georg@python.org>
Date: Fri, 21 May 2010 20:59:28 +0000 (+0000)
Subject: Merged revisions 81419 via svnmerge from
X-Git-Tag: v2.6.6rc1~263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81d1f4045b873024ac59b7188f02103262054245;p=python

Merged revisions 81419 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81419 | georg.brandl | 2010-05-21 22:58:12 +0200 (Fr, 21 Mai 2010) | 1 line

  Add missing parameter in SimpleXMLRPCServer signature.
........
---

diff --git a/Doc/library/simplexmlrpcserver.rst b/Doc/library/simplexmlrpcserver.rst
index 1591f90b6e..7cbb5f0ebe 100644
--- a/Doc/library/simplexmlrpcserver.rst
+++ b/Doc/library/simplexmlrpcserver.rst
@@ -20,7 +20,7 @@ XML-RPC servers written in Python.  Servers can either be free standing, using
 :class:`CGIXMLRPCRequestHandler`.
 
 
-.. class:: SimpleXMLRPCServer(addr[, requestHandler[, logRequests[, allow_none[, encoding]]]])
+.. class:: SimpleXMLRPCServer(addr[, requestHandler[, logRequests[, allow_none[, encoding[, bind_and_activate]]]])
 
    Create a new server instance.  This class provides methods for registration of
    functions that can be called by the XML-RPC protocol.  The *requestHandler*