Skip to content

Commit 936e7be

Browse files
authored
Merge pull request #832 from sphinx-contrib/maintenance/2023-07-16
Maintenance updates (2023-07-16)
2 parents 9815dd0 + b4afd17 commit 936e7be

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

doc/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
# iso datetime support
8787
# disable hyphenatation
8888
# disable justified text
89+
# remove italics from links
8990
'preamble': r'''
9091
\usepackage{datetime2}
9192
\usepackage[none]{hyphenat}
9293
\usepackage[document]{ragged2e}
94+
\def\sphinxcrossref#1{#1}
9395
''',
9496
}
9597

doc/features.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ Type Notes
206206
`mlx.traceability`_ Limited support.
207207

208208
Formatting of content may not be as expected.
209+
`sphinx-data-viewer`_ Limited support.
210+
211+
Can render JSON data inside code blocks.
212+
Content has collapse all data or expand all
213+
data, but not parts of the data.
209214
`sphinx-diagrams`_ Supported
210215
`sphinx-gallery`_ Supported
211216
`sphinx-needs`_ Limited support.
@@ -311,6 +316,7 @@ brings up another concern, feel free to bring up an issue:
311316
.. _rubric: https://docutils.sourceforge.io/docs/ref/rst/directives.html#rubric
312317
.. _sections: https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#sections
313318
.. _sphinx-confluence-nbsphinx-test: https://github.com/jdknight/sphinx-confluence-nbsphinx-test
319+
.. _sphinx-data-viewer: https://sphinx-data-viewer.readthedocs.io/
314320
.. _sphinx-diagrams: https://pypi.org/project/sphinx-diagrams/
315321
.. _sphinx-gallery: https://sphinx-gallery.github.io/
316322
.. _sphinx-needs: https://sphinxcontrib-needs.readthedocs.io/

doc/guide-ci.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. raw:: latex
2+
3+
\newpage
4+
15
.. _tip_manage_publish_subset:
26

37
.. index:: Continuous integration

doc/roles.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,6 @@ generated Confluence documents.
203203
Strikethrough
204204
-------------
205205

206-
.. note::
207-
208-
This role can be used to help a user observe the ability to strikethrough
209-
text on a Confluence page; however, this role only applies to Confluence
210-
builders. Users attempting to support multiple builders (such as the
211-
``html`` builder), are recommended to use a ``class`` hint instead. This
212-
extension supports an applied ``strike`` class on text as an indication
213-
that the text should have a strikethrough format. For example:
214-
215-
.. code-block:: rst
216-
217-
.. role:: strike
218-
:class: strike
219-
220-
This is a :strike:`strikeme` example.
221-
222206
The following role can be used to explicitly define strikethrough text into
223207
generated Confluence documents.
224208

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#: sphinxcontrib/confluencebuilder/singlebuilder.py:81
1+
#: sphinxcontrib/confluencebuilder/singlebuilder.py:78
22
msgid "assembling single confluence document"
33
msgstr ""
44

5-
#: sphinxcontrib/confluencebuilder/singlebuilder.py:110
5+
#: sphinxcontrib/confluencebuilder/singlebuilder.py:107
66
msgid "writing single confluence document"
77
msgstr ""
88

@@ -11,11 +11,11 @@ msgstr ""
1111
#: sphinxcontrib/confluencebuilder/storage/templates/genindex.html:37
1212
#: sphinxcontrib/confluencebuilder/storage/templates/genindex_v2.html:37
1313
#: sphinxcontrib/confluencebuilder/storage/templates/search.html:10
14-
#: sphinxcontrib/confluencebuilder/storage/translator.py:2299
14+
#: sphinxcontrib/confluencebuilder/storage/translator.py:2459
1515
msgid "This page has been automatically generated."
1616
msgstr ""
1717

18-
#: sphinxcontrib/confluencebuilder/storage/translator.py:2323
18+
#: sphinxcontrib/confluencebuilder/storage/translator.py:2483
1919
msgid "Edit Source"
2020
msgstr ""
2121

0 commit comments

Comments
 (0)