summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Paige <ucodery@gmail.com>2022-05-06 09:58:49 -0700
committerJeremy Paige <ucodery@gmail.com>2022-05-06 09:58:49 -0700
commit63d16710e7a698a10470436b6c786306c8afb580 (patch)
treedc937b417250504160af9df1a320ebb6d0b491d2
parentb48553867034d8d60528045fc8cfb2521fcfff85 (diff)
downloadpython-setuptools-git-63d16710e7a698a10470436b6c786306c8afb580.tar.gz
update changelog to cover new chagnes
-rw-r--r--changelog.d/3307.doc.rst5
-rw-r--r--docs/references/keywords.rst2
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/3307.doc.rst b/changelog.d/3307.doc.rst
index 5f9c2d72..cdab8737 100644
--- a/changelog.d/3307.doc.rst
+++ b/changelog.d/3307.doc.rst
@@ -1 +1,4 @@
-Linked the userguide keywords documentation to the more complete references keywords documentation
+Added introduction to references/keywords
+Added deprecation tags to test kwargs
+Moved userguide/keywords to deprecated section
+Clarified in deprecated doc what keywords came from distutils and which were added or changed by setuptools
diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst
index fcc77970..f231b2b8 100644
--- a/docs/references/keywords.rst
+++ b/docs/references/keywords.rst
@@ -252,8 +252,6 @@ extensions).
Each package may be followed by an environment marker after a semicolon
(e.g. ``foo; os_name == "posix"``).
-.. Below are setuptools keywords, above are distutils
-
.. _keyword/include_package_data:
``include_package_data``