Skip to content

Commit 13796db

Browse files
AA-TurnerAA-Turner
committed
Revert more
1 parent ab4e765 commit 13796db

File tree

11 files changed

+39
-94
lines changed

11 files changed

+39
-94
lines changed

‎doc/development/html_themes/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ If your theme package contains two or more themes, please call
214214
.. versionadded:: 1.2
215215
'sphinx_themes' entry_points feature.
216216

217-
.. versionchanged:: 1.6
217+
.. deprecated:: 1.6
218218
``sphinx_themes`` entry_points has been deprecated.
219219

220220
.. versionadded:: 1.6

‎doc/latex.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ Keys that you may want to override include:
289289
Default: ``''``
290290

291291
.. deprecated:: 1.5
292-
293292
Use ``'atendofbody'`` key instead.
294293

295294
Keys that don't need to be overridden unless in special cases are:

‎doc/usage/configuration.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,6 @@ and also make use of these options.
21042104

21052105

21062106
.. deprecated:: 1.6
2107-
21082107
``'mecab'``, ``'janome'`` and ``'default'`` is deprecated.
21092108
To keep compatibility,
21102109
``'mecab'``, ``'janome'`` and ``'default'`` are also acceptable.

‎sphinx/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ def setup(app):
11171117
11181118
.. versionchanged:: 0.6
11191119
Docutils 0.5-style directive classes are now supported.
1120-
.. versionchanged:: 1.8
1120+
.. deprecated:: 1.8
11211121
Docutils 0.4-style (function based) directives support is deprecated.
11221122
.. versionchanged:: 1.8
11231123
Add *override* keyword.

‎tests/roots/test-changes/base.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
Version markup
22
--------------
33

4-
.. versionadded:: 0.6
4+
.. version-added:: 0.6
55
Some funny **stuff**.
66

7-
.. versionchanged:: 0.6
7+
.. version-changed:: 0.6
88
Even more funny stuff.
99

10-
.. deprecated:: 0.6
10+
.. version-deprecated:: 0.6
1111
Boring stuff.
1212

13-
.. versionremoved:: 0.6
13+
.. version-removed:: 0.6
1414
Goodbye boring stuff.
1515

16-
.. versionadded:: 1.2
16+
.. version-added:: 1.2
1717

1818
First paragraph of version-added.
1919

20-
.. versionchanged:: 1.2
20+
.. version-changed:: 1.2
2121
First paragraph of version-changed.
2222

2323
Second paragraph of version-changed.
2424

25-
.. deprecated:: 1.3
25+
.. version-deprecated:: 1.3
2626
First paragraph of version-deprecated.
2727

2828
.. versionadded:: 0.6

‎tests/roots/test-changes/library/utils.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Classes
1818

1919
.. versionadded:: 0.5
2020

21-
Innovative new way to handle paths.
21+
Innovative new way to handle paths.
2222

23-
.. deprecated:: 0.6
23+
.. deprecated:: 0.6
2424

2525
So, that was a bad idea it turns out.

‎tests/roots/test-intl/versionchange.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
i18n with versionchange
44
============================
55

6-
.. version-deprecated:: 1.0
7-
This is the *first* paragraph of version-deprecated.
6+
.. deprecated:: 1.0
7+
This is the *first* paragraph of deprecated.
88

9-
This is the *second* paragraph of version-deprecated.
9+
This is the *second* paragraph of deprecated.
1010

11-
.. version-added:: 1.0
12-
This is the *first* paragraph of version-added.
11+
.. versionadded:: 1.0
12+
This is the *first* paragraph of versionadded.
1313

14-
.. version-changed:: 1.0
14+
.. versionchanged:: 1.0
1515

16-
This is the *first* paragraph of version-changed.
16+
This is the *first* paragraph of versionchanged.
1717

18-
.. version-removed:: 1.0 This is the *first* paragraph of version-removed.
18+
.. versionremoved:: 1.0 This is the *first* paragraph of versionremoved.

‎tests/roots/test-intl/xx/LC_MESSAGES/versionchange.po

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,12 @@ msgstr ""
1919
msgid "i18n with versionchange"
2020
msgstr "I18N WITH VERSIONCHANGE"
2121

