From f10a79aad4e2fc62d2c3675e89f873b22b185e7b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 11 Oct 2008 00:49:57 +0000 Subject: merge from trunk --- Modules/_codecsmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Modules/_codecsmodule.c') diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 5026c05897..fc3e3f9bbd 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -108,7 +108,7 @@ Decodes obj using the codec registered for encoding. encoding defaults\n\ to the default encoding. errors may be given to set a different error\n\ handling scheme. Default is 'strict' meaning that encoding errors raise\n\ a ValueError. Other possible values are 'ignore' and 'replace'\n\ -as well as any other name registerd with codecs.register_error that is\n\ +as well as any other name registered with codecs.register_error that is\n\ able to handle ValueErrors."); static PyObject * -- cgit v1.2.1