summaryrefslogtreecommitdiffstats
path: root/Doc
Commit message (Expand)AuthorAgeFilesLines
* Merge issue #9583: Document startup option/environment interaction.Andrew Svetlov2012-10-171-2/+4
|\
| * Merge issue #9583: Document startup option/environment interaction.Andrew Svetlov2012-10-171-2/+4
| |\
| | * Issue #9583: Document startup option/environment interaction.Andrew Svetlov2012-10-171-2/+4
* | | Merge issue #16265: Fix collapsing of code sample in tutorial.Andrew Svetlov2012-10-171-1/+1
|\ \ \ | |/ /
| * | Merge issue #16265: Fix collapsing of code sample in tutorial.Andrew Svetlov2012-10-171-1/+1
| |\ \ | | |/
| | * Issue #16265: Fix collapsing of code sample in tutorial.Andrew Svetlov2012-10-171-1/+1
* | | Merge: A couple more whatsnew updates.R David Murray2012-10-171-0/+14
|\ \ \ | |/ /
| * | A couple more whatsnew updates.R David Murray2012-10-171-0/+14
* | | Merge typo fix.Ezio Melotti2012-10-161-1/+1
|\ \ \ | |/ /
| * | Fix typo.Ezio Melotti2012-10-161-1/+1
* | | Merge concurrent.futures dict comp tweak from 3.3Nick Coghlan2012-10-161-5/+3
|\ \ \ | |/ /
| * | A dict comprehension is much prettier (thanks Antoine)Nick Coghlan2012-10-161-5/+3
* | | Merge concurrent.futures example changes from 3.3Nick Coghlan2012-10-161-10/+15
|\ \ \ | |/ /
| * | Tweak the threaded example in concurrent.futuresNick Coghlan2012-10-161-10/+15
* | | Merge issue #15936: Reformat text for os.random to follow Larry Hastings sugg...Andrew Svetlov2012-10-161-2/+2
|\ \ \ | |/ /
| * | Issue #15936: Reformat text for os.random to follow Larry Hastings suggestionAndrew Svetlov2012-10-161-2/+2
* | | Merge issue #15936: Add link from os.urandom to random.SystemRandomAndrew Svetlov2012-10-161-0/+3
|\ \ \ | |/ /
| * | Issue #15936: Add link from os.urandom to random.SystemRandomAndrew Svetlov2012-10-161-0/+3
* | | Issue #16225: Merge from 3.3: Add additional note to tutorial about looping.Chris Jerdonek2012-10-162-11/+24
|\ \ \ | |/ /
| * | Issue #16225: Merge from 3.2: Add additional note to tutorial about looping.Chris Jerdonek2012-10-162-11/+24
| |\ \ | | |/
| | * Issue #16225: Add additional note to tutorial about changing sequence while l...Chris Jerdonek2012-10-162-11/+24
* | | Issue #16206: Merge dict documentation improvements from 3.3.Chris Jerdonek2012-10-132-28/+39
|\ \ \ | |/ /
| * | Issue #16206: Merge dict documentation improvements from 3.2.Chris Jerdonek2012-10-132-28/+39
| |\ \ | | |/
| | * Issue #16206: Improve the documentation of the dict constructor.Chris Jerdonek2012-10-132-28/+39
* | | Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.Chris Jerdonek2012-10-132-11/+19
|\ \ \ | |/ /
| * | Undo changes accidentally reverted in de8787029fe4.Chris Jerdonek2012-10-132-11/+19
* | | merge 3.3Benjamin Peterson2012-10-122-19/+11
|\ \ \ | |/ /
| * | merge headsBenjamin Peterson2012-10-125-9/+9
| |\ \
| * \ \ merge 3.2Benjamin Peterson2012-10-1211-236/+232
| |\ \ \ | | | |/ | | |/|
* | | | Merge __next__ method link fixes with 3.3.Ezio Melotti2012-10-1210-56/+61
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge __next__ method link fixes with 3.2.Ezio Melotti2012-10-1210-56/+61
| |\ \ \ | | | |/ | | |/|
| | * | Fix links to the __next__ method.Ezio Melotti2012-10-1210-55/+60
* | | | Merge doctest fixes in functional howto with 3.3.Ezio Melotti2012-10-121-27/+18
|\ \ \ \ | |/ / /
| * | | Merge doctest fixes in functional howto with 3.2.Ezio Melotti2012-10-121-27/+18
| |\ \ \ | | |/ /
| | * | Make doctests pass in the functional howto.Ezio Melotti2012-10-121-26/+17
* | | | Merge functional howto improvements with 3.3.Ezio Melotti2012-10-121-155/+156
|\ \ \ \ | |/ / /
| * | | Merge functional howto improvements with 3.2.Ezio Melotti2012-10-121-155/+156
| |\ \ \ | | |/ /
| | * | Improve markup in functional.rst, and fix a couple of errors.Ezio Melotti2012-10-121-155/+155
* | | | Merge link additions/fixes with 3.3.Ezio Melotti2012-10-124-6/+14
|\ \ \ \ | |/ / /
| * | | Fix and add more links.Ezio Melotti2012-10-124-6/+14
* | | | Merge from 3.3: Add and adjust some string-related links in the docs.Chris Jerdonek2012-10-122-10/+9
|\ \ \ \ | |/ / /
| * | | Add and adjust some string-related links in the docs.Chris Jerdonek2012-10-122-10/+9
* | | | Merge from 3.3: Fix link to str.format() in docs.Chris Jerdonek2012-10-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge from 3.2: Fix link to str.format() in docs.Chris Jerdonek2012-10-121-1/+1
| |\ \ \ | | |/ /
| | * | Fix link to str.format() in docs.Chris Jerdonek2012-10-121-1/+1
* | | | Issue #16199: Merge 2to3 typo fix from 3.3 (and resolve previous merge).Chris Jerdonek2012-10-111-1/+1
|\ \ \ \ | |/ / /
| * | | Issue #16199: Merge 2to3 typo fix from 3.2.Chris Jerdonek2012-10-111-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Issue #16199: Fix typo in 2to3 docs. Thanks to Mark Lawrence for the report.Chris Jerdonek2012-10-111-1/+1
* | | Closes #15776: pyvenv now works with existing directories.Vinay Sajip2012-10-111-3/+2
* | | Automated merge with ssh://hg.python.org/cpythonSenthil Kumaran2012-10-111-0/+3
|\ \ \