22-
msgid "This is the *first* paragraph of version-deprecated."
23-
msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSION-DEPRECATED."
24-
25-
msgid "This is the *second* paragraph of version-deprecated."
26-
msgstr "THIS IS THE *SECOND* PARAGRAPH OF VERSION-DEPRECATED."
27-
28-
msgid "This is the *first* paragraph of version-added."
29-
msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSION-ADDED."
30-
31-
msgid "This is the *first* paragraph of version-changed."
32-
msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSION-CHANGED."
33-
34-
msgid "This is the *first* paragraph of version-removed."
35-
msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSION-REMOVED."
36-
3722
msgid "This is the *first* paragraph of deprecated."
3823
msgstr "THIS IS THE *FIRST* PARAGRAPH OF DEPRECATED."
3924

25+
msgid "This is the *second* paragraph of deprecated."
26+
msgstr "THIS IS THE *SECOND* PARAGRAPH OF DEPRECATED."
27+
4028
msgid "This is the *first* paragraph of versionadded."
4129
msgstr "THIS IS THE *FIRST* PARAGRAPH OF VERSIONADDED."
4230

‎tests/roots/test-root/markup.txt

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -292,38 +292,27 @@ Figures
292292
Version markup
293293
--------------
294294

295-
.. version-added:: 0.6
295+
.. versionadded:: 0.6
296296
Some funny **stuff**.
297297

298-
.. version-changed:: 0.6
298+
.. versionchanged:: 0.6
299299
Even more funny stuff.
300300

301-
.. version-deprecated:: 0.6
301+
.. deprecated:: 0.6
302302
Boring stuff.
303303

304-
.. version-removed:: 0.6
304+
.. versionremoved:: 0.6
305305
Goodbye boring stuff.
306306

307-
.. version-added:: 1.2
308-
309-
First paragraph of version-added.
310-
311-
.. version-changed:: 1.2
312-
First paragraph of version-changed.
307+
.. versionadded:: 1.2
313308

314-
Second paragraph of version-changed.
309+
First paragraph of versionadded.
315310

316-
.. version-added:: 0.6
317-
Deprecated alias for version-added.
311+
.. versionchanged:: 1.2
312+
First paragraph of versionchanged.
318313

319-
.. version-changed:: 0.6
320-
Deprecated alias for version-changed.
314+
Second paragraph of versionchanged.
321315

322-
.. deprecated:: 0.6
323-
Deprecated alias for version-deprecated.
324-
325-
.. versionremoved:: 0.6
326-
Deprecated alias for version-removed.
327316

328317
Code blocks
329318
-----------

‎tests/test_builders/test_build_html_5_output.py

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -205,53 +205,23 @@ def checker(nodes: Iterable[Element]) -> Literal[True]:
205205
(
206206
'markup.html',
207207
".//div[@class='versionadded']/p/span",
208-
tail_check('First paragraph of version-added'),
209-
),
210-
(
211-
'markup.html',
212-
".//div[@class='versionadded']/p/span",
213-
tail_check('Deprecated alias for version-added'),
208+
tail_check('First paragraph of versionadded'),
214209
),
215210
(
216211
'markup.html',
217212
".//div[@class='versionchanged']/p/span",
218-
tail_check('First paragraph of version-changed'),
213+
tail_check('First paragraph of versionchanged'),
219214
),
220215
(
221216
'markup.html',
222217
".//div[@class='versionchanged']/p",
223-
'Second paragraph of version-changed',
224-
),
225-
(
226-
'markup.html',
227-
".//div[@class='versionchanged']/p/span",
228-
tail_check('Deprecated alias for version-changed'),
229-
),
230-
(
231-
'markup.html',
232-
".//div[@class='deprecated']/p/span",
233-
'Deprecated since version 0.6: ',
234-
),
235-
(
236-
'markup.html',
237-
".//div[@class='deprecated']/p/span",
238-
tail_check('Boring stuff.'),
239-
),
240-
(
241-
'markup.html',
242-
".//div[@class='deprecated']/p/span",
243-
tail_check('Deprecated alias for version-deprecated'),
218+
'Second paragraph of versionchanged',
244219
),
245220
(
246221
'markup.html',
247222
".//div[@class='versionremoved']/p/span",
248223
'Removed in version 0.6: ',
249224
),
250-
(
251-
'markup.html',
252-
".//div[@class='versionremoved']/p/span",
253-
tail_check('Deprecated alias for version-removed'),
254-
),
255225
# footnote reference
256226
('markup.html', ".//a[@class='footnote-reference brackets']", r'1'),
257227
# created by reference lookup

0 commit comments

Comments
 (0)