Commit Graph

363 Commits

Author SHA1 Message Date
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