On Mon, May 25, 2020 at 12:16:49 -0400, Chen Hanxiao wrote:
Signed-off-by: Chen Hanxiao <chen_han_xiao(a)126.com>
---
docs/formatdomain.html.in | 6 +++++-
docs/news.xml | 10 ++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 23eb029234..4e2320d537 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
[...]
diff --git a/docs/news.xml b/docs/news.xml
index 4cef804aac..67fb85377d 100644
--- a/docs/news.xml
+++ b/docs/news.xml
Changes to 'news.xml' must be in a separate commit. This is to decrease
likelihood of conflicts when backporting patches.