aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Krewinkel <albert@zeitkraut.de>2020-06-15 21:04:07 +0200
committerAlbert Krewinkel <albert@zeitkraut.de>2020-06-15 21:16:35 +0200
commita6a7f08a2bffa9a806bc22b2a967ac15653046b7 (patch)
tree25e068bf9ffc06f25fc4e2225616f172effb1cbb
parente8f532780bfc59960dcd77eb8aac07e5e71402aa (diff)
downloadpandoc-a6a7f08a2bffa9a806bc22b2a967ac15653046b7.tar.gz
MANUAL: describe `jira` as "Jira/Confluence wiki markup"
In the past, Jira's wiki markup was also used by – and could be imported into – Atlassian Confluence. Closes: #6351
-rw-r--r--MANUAL.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index 52474c9bc..2a8e5fa3e 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -241,7 +241,7 @@ header when requesting a document from a URL:
- `html` ([HTML])
- `ipynb` ([Jupyter notebook])
- `jats` ([JATS] XML)
- - `jira` ([Jira] wiki markup)
+ - `jira` ([Jira]/Confluence wiki markup)
- `json` (JSON version of native AST)
- `latex` ([LaTeX])
- `markdown` ([Pandoc's Markdown])
@@ -298,7 +298,7 @@ header when requesting a document from a URL:
- `jats_articleauthoring` ([JATS] XML, Article Authoring Tag Set)
- `jats_publishing` ([JATS] XML, Journal Publishing Tag Set)
- `jats` (alias for `jats_archiving`)
- - `jira` ([Jira] wiki markup)
+ - `jira` ([Jira]/Confluence wiki markup)
- `json` (JSON version of native AST)
- `latex` ([LaTeX])
- `man` ([roff man])