From a6a7f08a2bffa9a806bc22b2a967ac15653046b7 Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Mon, 15 Jun 2020 21:04:07 +0200
Subject: [PATCH] MANUAL: describe `jira` as "Jira/Confluence wiki markup"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In the past, Jira's wiki markup was also used by – and could be imported
into – Atlassian Confluence.
Closes: #6351
---
MANUAL.txt | 4 ++--
1 file 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])