From: Ned Deily <nad@python.org>
Date: Mon, 6 Jun 2016 00:39:58 +0000 (-0700)
Subject: Issue #26014: merge from 3.5
X-Git-Tag: v3.6.0a2~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=223b874c006db4c8cb765ecec1b1d3aebcfce3fa;p=python

Issue #26014: merge from 3.5
---

223b874c006db4c8cb765ecec1b1d3aebcfce3fa
diff --cc Misc/NEWS
index 956f2d288d,feb0c624b8..8137b16c59
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1255,9 -540,13 +1255,13 @@@ Documentatio
  
  - Issue #23606: Adds note to ctypes documentation regarding cdll.msvcrt.
  
 -- Issue #25500: Fix documentation to not claim that __import__ is searched for
 -  in the global scope.
 +- Issue #24952: Clarify the default size argument of stack_size() in
 +  the "threading" and "_thread" modules. Patch from Mattip.
  
+ - Issue #26014: Update 3.x packaging documentation:
+   * "See also" links to the new docs are now provided in the legacy pages
+   * links to setuptools documentation have been updated
+ 
  Tests
  -----