Skip to content

Commit

Permalink
Merge branch 'master' into nienn/fix-sphinx-4-pre-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
agjohnson committed Sep 7, 2021
2 parents 2774670 + 20f205f commit e319184
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
14 changes: 9 additions & 5 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Other Changes
* Use regular toctree instead of toc for singlehtml builder (#507)
* Cleanup whitespace in templates (#1060)

.. _0.5.2:
.. _release-0.5.2:

0.5.2
=====
Expand All @@ -71,7 +71,7 @@ Other Changes

* Depend on docutils < 0.17 (#1113)

.. _0.5.1:
.. _release-0.5.1:

0.5.1
=====
Expand Down Expand Up @@ -103,7 +103,7 @@ Other Changes
* Make Copyright template match sphinx's basic (#933)
* Packaging: include ``bin/preinstall.js`` (#1005)

.. _0.5.0:
.. _release-0.5.0:

0.5.0
=====
Expand All @@ -115,6 +115,8 @@ Fixes

* Fix bullet list spacing to respect simple/complex list styles

.. _release-0.5.0rc2:

0.5.0rc2
========

Expand All @@ -128,6 +130,8 @@ Fixes
* Fix several margin issues with lists, nested lists, and nested content
* Add colon back to field lists

.. _release-0.5.0rc1:

0.5.0rc1
========

Expand All @@ -147,7 +151,7 @@ Other Changes
* Moved build system from Grunt and friends to Webpack
* Remove Modernizr, but keep html5shiv (#724, #525)

.. _0.4.3:
.. _release-0.4.3:

0.4.3
=====
Expand All @@ -169,7 +173,7 @@ Fixes
Other Changes
--------------

.. _0.4.2:
.. _release-0.4.2:

0.4.2
=====
Expand Down
8 changes: 4 additions & 4 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ version:
.. _semantic versioning: http://semver.org/

.. _1.0.0:
.. _release-1.0.0:

1.0.0
~~~~~
Expand Down Expand Up @@ -126,7 +126,7 @@ HTML4 support is deprecated
Support for the Sphinx HTML4 writer will be removed in the :ref:`2.0.0`
release.

.. _1.1.0:
.. _release-1.1.0:

1.1.0
~~~~~
Expand All @@ -138,7 +138,7 @@ the 1.x release series. The 1.1 release will not be adding any major features
and will instead mark the last release targeting projects with old dependencies
like Sphinx 1.8, HTML4, or required support for IE11.

.. _2.0.0:
.. _release-2.0.0:

2.0.0
~~~~~
Expand Down Expand Up @@ -166,7 +166,7 @@ HTML4 support will be removed
support and should no longer be required to use a modern combination of this
theme and Sphinx.

.. _3.0.0:
.. _release-3.0.0:

3.0.0
~~~~~
Expand Down

0 comments on commit e319184

Please sign in to comment.