From e3080971b33308acb221507084fa7a529b990b07 Mon Sep 17 00:00:00 2001
From: Katja Suess <k.suess@rohberg.ch>
Date: Sat, 11 Jan 2020 11:04:19 +0100
Subject: [PATCH] rebase cleanup

---
 news/163.bugfix      | 2 ++
 news/163.enhancement | 2 --
 news/163.feature.1   | 1 +
 news/163.feature.2   | 2 ++
 news/164.enhancement | 3 ---
 news/164.feature     | 3 +++
 6 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 news/163.bugfix
 delete mode 100644 news/163.enhancement
 create mode 100644 news/163.feature.1
 create mode 100644 news/163.feature.2
 delete mode 100644 news/164.enhancement
 create mode 100644 news/164.feature

diff --git a/news/163.bugfix b/news/163.bugfix
new file mode 100644
index 0000000..6bab990
--- /dev/null
+++ b/news/163.bugfix
@@ -0,0 +1,2 @@
+``/@@moderate-publish-comment``: publish only pending comment, else show status message "comment already approved".
+[ksuess]
diff --git a/news/163.enhancement b/news/163.enhancement
deleted file mode 100644
index f6ee230..0000000
--- a/news/163.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-link of notification mail: /@@moderate-publish-comment : publish only pending comment, else show status message "comment already approved"
-[ksuess]
diff --git a/news/163.feature.1 b/news/163.feature.1
new file mode 100644
index 0000000..e6963b7
--- /dev/null
+++ b/news/163.feature.1
@@ -0,0 +1 @@
+Notification for moderator: show email address of commentator.
diff --git a/news/163.feature.2 b/news/163.feature.2
new file mode 100644
index 0000000..48658e7
--- /dev/null
+++ b/news/163.feature.2
@@ -0,0 +1,2 @@
+Link to the commented page for editing, approving, deleting comment instead of linking to ``/@@moderate-publish-comment`` and ``@@moderate-delete-comment``.
+[ksuess]
diff --git a/news/164.enhancement b/news/164.enhancement
deleted file mode 100644
index 6feb63a..0000000
--- a/news/164.enhancement
+++ /dev/null
@@ -1,3 +0,0 @@
-Additional optional workflow: workflow with two more states: rejected and spam,
-    added to existing states pending and published. Moderation view extended to handle four workflow states.
-[ksuess]
diff --git a/news/164.feature b/news/164.feature
new file mode 100644
index 0000000..0810d8f
--- /dev/null
+++ b/news/164.feature
@@ -0,0 +1,3 @@
+Extended existing review workflow by stati ``rejected`` and ``spam``
+Moderation view extended to handle four workflow states.
+[ksuess]