@@ -80,21 +80,20 @@ to enter the public source tree. Ask yourself the following questions:
80
80
Updating NEWS and What's New in Python
81
81
--------------------------------------
82
82
83
- Almost all changes made to the code base deserve an entry in ``Misc/NEWS.d ``.
84
- If the change is particularly interesting for end users (e.g. new features,
85
- significant improvements, or backwards-incompatible changes), then an entry in
86
- the ``What's New in Python `` document (in ``Doc/whatsnew/ ``) should be added
87
- as well. Changes that affect documentation only generally do not require
88
- a ``NEWS `` entry.
83
+ Changes that require NEWS entries
84
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
89
85
90
- There are two notable exceptions to this general principle, and they
91
- both relate to changes that :
86
+ Most changes made to the codebase deserve an entry in :cpy-file: ` Misc/NEWS.d `,
87
+ except for the following :
92
88
93
- * Already have a ``NEWS `` entry
94
- * Have not yet been included in any formal release (including alpha
95
- and beta releases)
89
+ * documentation changes
90
+ * test changes
91
+ * strictly internal changes with no user-visible effects
92
+ * changes that already have a ``NEWS `` entry
93
+ * reverts that have not yet been included in any formal release
94
+ (including alpha and beta releases)
96
95
97
- These are the two exceptions :
96
+ For the last two, note the following :
98
97
99
98
#. **If a change is reverted prior to release **, then the corresponding
100
99
entry is simply removed. Otherwise, a new entry must be added noting
@@ -105,8 +104,24 @@ These are the two exceptions:
105
104
change and the original ** ``NEWS `` **entry remains valid **, then no additional
106
105
entry is needed.
107
106
108
- If a change needs an entry in ``What's New in Python ``, then it is very
109
- likely not suitable for including in a maintenance release.
107
+ Changes that require "What's New in Python" entries
108
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
109
+
110
+ If a change is particularly interesting for end users (e.g. new features,
111
+ significant improvements, or backwards-incompatible changes), add an entry in
112
+ the "What's New in Python" document (in :cpy-file: `Doc/whatsnew/ `)
113
+ in addition to the ``NEWS `` entry.
114
+
115
+ In most cases, it is sufficient to reuse the wording from the ``NEWS `` entry
116
+ in the "What's New in Python" entry.
117
+
118
+ .. note ::
119
+
120
+ A change that needs an entry in "What's New in Python",
121
+ is very likely not suitable for inclusion in a maintenance release.
122
+
123
+ How to add a NEWS entry
124
+ ^^^^^^^^^^^^^^^^^^^^^^^
110
125
111
126
``NEWS `` entries go into the ``Misc/NEWS.d `` directory as individual files. The
112
127
``NEWS `` entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/ >`_,
@@ -132,6 +147,17 @@ to the standard library). The file name itself should be in the format
132
147
As a result, a file name can look something like
133
148
``Misc/NEWS.d/next/Library/2017-05-27-16-46-23.gh-issue-12345.Yl4gI2.rst ``.
134
149
150
+ How to write a NEWS entry
151
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
152
+
153
+ All ``NEWS `` entries end up being part of the changelog.
154
+ The changelog contains *a lot * of entries,
155
+ and its intended audience is mainly users, not core devs and contributors.
156
+ Take this into consideration when wording your ``NEWS `` entry.
157
+ Describe the user-visible effects of your change succinctly and accurately;
158
+ avoid long technical elaborations, digressions, and do not expect or require
159
+ the reader to have read the actual diff for the change.
160
+
135
161
The contents of a ``NEWS `` file should be valid reStructuredText. An 80 character
136
162
column width should be used. There is no indentation or leading marker in the
137
163
file (e.g. ``- ``). There is also no need to start the entry with the issue
@@ -146,9 +172,6 @@ The inline Sphinx roles like ``:func:`` can be used help readers
146
172
find more information. You can build HTML and verify that the
147
173
link target is appropriate by using :ref: `make html <building-using-make >`.
148
174
149
- While Sphinx roles can be beneficial to readers, they are not required.
150
- Inline ````code blocks`` `` can be used instead.
151
-
152
175
153
176
Working with Git _
154
177
-----------------
0 commit comments