Commit graph

4253 commits

Author SHA1 Message Date
Andrew Svetlov
42b8932c12 Merge issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:11:21 +02:00
Andrew Svetlov
6d50a5447a Merge issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:11:00 +02:00
Andrew Svetlov
2ec53be2e2 Issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:10:30 +02:00
Andrew Svetlov
87c315eb75 Merge issue #14616: Mention shlex.quote in subprocess docs.
Patch by Chris Rebert.
2012-10-28 11:43:02 +02:00
Andrew Svetlov
c2415eb7e6 Issue #14616: Mention shlex.quote in subprocess docs.
Patch by Chris Rebert.
2012-10-28 11:42:26 +02:00
Ezio Melotti
acf1754bf3 #16337: merge with 3.3. 2012-10-27 23:25:38 +03:00
Ezio Melotti
971ba4c817 #16337: fix typo. 2012-10-27 23:25:18 +03:00
Senthil Kumaran
450371305f merge from 3.3 2012-10-27 11:05:54 -07:00
Senthil Kumaran
0b3014dda0 merge from 3.2 2012-10-27 11:05:32 -07:00
Senthil Kumaran
847c33cc3b Include mention of jenkins as an example framework for doing CI 2012-10-27 11:04:55 -07:00
Andrew Svetlov
a0e41a2e9b Merge issue #16243: add example for inspect.formatargspec
Patch by Berker Peksag.
2012-10-27 00:28:49 +03:00
Andrew Svetlov
735d31723f Issue #16243: add example for inspect.formatargspec
Patch by Berker Peksag.
2012-10-27 00:28:20 +03:00
Ezio Melotti
9a56f8c1ed #16206: merge with 3.3. 2012-10-26 19:15:53 +03:00
Ezio Melotti
a5941f8643 #16206: merge with 3.2. 2012-10-26 19:15:26 +03:00
Ezio Melotti
a20879ffc8 #16206: Improve examples about dict construction. 2012-10-26 19:14:16 +03:00
Ezio Melotti
93653c48e6 #16210: merge with 3.3. 2012-10-24 23:07:16 +03:00
Ezio Melotti
e6c0f0d94a #16210: merge with 3.2. 2012-10-24 23:06:56 +03:00
Ezio Melotti
837cd06d36 #16210: combine the two type() docs. Patch by Pete Sevander. 2012-10-24 23:06:25 +03:00
Ezio Melotti
353af2902c Merge typo fix with 3.3. 2012-10-21 07:24:40 +03:00
Ezio Melotti
1f67e80564 Fix typo. 2012-10-21 07:24:13 +03:00
Ezio Melotti
d5050b3e17 Merge indentation fixes with 3.3. 2012-10-21 03:22:53 +03:00
Ezio Melotti
b24d3cf769 Fix indentation (or Sphinx will think these are attributes of ConnectionError). 2012-10-21 03:22:05 +03:00
Ned Deily
257c1323f7 Issue #10405: merge from 3.3 2012-10-20 13:28:16 -07:00
Ned Deily
d2cc1bb057 Issue #10405: merge from 3.2 2012-10-20 13:27:32 -07:00
Ned Deily
2778d0d147 Issue #10405: Document IDLE context menus in Standard Library document
and IDLE Help file.  (Thanks to Nick ODell and Todd Rovito for suggestions.)
Update Debug menu options in docs to match current code plus various other
minor IDLE doc and help edits.
2012-10-20 13:25:34 -07:00
Nick Coghlan
aaa28832fd Merge from 3.3 2012-10-20 20:13:42 +10:00
Nick Coghlan
40c67739ba Fix typo in example (pointed out by a couple of people, most recently Ken Rimey) 2012-10-20 20:13:21 +10:00
Nick Coghlan
68e9d7c102 Merge concurrent.futures dict comp tweak from 3.3 2012-10-16 23:14:38 +10:00
Nick Coghlan
d6d5cf33ef A dict comprehension is much prettier (thanks Antoine) 2012-10-16 23:14:03 +10:00
Nick Coghlan
c7c03ba5be Merge concurrent.futures example changes from 3.3 2012-10-16 22:51:11 +10:00
Nick Coghlan
f06ea25df2 Tweak the threaded example in concurrent.futures 2012-10-16 22:50:04 +10:00
Andrew Svetlov
b3fe704a4a Merge issue #15936: Reformat text for os.random to follow Larry Hastings suggestion 2012-10-16 13:52:53 +03:00
Andrew Svetlov
2bfe386091 Issue #15936: Reformat text for os.random to follow Larry Hastings suggestion 2012-10-16 13:52:25 +03:00
Andrew Svetlov
f4e5044638 Merge issue #15936: Add link from os.urandom to random.SystemRandom 2012-10-16 13:15:35 +03:00
Andrew Svetlov
03cb99c2d1 Issue #15936: Add link from os.urandom to random.SystemRandom 2012-10-16 13:15:06 +03:00
Chris Jerdonek
fe4985a1bb Issue #16206: Merge dict documentation improvements from 3.3.
Improve the documentation of the dict constructor.  This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:26:10 -07:00
Chris Jerdonek
39b867000b Issue #16206: Merge dict documentation improvements from 3.2.
Improve the documentation of the dict constructor.  This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:25:18 -07:00
Chris Jerdonek
f341317185 Issue #16206: Improve the documentation of the dict constructor.
This change includes replacing the single-line signature documentation
with a more complete multiple-line signature.
2012-10-13 03:22:33 -07:00
Chris Jerdonek
145fb897f2 Merge from 3.3: Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:31:50 -07:00
Chris Jerdonek
006d907afc Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:28:26 -07:00
Benjamin Peterson
4604980854 merge 3.3 2012-10-12 12:05:09 -04: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
5c3283e43a Merge __next__ method link fixes with 3.3. 2012-10-12 13:46:37 +03:00
Ezio Melotti
1dd7c30419 Merge __next__ method link fixes with 3.2. 2012-10-12 13:45:38 +03:00
Ezio Melotti
7fa822275b Fix links to the __next__ method. 2012-10-12 13:42:08 +03:00
Ezio Melotti
f79774bb92 Merge link additions/fixes with 3.3. 2012-10-12 11:02:39 +03:00
Ezio Melotti
a6229e6ebd Fix and add more links. 2012-10-12 10:59:14 +03:00
Chris Jerdonek
e312f4d304 Merge from 3.3: Add and adjust some string-related links in the docs. 2012-10-11 18:59:34 -07:00
Chris Jerdonek
c33899bd71 Add and adjust some string-related links in the docs. 2012-10-11 18:57:48 -07:00