Skip to content

Commit

Permalink
Merge branch '4.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
tk0miya committed Nov 17, 2021
2 parents 6753a0e + 7d7c59a commit ecee233
Show file tree
Hide file tree
Showing 36 changed files with 887 additions and 776 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/create-release.yml
@@ -0,0 +1,18 @@
name: Create release

on:
push:
tags:
- "v*.*.*"

jobs:
create-release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
body: "Changelog: https://www.sphinx-doc.org/en/master/changes.html"
24 changes: 24 additions & 0 deletions CHANGES
Expand Up @@ -41,9 +41,14 @@ Deprecated
Features added
--------------

* #9815: html theme: Wrap sidebar components in div to allow customizing their
layout via CSS

Bugs fixed
----------

* #9857: Generated RFC links use outdated base url

Testing
--------

Expand All @@ -65,6 +70,9 @@ Features added
Bugs fixed
----------

* #9838: autodoc: AttributeError is raised on building document for functions
decorated by functools.lru_cache

Testing
--------

Expand Down Expand Up @@ -1675,6 +1683,14 @@ Bugs fixed
:confval:`intersphinx_mapping` on :event:`config-inited` event
* #7343: Sphinx builds has been slower since 2.4.0 on debug mode

Release 2.4.5 (released Nov 18, 2021)
=====================================

Dependencies
------------

* #9807: Restrict docutils to 0.17.x or older

Release 2.4.4 (released Mar 05, 2020)
=====================================

Expand Down Expand Up @@ -2511,6 +2527,14 @@ Testing

* Add a helper function: ``sphinx.testing.restructuredtext.parse()``

Release 1.8.6 (released Nov 18, 2021)
=====================================

Dependencies
------------

* #9807: Restrict docutils to 0.17.x or older

Release 1.8.5 (released Mar 10, 2019)
=====================================

Expand Down
4 changes: 2 additions & 2 deletions doc/usage/configuration.rst
Expand Up @@ -1005,7 +1005,7 @@ that use Sphinx's HTMLWriter class.
to indicate the location of document using `The Canonical Link Relation`_.
Default: ``''``.

.. _The Canonical Link Relation: https://tools.ietf.org/html/rfc6596
.. _The Canonical Link Relation: https://datatracker.ietf.org/doc/html/rfc6596

.. versionadded:: 1.8

Expand Down Expand Up @@ -2679,7 +2679,7 @@ Options for the linkcheck builder
doubling the wait time between attempts until it succeeds or exceeds the
``linkcheck_rate_limit_timeout``. By default, the timeout is 5 minutes.

.. _Retry-After: https://tools.ietf.org/html/rfc7231#section-7.1.3
.. _Retry-After: https://datatracker.ietf.org/doc/html/rfc7231#section-7.1.3

.. versionadded:: 3.4

Expand Down
2 changes: 1 addition & 1 deletion sphinx/environment/__init__.py
Expand Up @@ -51,7 +51,7 @@
'cloak_email_addresses': True,
'pep_base_url': 'https://www.python.org/dev/peps/',
'pep_references': None,
'rfc_base_url': 'https://tools.ietf.org/html/',
'rfc_base_url': 'https://datatracker.ietf.org/doc/html/',
'rfc_references': None,
'input_encoding': 'utf-8-sig',
'doctitle_xform': False,
Expand Down
Binary file modified sphinx/locale/cy/LC_MESSAGES/sphinx.mo
Binary file not shown.

0 comments on commit ecee233

Please sign in to comment.