Commit Graph

843 Commits

Author SHA1 Message Date
Benjamin Peterson 8f0432ffbb fix typo (closes #26378) 2016-02-17 23:42:46 -08:00
Martin Panter 3008b1c4bb Issue #26304: Merge doc wording from 3.5 2016-02-10 05:44:56 +00:00
Martin Panter c04fb56e36 Issue #26304: Change "allows to <verb>" to "allows <verb>ing" or similar
The original form is incorrect grammar and feels awkward, even though the
meaning is clear.
2016-02-10 05:44:01 +00:00
Senthil Kumaran 029f7f7af2 merge from 3.5 2016-02-05 19:37:47 -08:00
Senthil Kumaran b6213c5664 Fix userinfo example presented in urllib2 howto. 2016-02-05 19:37:23 -08:00
Martin Panter 5da4e86bc0 Issue #26220: Merge Unicode how-to from 3.5 2016-01-29 04:06:49 +00:00
Martin Panter 4942870471 Issue #26220: Remove outdated comment about a question mark 2016-01-29 04:01:16 +00:00
Ezio Melotti 1d37771292 #25517: merge with 3.5. 2016-01-12 00:09:43 +02:00
Ezio Melotti 84c63e8df4 #25517: fix regex in the regex howto. Patch by Elena Oat. 2016-01-12 00:09:13 +02:00
Martin Panter a561c038ab Issue #25576: Merge www-form-urlencoded doc from 3.5 2015-11-24 22:59:28 +00:00
Martin Panter f7e8d07538 Issue #25576: Merge www-form-urlencoded doc from 3.4 into 3.5 2015-11-24 22:57:46 +00:00
Martin Panter cda85a0d1c Issue #25576: Remove application/x-www-form-urlencoded charset advice
No charset parameter is standardized for this Content-Type value. Also
clarify that urlencode() outputs ASCII.
2015-11-24 22:33:18 +00:00
Martin Panter 36befa5b4c Issue #25626: Merge zlib fix from 3.5 2015-11-21 10:57:15 +00:00
Martin Panter e99e97762c Issue #25626: Change zlib to accept Py_ssize_t and cap to UINT_MAX
The underlying zlib library stores sizes in “unsigned int”. The corresponding
Python parameters are all sizes of buffers filled in by zlib, so it is okay
to reduce higher values to the UINT_MAX internal cap. OverflowError is still
raised for sizes that do not fit in Py_ssize_t.

Sizes are now limited to Py_ssize_t rather than unsigned long, because Python
byte strings cannot be larger than Py_ssize_t. Previously this could result
in a SystemError on 32-bit platforms.

This resolves a regression in the gzip module when reading more than UINT_MAX
or LONG_MAX bytes in one call, introduced by revision 62723172412c.
2015-11-20 08:13:35 +00:00
Serhiy Storchaka 4a7c03aab4 Issue #25523: Merge a-to-an corrections from 3.5. 2015-11-02 14:44:29 +02:00
Serhiy Storchaka a84f6c3dd3 Issue #25523: Merge a-to-an corrections from 3.4. 2015-11-02 14:39:05 +02:00
Serhiy Storchaka d65c9496da Issue #25523: Further a-to-an corrections. 2015-11-02 14:10:23 +02:00
Berker Peksag 3b1cb71084 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:42:17 +03:00
Berker Peksag db6cdf8425 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:41:59 +03:00
Berker Peksag f84499a4e3 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:41:38 +03:00
Vinay Sajip d469cff021 Merged cookbook update from 3.5. 2015-10-17 13:59:41 +01:00
Vinay Sajip a83a0e2316 Merged cookbook update from 3.4. 2015-10-17 13:59:12 +01:00
Vinay Sajip 4de9dae57d Added entry to logging cookbook. 2015-10-17 13:58:19 +01:00
Victor Stinner 91108f049f Issue #25210: Change error message of do_richcompare()
Don't add parenthesis to type names. Add also quotes around the type names.

Before:

  TypeError: unorderable types: int() < NoneType()

After:

  TypeError: '<' not supported between instances of 'int' and 'NoneType'
2015-10-14 18:25:31 +02:00
Vinay Sajip 09a00eb076 Closes #25344: Merged fix from 3.4. 2015-10-10 00:53:37 +01:00
Vinay Sajip ff1f3d9ff1 Closes #25344: Added cookbook recipe to show buffering of logging events. 2015-10-10 00:52:35 +01:00
Benjamin Peterson fc2fb0f621 merge 3.4 (#25145) 2015-09-20 23:18:51 +05:00
Benjamin Peterson 16ad5cfad3 remove reference to PyGoogle (#25145)
Patch by Bar Harel.
2015-09-20 23:17:41 +05:00
Benjamin Peterson 95acbcedc4 use a more modern UA (#25145) 2015-09-20 23:16:45 +05:00
Senthil Kumaran b4760efbad Back porting changeset db302b88fdb6 to 3.4 branch, which fixed multiple documentation typos.
Related Issues:

#issue21528
#issue24453
2015-06-14 17:35:37 -07:00
Berker Peksag fee05daef8 Issue #24232: Fix typos. Patch by Ville Skyttä. 2015-05-19 01:38:05 +03:00
Berker Peksag 315e104d11 Issue #24232: Fix typos. Patch by Ville Skyttä. 2015-05-19 01:36:55 +03:00
Tal Einat 97fceee3b9 Argument Clinic: added missing bit of info in howto 2015-05-16 14:12:15 +03:00
Yury Selivanov 8170e8c0d1 PEP 479: Change StopIteration handling inside generators.
Closes issue #22906.
2015-05-09 11:44:30 -04:00
Larry Hastings 38337d1e15 Issue #24000: Improved Argument Clinic's mapping of converters to legacy
"format units".  Updated the documentation to match.
2015-05-07 23:30:09 -07:00
Brett Cannon 8396b8ef08 Fix a grammar error in the porting HOWTO as found by Eric Smith. 2015-04-13 16:32:16 -04:00
Brett Cannon fd53f98459 Issue #23733: Mention bytes.__mod__ in the porting HOWTO. 2015-04-13 16:21:07 -04:00
Antoine Pitrou 3764fc2951 Fix doc build error 2015-04-13 21:07:57 +02:00
Brett Cannon 4269d6db93 Issue #23732: Mention the new -b semantics in the porting HOWTO. 2015-04-13 14:37:50 -04:00
Berker Peksag 556e08e9b2 Issue #12955: Change the urlopen() examples to use context managers where appropriate.
Patch by Martin Panter.
2015-04-12 13:53:33 +03:00
Berker Peksag 9575e1891f Issue #12955: Change the urlopen() examples to use context managers where appropriate.
Patch by Martin Panter.
2015-04-12 13:52:49 +03:00
Serhiy Storchaka a54aae0683 Issue #23622: Unknown escapes in regular expressions that consist of ``'\'``
and ASCII letter now raise a deprecation warning and will be forbidden in
Python 3.6.
2015-03-24 22:58:14 +02:00
Brett Cannon cb1dde5df5 Merge 3.4 2015-03-13 12:50:16 -04:00
Brett Cannon 2645bad04f Make the case to only support Python 2.7 when supporting 2/3 simultaneously 2015-03-13 12:49:44 -04:00
Brett Cannon b44ed82b81 Merge with 3.4 for porting HOWTO tweaks 2015-02-27 15:10:38 -05:00
Brett Cannon fdde79dbf6 Fix the clarification as to why division cannot be ported automatically 2015-02-27 15:10:03 -05:00
Vinay Sajip 365701add9 Added respect_handler_level to QueueListener. 2015-02-09 19:49:00 +00:00
Vinay Sajip 7929be6aeb Merged documentation update from 3.4. 2015-02-01 15:18:14 +00:00
Vinay Sajip f046dfe60e Added a cookbook entry on logging audible messages. 2015-02-01 15:17:34 +00:00
Vinay Sajip 85ad88dbc6 Merged documentation update from 3.4. 2015-01-28 07:33:14 +00:00
Vinay Sajip db07164053 Added a logging cookbook entry on customized exception formatting. 2015-01-28 07:32:38 +00:00
Serhiy Storchaka 07985ef387 Issue #22286: The "backslashreplace" error handlers now works with
decoding and translating.
2015-01-25 22:56:57 +02:00
Ned Deily 99f7249264 Add missing URL link to Modernize docs. 2015-01-03 00:46:24 -08:00
Ned Deily 4592497f9d Add missing URL link to Modernize docs. 2015-01-03 00:45:55 -08:00
Benjamin Peterson 3226f9618f merge 3.4 2014-12-24 16:07:19 -06:00
Benjamin Peterson a54f07504f update correct French examples (#23109) 2014-12-24 16:07:02 -06:00
Benjamin Peterson 724bdce8b8 merge 3.4 (#23109) 2014-12-24 13:58:47 -06:00
Benjamin Peterson 643eb4464a improve incorrect French (#23109)
Following suggestions from Clément.
2014-12-24 13:58:05 -06:00
Berker Peksag e0f4bc7608 Issue #23047: Fix typo in pyporting.rst.
Patch by Chaitanya agrawal.
2014-12-13 15:49:01 +02:00
Berker Peksag bd62f0a6e4 Issue #23047: Fix typo in pyporting.rst.
Patch by Chaitanya agrawal.
2014-12-13 15:48:22 +02:00
Brett Cannon 5632aff9c1 Merge with 3.4 for porting HOWTO tweaks 2014-12-12 15:14:09 -05:00
Brett Cannon 90783ebf27 Address some comments from Nick Coghlan 2014-12-12 15:13:43 -05:00
Benjamin Peterson f615d1fe8e remove reference to dead irc channel (closes #23038) 2014-12-12 09:56:33 -05:00
Brett Cannon 17be09c475 Fix a bad link 2014-12-05 18:11:05 -05:00
Brett Cannon 6b335196c5 Issue #22914: Update the Python 2/3 porting HOWTO to describe a more
automated process.
2014-12-05 10:56:12 -05:00
Benjamin Peterson 8ac7cbb253 merge 3.4 2014-12-12 09:56:54 -05:00
Brett Cannon 9f7c7924c3 Merge with 3.4 2014-12-05 18:11:15 -05:00
Brett Cannon 1a7b8d1439 Merge with 3.4 2014-12-05 11:01:30 -05:00
Serhiy Storchaka 166ebc4e5d Issue #19676: Added the "namereplace" error handler. 2014-11-25 13:57:17 +02:00
Raymond Hettinger df1b699447 Issue #22823: Use set literals instead of creating a set from a list 2014-11-09 15:56:33 -08:00
Georg Brandl dbbc3a964b merge with 3.4 2014-10-30 22:52:06 +01:00
Georg Brandl 5aa761db52 pyporting howto: fix link target 2014-10-30 22:52:02 +01:00
Georg Brandl 6b4c847c4f Doc: fix default role usage (except in unittest mock docs) 2014-10-30 22:26:26 +01:00
Georg Brandl 93a56cdc37 Doc: fix default role usage (except in unittest mock docs) 2014-10-30 22:25:41 +01:00
Georg Brandl bad8d4bb53 merge with 3.4 2014-10-29 10:57:42 +01:00
Georg Brandl b7354a65ce Fixing broken links in doc, part 4: some more breaks and redirects 2014-10-29 10:57:37 +01:00
Georg Brandl 794e9bf1fe merge with 3.4 2014-10-29 10:27:06 +01:00
Georg Brandl 9bdcb3bc8a Fixing broken links in doc, part 2: howto/ 2014-10-29 09:37:43 +01:00
Georg Brandl 9e67d801bd merge with 3.4 2014-10-29 09:00:37 +01:00
Georg Brandl 728e4debd8 Fix external links to docs.python.org to use internal links instead. 2014-10-29 09:00:30 +01:00
Georg Brandl cadc3fdcb5 Merge with 3.4 2014-10-29 08:37:29 +01:00
Georg Brandl e73778c1ac Use https:// URLs when referring to python.org hosts. 2014-10-29 08:36:35 +01:00
Georg Brandl a3e80deac1 merge with 3.4 2014-10-28 21:38:54 +01:00
Georg Brandl 89c558da00 Closes #22748: there are no PyString C functions in 3.x. 2014-10-28 21:38:49 +01:00
Benjamin Peterson b91ed56b9b merge 3.4 2014-10-06 21:11:25 -04:00
Benjamin Peterson 57fb11b255 use source role instead of linking to svn 2014-10-06 21:10:25 -04:00
Berker Peksag 68e013cf0f Issue #13689: Merge from 3.4. 2014-07-01 06:03:24 +03:00
Berker Peksag fd6400a47d Issue #13689: Remove a dead link from howto/urllib. 2014-07-01 06:02:42 +03:00
Ezio Melotti 7b2ecc40a9 Merge socket howto fixes from 3.4. 2014-06-27 16:34:57 +03:00
Ezio Melotti 680241ec99 Fix indentation and class name in socket howto example. 2014-06-27 16:34:14 +03:00
Vinay Sajip 33683dfb25 Merged documentation update from 3.4. 2014-06-25 07:31:21 +01:00
Vinay Sajip ab960f838c Fixed typo in documentation. 2014-06-25 07:30:46 +01:00
Zachary Ware 9d91d0325c Merge typo fix from 3.4 2014-06-16 11:14:47 -05:00
Zachary Ware 0aecc18bab Fix typo reported by Jesse W on docs@ 2014-06-16 11:13:01 -05:00
Senthil Kumaran 38ee9afb34 merge from 3.4 2014-06-11 06:19:47 -07:00
Senthil Kumaran e9738239ba #21693 - Fix the broken link for pylons project. 2014-06-11 06:19:21 -07:00
Vinay Sajip 68b272b477 Merged documentation update from 3.4. 2014-06-02 00:31:44 +01:00
Vinay Sajip e81c637bf8 Updated logging HOWTO section on optimization. 2014-06-02 00:30:48 +01:00
Benjamin Peterson 3ecb1928cb merge 3.4 (#21586) 2014-05-26 15:11:11 -07:00
Benjamin Peterson 419f1fa9bc fix typo in variable name (closes #21586) 2014-05-26 15:10:42 -07:00
Donald Stufft 8b852f111e Fix Issue #21528 - Fix documentation typos 2014-05-20 12:58:38 -04:00
Raymond Hettinger ae4bab71e3 Don't grow strings by concatenation. Use ''.join() instead. 2014-05-18 21:02:25 +01:00
Benjamin Peterson 9e599673b4 fix off-by-one error (closes #21330) 2014-04-22 21:54:10 -04:00
Andrew Svetlov 08af00047b Get rid of deprecated IOError in the doc 2014-04-01 01:13:30 +03:00
Raymond Hettinger 4ab532bbfe Issue 21014: Use booleans instead of 0 and 1 in examples. 2014-03-28 16:39:25 -07:00
Vinay Sajip 4908910ab7 Updated external link in documentation. 2014-03-25 11:21:41 +00:00
Larry Hastings 3732ed2414 Merge in all documentation changes since branching 3.4.0rc1. 2014-03-15 21:13:56 -07:00
Benjamin Peterson bfca3ca114 fix typo (closes #20892) 2014-03-11 13:59:37 -05:00
Brett Cannon c39e892955 Issue #20813: Backport Python 2/3 HOWTO updates 2014-03-07 12:28:35 -05:00
Vinay Sajip d591cba9cf Merged documentation update from 3.3. 2014-02-03 11:52:24 +00:00
Vinay Sajip 554f22ff1d Added cookbook entry on logging filter configuration using dictConfig(). 2014-02-03 11:51:45 +00:00
Larry Hastings 7726ac9163 #Issue 20456: Several improvements and bugfixes for Argument Clinic,
including correctly generating code for Clinic blocks inside C
preprocessor conditional blocks.
2014-01-31 22:03:12 -08:00
Larry Hastings 0e25410319 Documentation fixes, including fixing "suspicious" problems. 2014-01-26 00:42:02 -08:00
Ezio Melotti a3642b67ca #20348: fix headers markup in Argument Clinic howto. Patch by Moritz Neeb. 2014-01-25 17:27:46 +02:00
Larry Hastings 42d9e1b9f3 Doc fixes for Argument Clinic. 2014-01-22 05:49:11 -08:00
Larry Hastings b7ccb20423 Issue #20294: Argument Clinic now supports argument parsing for __new__ and
__init__ functions.
2014-01-18 23:50:21 -08:00
Larry Hastings 537d760766 Doc improvements for Clinic howto "Goals" section. 2014-01-18 01:08:50 -08:00
Larry Hastings bebf73511a Issue #20287: Argument Clinic's output is now configurable, allowing
delaying its output or even redirecting it to a separate file.
2014-01-17 17:47:17 -08:00
Vinay Sajip 5714e815c9 Merged documentation update from 3.3. 2014-01-17 18:36:41 +00:00
Vinay Sajip eb14deca15 Added example to recently added cookbook entry. 2014-01-17 18:36:02 +00:00
Brett Cannon f0996a9970 Issue #20208: Clarify some things in the Python porting HOWTO.
Thanks to Rodrigo Bernardo Pimentel, Ondřej Čertík, and Dmitry
Shachnev for the feedback leading to the changes.
2014-01-17 11:45:01 -05:00
Larry Hastings 2a727916c5 Issue #20226: Major improvements to Argument Clinic.
* You may now specify an expression as the default value for a
  parameter!  Example: "sys.maxsize - 1".  This support is
  intentionally quite limited; you may only use values that
  can be represented as static C values.
* Removed "doc_default", simplified support for "c_default"
  and "py_default".  (I'm not sure we still even need
  "py_default", but I'm leaving it in for now in case a
  use presents itself.)
* Parameter lines support a trailing '\\' as a line
  continuation character, allowing you to break up long lines.
* The argument parsing code generated when supporting optional
  groups now uses PyTuple_GET_SIZE instead of PyTuple_GetSize,
  leading to a 850% speedup in parsing.  (Just kidding, this
  is an unmeasurable difference.)
* A bugfix for the recent regression where the generated
  prototype from pydoc for builtins would be littered with
  unreadable "=<object ...>"" default values for parameters
  that had no default value.
* Converted some asserts into proper failure messages.
* Many doc improvements and fixes.
2014-01-16 11:32:01 -08:00
Vinay Sajip 3763f2bc07 Merged documentation update from 3.3. 2014-01-15 15:09:43 +00:00
Vinay Sajip cbefe3b9a0 Added cookbook entry on alternative formatting styles. 2014-01-15 15:09:05 +00:00
Larry Hastings 4a714d48ad Issue #20268: Argument Clinic now supports cloning the parameters
and return converter from existing functions.
2014-01-14 22:22:41 -08:00
Larry Hastings 0191be3899 Minor doc fix in Clinic howto. 2014-01-12 13:57:36 -08:00
Larry Hastings 4a55fc5a9d Issue #20214: Fixed a number of small issues and documentation errors in
Argument Clinic (see issue for details).
2014-01-12 11:09:57 -08:00
Zachary Ware c1cb227b3f Closes #20200: Argument Clinic custom converter example should be in a
'python' clinic block, not a 'clinic' clinic block.  Patch written by
Ryan Smith-Roberts.
2014-01-09 21:41:23 -06:00
Larry Hastings 61272b77b0 Issue #19273: The marker comments Argument Clinic uses have been changed
to improve readability.
2014-01-07 12:41:53 -08:00
Larry Hastings 77561cccb2 Issue #20141: Improved Argument Clinic's support for the PyArg_Parse "O!"
format unit.
2014-01-07 12:13:13 -08:00
Brett Cannon 9ca21b3e1d Issue #20096: Update the Python 2/3 porting HOWTO to focus on
source-compatibility instead of 2to3.
2014-01-07 11:52:04 -05:00
Larry Hastings 6d2ea21337 Argument Clinic: fixed test suite, improved howto. 2014-01-05 02:50:45 -08:00
Larry Hastings 78cf85c669 Issue #19659: Added documentation for Argument Clinic. 2014-01-04 12:44:57 -08:00
Serhiy Storchaka f47036c130 Removed spaces before colons and semicolons. 2013-12-24 11:04:36 +02:00
Serhiy Storchaka 89e84e7523 Removed spaces before colons and semicolons. 2013-12-24 11:05:24 +02:00
Serhiy Storchaka 2a6145290b Removed spaces before commas and periods. 2013-12-23 18:21:57 +02:00
Serhiy Storchaka a4d170d985 Removed spaces before commas and periods. 2013-12-23 18:20:51 +02:00
Vinay Sajip 1b8b868b84 Merged minor documentation update from 3.3. 2013-12-06 11:23:08 +00:00
Vinay Sajip b1a92a4c89 Added minor clarification in logging HOWTO. 2013-12-06 11:22:24 +00:00
Serhiy Storchaka 0e90e99188 Issue #19795: Improved markup of True/False constants. 2013-11-29 12:19:53 +02:00
Serhiy Storchaka fbc1c26803 Issue #19795: Improved markup of True/False constants. 2013-11-29 12:17:13 +02:00
Ezio Melotti 613a97e193 #19778: fix a couple of re reprs in the documentation. 2013-11-25 22:47:01 +02:00
Ezio Melotti 7571941db6 #19639: update the repr of the match objects in the docs. Patch by Claudiu Popa. 2013-11-23 20:27:27 +02:00
Vinay Sajip 9c10d6b800 Issue #19504: Used American spelling for 'customize'. 2013-11-15 20:58:13 +00:00
Vinay Sajip 56b04352f8 Issue #19504: Used American spelling for 'customize'. 2013-11-15 20:58:47 +00:00
Vinay Sajip b2bc4df40c Closes #18345: Merged documentation update from 3.3. 2013-11-05 10:03:20 +00:00
Vinay Sajip 2c1adcb62b Issue #18345: Added cookbook example illustrating handler customisation. 2013-11-05 10:02:21 +00:00
Georg Brandl 3a19a89eac merge with 3.3 2013-10-29 08:17:08 +01:00
Georg Brandl 3d596fa90b Clarify sentence. 2013-10-29 08:16:56 +01:00
Georg Brandl 325a1c2f37 Fix markup errors in the docs and amend suspicious ignores. 2013-10-27 09:16:01 +01:00
Georg Brandl 186729e812 merge with 3.3 2013-10-27 09:54:53 +01:00
Benjamin Peterson 559ae0fb1c merge 3.3 2013-10-18 12:58:17 -04:00
Benjamin Peterson 910a66566a fix description of super() behavior on descriptors 2013-10-18 12:57:55 -04:00
Serhiy Storchaka 98b28fddd8 Issue #18758: Fixed and improved cross-references. 2013-10-13 23:12:09 +03:00
Serhiy Storchaka bfdcd436f0 Issue #18758: Fixed and improved cross-references. 2013-10-13 23:09:14 +03:00
Serhiy Storchaka 287da2e0b9 Issue #19203: Improved cross-references in the curses howto. 2013-10-13 19:24:30 +03:00
Serhiy Storchaka 04d11a73fa Issue #19203: Improved cross-references in the curses howto. 2013-10-13 18:51:59 +03:00
Georg Brandl 3ebbb04af2 merge with 3.3 2013-10-08 21:54:47 +02:00
Georg Brandl ee82d0b293 Minor grammar fix. 2013-10-08 21:54:37 +02:00
Georg Brandl 736295c347 merge with 3.3 2013-10-06 13:07:14 +02:00
Georg Brandl e47e184c4a Unicode howto: use .txt as a more universally understood extension for text files. 2013-10-06 13:07:10 +02:00
Georg Brandl 98c0665007 merge with 3.3 2013-10-06 10:04:49 +02:00
Georg Brandl dbab26a8c9 curses HOWTO: fix some PEP8 and a code example to actually raise the exception it promises. 2013-10-06 10:04:21 +02:00
Vinay Sajip 5421f35d5e logging: added support for Unix domain sockets to SocketHandler and DatagramHandler. 2013-09-27 18:18:28 +01:00
Andrew Kuchling 46aace343f Merge from 3.3 2013-08-18 18:58:27 -04:00
Andrew Kuchling 3f4f3ba1a8 #18562: various revisions to the regex howto for 3.x
* describe how \w is different when used in bytes and Unicode patterns.

* describe re.ASCII flag to change that behaviour.

* remove personal references ('I generally prefer...')

* add some more links to the re module in the library reference

* various small edits and re-wording.
2013-08-18 18:57:22 -04:00
Vinay Sajip 07b16615bc Issue #18759: Merged updates from 3.3. 2013-08-17 00:40:38 +01:00
Vinay Sajip 67f39777fa Issue #18759: Improved cross-references in logging documentation. 2013-08-17 00:39:42 +01:00
R David Murray bd2a757010 Merge #15130: remove repeat of abstract paragraph from socket howto body. 2013-07-25 13:24:40 -04:00
R David Murray b76b1b1ec8 #15130: remove repeat of abstract paragraph from socket howto body.
Patch by Tshepang Lekhonkhobe.
2013-07-25 13:24:15 -04:00
Vinay Sajip aca61703fa Closes #18541: merged update from 3.3. 2013-07-24 17:52:58 +01:00
Vinay Sajip a92fbe6dce Issue #18541: simplified LoggerAdapter example. 2013-07-24 17:52:01 +01:00
Ned Deily d57b268653 Closes #18452: fix several "occurrence" typos (reported by Févry Thibault). 2013-07-14 12:45:18 -07:00
Ned Deily 0995c47891 Issue #18452: fix several "occurrence" typos (reported by Févry Thibault). 2013-07-14 12:43:16 -07:00
Andrew Kuchling 7aed567f2b Merge from 3.3 2013-06-20 09:51:51 -04:00
Andrew Kuchling 2151fc6416 #4153: update Unicode howto for Python 3.3
* state that python3 source encoding is UTF-8, and give examples

* mention surrogateescape in the 'tips and tricks' section, and
  backslashreplace in the "Python's Unicode Support" section.

* Describe Unicode support provided by the re module.

* link to Nick Coghlan's and Ned Batchelder's notes/presentations.

* default filesystem encoding is now UTF-8, not ascii.

* Describe StreamRecoder class.

* update acks section

* remove usage of "I think", "I'm not going to", etc.

* various edits

* remove revision history and original outline
2013-06-20 09:29:09 -04:00
Andrew Kuchling 2a9c8e8cd3 #17955: minor updates to Functional howto
* Describe compress() and accumulate()
* Add a subsection on combinatoric functions.
* Add a forward link to skip the theoretical discussion in the first section.
* Clarify what filterfalse() is the opposite of.
* Remove the old outline and some notes at the end.
* Various small edits.
2013-05-20 10:14:53 -04:00
Andrew Kuchling 40e39fc8b8 #17700: merge with 3.3 2013-05-09 20:14:01 -04:00
Andrew Kuchling ddcb30440d #17700: update the curses HOWTO for 3.x 2013-05-09 20:05:20 -04:00
R David Murray 775ccdf1fc #7152: Remove incorrectly added reference to DataHandler. 2013-04-28 17:06:01 -04:00
R David Murray d4c1b36c39 Merge: Reflow paragraphs.
(I got a merge conflict on this in urllib.request.rst, which makes no sense to
me.  Hopefully I didn't screw up the previous 3.3 commit.)
2013-04-28 11:30:19 -04:00
R David Murray 9330a94467 Reflow paragraphs.
I know one of them looks worse, but now it is <80 chars and
matches the 2.7 text.
2013-04-28 11:24:35 -04:00
R David Murray 876f08e3ae Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
Behavior confirmation and initial patch by Jessica McKellar.
2013-04-28 11:08:27 -04:00
R David Murray 5aea37ad1d #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
Behavior confirmation and initial patch by Jessica McKellar.
2013-04-28 11:07:16 -04:00
Ezio Melotti cbe19e56ea #17729: merge with 3.3. 2013-04-23 09:58:04 +03:00
Ezio Melotti d638381ee0 #17729: remove the Advocacy HOWTO from the index. 2013-04-23 09:56:30 +03:00
Ezio Melotti 99b3caf514 #17729: merge with 3.3. 2013-04-23 09:25:45 +03:00
Ezio Melotti 8bdcaf794a #17729: remove the outdated Advocacy HOWTO, as suggested by the author. 2013-04-23 09:24:51 +03:00
Georg Brandl 1e6a3a2fe9 merge with 3.3 2013-04-14 10:59:17 +02:00
Georg Brandl a204636b91 bind('') does not do the same as bind('localhost') 2013-04-14 10:59:04 +02:00
Andrew Svetlov c53fd51278 Change wording as Eli Bendersky suggests. 2013-04-06 18:55:31 +03:00
Andrew Svetlov e16f4dc80a Change wording as Eli Bendersky suggests. 2013-04-06 18:55:07 +03:00
Georg Brandl 98297f4807 merge with 3.3 2013-04-06 16:47:34 +02:00
Georg Brandl 2fd4abe6a1 merge with 3.2 branch 2013-04-06 16:39:49 +02:00
Andrew Svetlov a5b89c178b Fix typo 2013-04-05 11:40:01 +03:00
Andrew Svetlov e463b668e8 Fix typo 2013-04-05 11:39:50 +03:00
Andrew Svetlov 974045523b Fix typo. 2013-04-05 10:11:25 +03:00
Andrew Svetlov 815b0e23bf Fix typo. 2013-04-05 10:10:12 +03:00
Vinay Sajip 3fdd4f1935 Merged documentation update from 3.3. 2013-03-30 11:57:09 +00:00
Vinay Sajip 8028a5cf15 Updated logging cookbook with additional example for output using str.format(). 2013-03-30 11:56:18 +00:00
Georg Brandl 1bab7134a8 Merge with 3.3. 2013-03-28 13:28:55 +01:00
Georg Brandl 44ea77bd81 Closes #4159: add LaTeX tabular column specifications to tables that otherwise are cut off or have overlapping text. 2013-03-28 13:28:44 +01:00
Ezio Melotti f92b063c4e Update suspicious ignore file. 2013-03-28 05:12:31 +02:00
Ezio Melotti e5caf29743 Update suspicious ignore file. 2013-03-28 04:54:58 +02:00
Ezio Melotti fd4365a4d8 Update suspicious ignore file. 2013-03-28 04:31:53 +02:00
Georg Brandl d50fe7216d Fix suspicious markup in the docs. 2013-03-23 16:00:41 +01:00
Ezio Melotti a41fb4be5b #17351: merge with 3.3. 2013-03-11 09:43:25 +02:00
Ezio Melotti c9cfcf1e6c #17351: merge with 3.2. 2013-03-11 09:42:40 +02:00
Ezio Melotti af8838f443 #17351: remove "object" inheritance from docs. Patch by Phil Elson. 2013-03-11 09:30:21 +02:00
Raymond Hettinger 6584a1e72c merge 2013-03-10 09:51:37 -07:00
Raymond Hettinger 686aae4841 Inherit from object() for consistency 2013-03-10 09:50:37 -07:00
Raymond Hettinger e238b889eb merge 2013-03-10 09:42:22 -07:00
Raymond Hettinger 632c8c8ab1 Issue #17351: Modernize the pure Python property() example. 2013-03-10 09:41:18 -07:00
Brett Cannon ff73758b8f merge 2013-03-09 14:25:08 -05:00
Brett Cannon b7e6b89554 Touch up the Python 2 to 3 porting guide 2013-03-09 14:22:35 -05:00
Serhiy Storchaka 0cad7eca45 Issue #17193: Use binary prefixes (KiB, MiB, GiB) for memory units. 2013-02-16 17:30:31 +02:00
Serhiy Storchaka f8def28ff0 Issue #17193: Use binary prefixes (KiB, MiB, GiB) for memory units. 2013-02-16 17:29:56 +02:00
Vinay Sajip 560eff173c Merged doc update from 3.3. 2013-01-23 09:32:32 +00:00
Vinay Sajip 9427b03133 Merged doc update from 3.2. 2013-01-23 09:32:10 +00:00
Vinay Sajip 3d9e972270 Corrected typo, added comment in cookbook recipe. 2013-01-23 09:31:19 +00:00
Vinay Sajip 88069d217a Merged doc update from 3.3. 2013-01-22 15:58:34 +00:00
Vinay Sajip a3bdce8c91 Merged doc update from 3.2. 2013-01-22 15:58:14 +00:00
Vinay Sajip 4b88d6c664 Added cookbook recipe for structured logging. 2013-01-22 15:57:39 +00:00
Vinay Sajip be2795a6f9 Merged documentation update from 3.3. 2013-01-22 13:13:43 +00:00
Vinay Sajip 7f3e993a3a Merged documentation update from 3.2. 2013-01-22 13:13:16 +00:00
Vinay Sajip f186911e24 Updated logging HOWTO with a diagram. 2013-01-22 13:12:34 +00:00
Stefan Krah a12ff2c682 Merge 3.3. 2013-01-20 23:19:22 +01:00
Stefan Krah e4aa08e52b Issue #7353: Remove references to Include/intobject.h in the C-porting howto. 2013-01-20 23:18:00 +01:00
Ezio Melotti c7ca59a8ae #16557: merge with 3.3. 2013-01-20 16:35:09 +02:00
Ezio Melotti 5246f66e5e #16557: update functional howto -- "return value" is valid after PEP 380. Initial patch by Ramchandra Apte. 2013-01-20 16:34:21 +02:00
Ezio Melotti 60a64d7cbb #4153: merge with 3.3. 2013-01-20 12:18:34 +02:00
Ezio Melotti 81b46ec0e5 #4153: merge with 3.2. 2013-01-20 12:18:17 +02:00
Ezio Melotti 410eee566f #4153: update the Unicode howto. 2013-01-20 12:16:03 +02:00
Vinay Sajip f43c4d66be Issue #16884: Merged doc fix from 3.3. 2013-01-08 11:27:18 +00:00
Vinay Sajip 9a546530bb Issue #16884: Merged doc fix from 3.2. 2013-01-08 11:26:30 +00:00
Vinay Sajip 21b30827bc Issue #16884: Updated docs to use 'note' directives in a couple of places missed earlier. 2013-01-08 11:25:42 +00:00
Vinay Sajip ed6f37cad1 Closes #16884: Merged logging documentation fixes from 3.3. 2013-01-07 14:19:12 +00:00
Vinay Sajip 0e82fd1f78 Issue #16884: Merged logging documentation fixes from 3.2. 2013-01-07 14:18:19 +00:00
Vinay Sajip e50f4d2220 Issue #16884: updated logging documentation to include lastResort and use 'note' directives where appropriate. 2013-01-07 14:16:52 +00:00
Benjamin Peterson ca6142948e merge 3.3 2013-01-03 20:34:58 -08:00
Benjamin Peterson bf064b3911 merge 3.2 2013-01-03 20:34:49 -08:00
Benjamin Peterson d73f369f4c merge heads 2013-01-03 20:34:40 -08:00
Benjamin Peterson 0a2c4f55c4 drop email (closes #16857) 2013-01-03 20:34:19 -08:00
Ezio Melotti e34ccb6861 #16760: merge with 3.3. 2012-12-25 18:16:31 +02:00
Ezio Melotti 1bdb638ce3 #16760: merge with 3.2. 2012-12-25 18:15:28 +02:00
Ezio Melotti 090f7be6df #16760: use ref:`match-objects` instead of :class:`MatchObject`. 2012-12-25 18:10:49 +02:00
Andrew Svetlov a191959849 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
Andrew Svetlov 5b89840d9c Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
Andrew Svetlov 737fb89dd1 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +02:00
Andrew Svetlov 47395617bc Issue #16261: fix bare excepts in Doc/ 2012-11-02 22:07:26 +02:00
Chris Jerdonek 006d907afc Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:28:26 -07:00
Benjamin Peterson b548d49f65 merge heads 2012-10-12 12:05:01 -04:00
Benjamin Peterson 143d034ecd merge 3.2 2012-10-12 12:04:32 -04:00
Ezio Melotti eb818193b3 Merge doctest fixes in functional howto with 3.2. 2012-10-12 13:25:54 +03:00
Ezio Melotti 35cbf16202 Make doctests pass in the functional howto. 2012-10-12 13:24:19 +03:00
Ezio Melotti dd67c1d91a Merge functional howto improvements with 3.2. 2012-10-12 13:23:32 +03:00
Ezio Melotti 45a101db1d Improve markup in functional.rst, and fix a couple of errors. 2012-10-12 12:42:51 +03:00
Ezio Melotti a6229e6ebd Fix and add more links. 2012-10-12 10:59:14 +03:00
Senthil Kumaran 570bc4c465 Fix Issue 15922: make howto/urllib2.rst doctests pass.
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:38:17 -07:00
Senthil Kumaran 1ed9847a5a Fix Issue 15922: make howto/urllib2.rst doctests pass.
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:37:09 -07:00
Eli Bendersky 948af23a77 Issue #15888: fixing problems in ipaddress doctests. Patch by Chris Jerdonek 2012-10-07 07:23:50 -07:00
Ezio Melotti 2b7a71d6e5 #15949, #15899: merge with 3.2. 2012-09-23 16:03:21 +03:00
Ezio Melotti 20b8d992b0 #15949, #15899: use \ufffd instead of ?. 2012-09-23 15:55:14 +03:00
Ezio Melotti fb436c4eba #15949, 15899: merge with 3.2. 2012-09-22 11:25:22 +03:00
Ezio Melotti b1d0e5b11e #15949, 15899: avoid using non-latin1 chars in the doc (they break `make all-pdf`). 2012-09-22 11:23:06 +03:00
Ezio Melotti 8646e8ea72 #15920: merge with 3.2. 2012-09-17 05:30:58 +03:00
Ezio Melotti 13bec9b315 #15920: fix doctests in Doc/howto/regex.rst. Patch by Chris Jerdonek. 2012-09-17 05:29:47 +03:00
Senthil Kumaran e4eee73293 merge. Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek. 2012-09-11 03:20:22 -07:00
Senthil Kumaran 2fd8bdbc9d Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek. 2012-09-11 03:17:52 -07:00
Sandro Tosi eb41c7fef8 merge with 3.2 2012-08-15 21:37:56 +02:00
Sandro Tosi dd7c55250d clarify in/not in in case of infinite iterators; thanks to Sergey Skovorodkin from docs@ 2012-08-15 21:37:35 +02:00
Eli Bendersky dfd72bbc4d Issue #14814: fix some typos in howto/ipaddress.rst 2012-07-31 17:25:33 +03:00
Vinay Sajip a61b45980b Merged documentation update from 3.2. 2012-07-27 10:55:16 +01:00
Vinay Sajip a58d668fd9 Improved cookbook entry and fixed typo. 2012-07-27 10:54:10 +01:00
Nick Coghlan ccd712a8d1 Issue 14814: Further clean ups to the ipaddress tutorial 2012-07-07 22:53:46 +10:00
Nick Coghlan b582ecc562 Issue 14814: Explain how to get more error detail in the ipaddress tutorial, and tweak the display for octet errors in IPv4 (noticed the formatting problem when adding to the docs) 2012-07-07 22:15:22 +10:00
Nick Coghlan 9680bdb567 Issue #14814: Add first draft of PEP 3144 ipaddress module documentation (initial patch by Sandro Tosi) 2012-06-17 17:24:10 +10:00
Sandro Tosi c816290059 Issue #14814: use print() function 2012-06-02 17:16:33 +02:00
Nick Coghlan 53c920052b Issue #14814: Add a basic ipaddress tutorial (thanks to Sandro Tosi for the initial conversion from Peter Moody's wiki version) 2012-05-27 01:53:33 +10:00
Georg Brandl 75d5d8c781 Merge with 3.2. 2012-05-06 21:39:59 +02:00
Georg Brandl 0958a4d63d Fix document title for Sphinx. 2012-05-06 21:39:35 +02:00
Ezio Melotti b55d9e3e19 #14034: merge indentation fixes from 3.2. 2012-05-06 17:05:54 +03:00
Ezio Melotti 9ab3fdd8cb #14034: fix indentation. 2012-05-06 17:05:16 +03:00
Ezio Melotti df5bedbf88 #14034: merge argparse tutorial from 3.2. 2012-05-06 16:34:43 +03:00
Ezio Melotti 6cc7a41c2f #14034: added the argparse tutorial. Patch by Tshepang Lekhonkhobe. 2012-05-06 16:15:35 +03:00
Georg Brandl ebb29640fa Suspicious markup check. 2012-05-01 09:29:56 +02:00
Raymond Hettinger b77b5c308d merge 2012-04-29 09:35:39 -07:00
Raymond Hettinger 99a56386f1 Issue 14688: Fix typo 2012-04-29 09:32:30 -07:00
Sandro Tosi 011c9aa822 Issue #13587: merge with 3.2 2012-04-24 17:37:02 +02:00
Sandro Tosi 08ccbf4be9 Issue #13587: use the right RFC2617 name for WWW-Authenticate; patch by Aaron Maenpaa 2012-04-24 17:36:41 +02:00
R David Murray 0b7d7c9544 Merge #14640: Fix typos/syntax in pyporting.rst.
Patch by Dionysios Kalofonos.
2012-04-23 14:45:45 -04:00
R David Murray 790e005669 #14640: Fix typos/syntax in pyporting.rst.
Patch by Dionysios Kalofonos.
2012-04-23 14:44:00 -04:00
Sandro Tosi 8c52ab597f Issue #14641: merge with 3.2 2012-04-23 19:45:45 +02:00
Sandro Tosi cfdba61c3c Issue #14641: minor fixes to sockets Howto; patch by Dionysios Kalofonos 2012-04-23 19:45:07 +02:00
Vinay Sajip f138f8c1ab Merged cookbook corrections from 3.2. 2012-04-17 00:41:39 +01:00
Vinay Sajip 62930e1cc5 Corrected version numbers in cookbook example. 2012-04-17 00:40:48 +01:00
Vinay Sajip e8a463d791 Merged tweaks to cookbook example from 3.2. 2012-04-16 15:47:05 +01:00
Vinay Sajip 59b9a79a5a Tweaked format of cookbook example. 2012-04-16 15:46:18 +01:00
Vinay Sajip 1b7101968a Merged cookbook update from 3.2. 2012-04-16 15:29:28 +01:00
Vinay Sajip b00e8f108d Added cookbook example for BOM insertion. 2012-04-16 15:28:50 +01:00
Vinay Sajip 8bf2aea962 Merged updates to logging reference and HOWTO from 3.2. 2012-04-10 20:00:43 +01:00
Vinay Sajip 074faff925 Updated logging reference and HOWTO. 2012-04-10 19:59:50 +01:00
Vinay Sajip da29f8c915 Merged comment correction from 3.2. 2012-04-09 19:47:16 +01:00
Vinay Sajip 838e638a96 Corrected comment in cookbook example script. 2012-04-09 19:46:24 +01:00
Vinay Sajip 452806c8e3 Merged logging cookbook update from 3.2. 2012-04-08 01:51:29 +01:00
Vinay Sajip 0292fa99ef Added multiprocessing example to logging cookbook. 2012-04-08 01:49:12 +01:00
Georg Brandl 1a7742eb4d merge with 3.2 2012-03-25 08:43:32 +02:00
Georg Brandl 11ee31ab08 Closes #14401: fix typos in curses howto. 2012-03-25 08:43:22 +02:00
Martin v. Löwis ecc92db031 merge 3.2 2012-03-24 17:40:50 +01:00
Martin v. Löwis 2dee394af9 Issue #14400: Fix typo. 2012-03-24 17:39:57 +01:00
Senthil Kumaran 7596aeaba7 cpython:Fix the wrong urllib exampls which use str for POST data. Closes Issue11261 2012-03-14 18:11:46 -07:00
Senthil Kumaran 87684e6eea Fix the wrong urllib exampls which use str for POST data. Closes Issue11261 2012-03-14 18:08:13 -07:00
Senthil Kumaran e24f96a059 Issue10050 - urlretrieve uses newer urlopen. reporthook of urlretrieve takes, block number, block read size, file_size 2012-03-13 19:29:33 -07:00
Éric Araujo 6a59b70cba Merge 3.2 2012-03-05 16:24:07 +01:00
Éric Araujo fdfaf0aba2 Use source reST role instead of file where it makes sense.
source generates a nifty link to the Mercurial web viewer.
2012-03-05 15:50:37 +01:00
Éric Araujo d3899e320f Remove mention of defunct file.
Misc/COPYRIGHT was renamed twelve years ago to LICENSE and later copied
to the main docs, to which there is already a link.
2012-03-05 15:47:32 +01:00
Larry Hastings 7b5649cd48 Merge: Propagate changes for issues #13053 and #13086 from 2.7 to 3.2.
(Doc only.)
2012-02-28 16:30:31 -08:00
Larry Hastings 62417a0354 Propagate changes for issues #13053 and #13086 from 2.7 to 3.2. (Doc only.) 2012-02-28 16:21:47 -08:00
Vinay Sajip ff4b7bfaef Merged cookbook improvement from 3.2. 2012-02-28 08:06:01 +00:00
Vinay Sajip 39b83ac772 Improved logging cookbook example. 2012-02-28 08:05:23 +00:00
Georg Brandl 86798d4ff9 Merge with 3.2. 2012-02-28 08:21:49 +01:00
Georg Brandl e998386442 Fix markup errors. 2012-02-28 08:21:40 +01:00
Vinay Sajip bd2c199b2b Merged cookbook update for LogRecord customisation. 2012-02-27 11:57:25 +00:00
Vinay Sajip 982f534fab Updated cookbook with information on customising LogRecords. 2012-02-27 11:56:29 +00:00
Vinay Sajip 22fa0677d6 Merged cookbook update from 3.2. 2012-02-27 11:03:26 +00:00
Vinay Sajip 6b883a2c4d Updated logging cookbook with info on alternative format styles. 2012-02-27 11:02:45 +00:00
Senthil Kumaran 0bfa963fbb merged from 3.2
Issue #6005: Examples in the socket library documentation use sendall, where
relevant, instead send method.
2012-02-09 17:55:56 +08:00
Senthil Kumaran 6e13f130a9 Fix Issue #6005: Examples in the socket library documentation use sendall,
where relevant, instead send method.
2012-02-09 17:54:17 +08:00
Ezio Melotti 226231c930 Use ASCII quotes and fix markup. 2012-01-18 05:40:00 +02:00
Sandro Tosi 1abde3628b fix some broken URLs 2011-12-31 18:46:50 +01:00
Vinay Sajip 23b94d0b98 Refactored logging rotating handlers for improved flexibility. 2012-01-04 12:02:26 +00:00
Sandro Tosi 8df168cc7b merge with 3.2 2011-12-31 19:03:30 +01:00
Florent Xicluna aa6c1d240f Issue #13575: there is only one class type. 2011-12-12 18:54:29 +01:00
Antoine Pitrou 3731142e19 Merge assorted fixes from 3.2 2011-12-05 01:47:40 +01:00
Antoine Pitrou 5b73ca4b3d s/SOCKSTREAM/TCP/ 2011-12-05 01:46:35 +01:00
Antoine Pitrou 8e644f0e7c Reword IPC section 2011-12-05 01:43:32 +01:00
Antoine Pitrou 8345451170 Use www.python.org instead of a hostname pointing to a parked (or squatted) domain.
Also, reformat a bit.
2011-12-05 01:37:34 +01:00
Antoine Pitrou fa03f6c863 Remove the outdated notion that multithreading doesn't work well on Unices. 2011-12-05 01:32:29 +01:00
Antoine Pitrou 9b1ec97867 Remove reference to the base64 encoding. 2011-12-05 01:22:03 +01:00
Antoine Pitrou 534e253cb6 Remove reference to the base64 encoding. 2011-12-05 01:21:46 +01:00
Antoine Pitrou b53e2c4900 The functional module hasn't been maintained since 2006 and doesn't work with Python 3.
Remove section about it from the functional programming FAQ.
2011-12-05 01:05:55 +01:00
Antoine Pitrou 48a7cbf7c2 The functional module hasn't been maintained since 2006 and doesn't work with Python 3.
Remove section about it from the functional programming FAQ.
2011-12-05 01:05:32 +01:00
Jason R. Coombs c9b644eac2 Merge fix for Issue #12666 from 3.2 2011-12-03 08:59:53 -05:00
Jason R. Coombs a90e364ea5 Issue #12666: Added section about map changes. 2011-12-03 08:24:21 -05:00
Vinay Sajip d2b0217944 Merged documentation addition from 3.2. 2011-11-23 14:29:01 +00:00
Vinay Sajip 631a7e23c5 Added a configuration dictionary example to the logging cookbook. 2011-11-23 14:27:54 +00:00
Vinay Sajip 6187664fa7 Added lost documentation cross-reference. 2011-10-27 17:50:55 +01:00
Ezio Melotti e130a52d8a Remove duplication. 2011-10-19 10:58:56 +03:00
Vinay Sajip b5cab85dc7 Merged documentation fix from 3.2. 2011-10-27 17:53:19 +01:00
Ezio Melotti f10644983e Merge with 3.2. 2011-10-19 11:06:26 +03:00