Merge 3.2

08133c2e · Brian Curtin · 9a4ff437 · 655b0c46 · 08133c2e · 08133c2e
Commit 08133c2e authored Dec 17, 2012 by Brian Curtin
Expand all Show whitespace changes
Inline Side-by-side

Showing with 30 additions and 305 deletions

Doc/faq/windows.rst Doc/faq/windows.rst +27 -305

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,9 @@ Tools/Demos
 Documentation
 -------------

+- Issue #14901: Update portions of the Windows FAQ.
+  Patch by Ashish Nitin Patil.
+
 - Issue #16267: Better document the 3.3+ approach to combining
  @abstractmethod with @staticmethod, @classmethod and @property