aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorYuchen Pei <hi@ypei.me>2022-08-16 12:41:47 +1000
committerYuchen Pei <hi@ypei.me>2022-08-16 12:41:47 +1000
commit9c7202515e216826d10854a4c95c050b97551066 (patch)
treed46f4e258c523fdf857a274220658bd84ff22925 /doc
parent4a2ad11155014bcf13a7dbd7f6b9e2c530ac3b79 (diff)
parent4248704596d01753c9a776ebedf5cc598a883e28 (diff)
Merge remote-tracking branch 'upstream/main'
Diffstat (limited to 'doc')
-rw-r--r--doc/common-errors.rst2
-rw-r--r--doc/markup.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/common-errors.rst b/doc/common-errors.rst
index 9afa4ea7..504ee886 100644
--- a/doc/common-errors.rst
+++ b/doc/common-errors.rst
@@ -7,7 +7,7 @@ Common Errors
This is probably caused by the ``-- | xxx`` comment not following a declaration. I.e. use ``-- xxx`` instead. See :ref:`top-level-declaration`.
``parse error on input ‘-- $ xxx’``
-----------------------------------
+-----------------------------------
You've probably commented out code like::
diff --git a/doc/markup.rst b/doc/markup.rst
index 55ae3cb3..bae615cb 100644
--- a/doc/markup.rst
+++ b/doc/markup.rst
@@ -950,8 +950,8 @@ apostrophes themselves: to hyperlink ``foo'`` one would simply type
-- | A prefix operator @'(++)'@ and an infix identifier @'`elem`'@.
-Emphasis, Bold and Monospaced styled Text
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Emphasis, Bold and Monospaced Styled Text
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Text can be emphasized, made bold (strong) or monospaced (typewriter font)
by surrounding it with slashes, double-underscores or at-symbols: ::