From b0410c596094d91cef70a77f3add2cb374900194 Mon Sep 17 00:00:00 2001
From: Asterisk Development Team <asteriskteam@digium.com>
Date: Wed, 9 Sep 2020 09:02:54 -0500
Subject: [PATCH] Update CHANGES and UPGRADE.txt for 17.8.0

---
 CHANGES                                       | 22 +++++++++++++++++++
 doc/CHANGES-staging/logger_format.txt         | 12 ----------
 .../pjsip_send_session_refresh.txt            |  4 ----
 3 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 doc/CHANGES-staging/logger_format.txt
 delete mode 100644 doc/CHANGES-staging/pjsip_send_session_refresh.txt

diff --git a/CHANGES b/CHANGES
index 0500e9aadd..a3903e9a32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,28 @@
 ===
 ==============================================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 17.7.0 to Asterisk 17.8.0 ------------
+------------------------------------------------------------------------------
+
+chan_pjsip
+------------------
+ * The PJSIP_SEND_SESSION_REFRESH dialplan function now issues a warning, and
+   returns unsuccessful if it's used on a channel prior to answering.
+
+logger
+------------------
+ * Added a new log formatter called "plain" that always prints
+   file, function and line number if available (even for verbose
+   messages) and never prints color control characters.  Most
+   suitable for file output but can be used for other channels
+   as well.
+
+   You use it in logger.conf like so:
+   debug => [plain]debug
+   console => [plain]error,warning,debug,notice,pjsip_history
+   messages => [plain]warning,error,verbose
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 17.5.0 to Asterisk 17.6.0 ------------
 ------------------------------------------------------------------------------
diff --git a/doc/CHANGES-staging/logger_format.txt b/doc/CHANGES-staging/logger_format.txt
deleted file mode 100644
index 58d864d673..0000000000
--- a/doc/CHANGES-staging/logger_format.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: logger
-
-Added a new log formatter called "plain" that always prints
-file, function and line number if available (even for verbose
-messages) and never prints color control characters.  Most
-suitable for file output but can be used for other channels
-as well.
-
-You use it in logger.conf like so:
-debug => [plain]debug
-console => [plain]error,warning,debug,notice,pjsip_history
-messages => [plain]warning,error,verbose
diff --git a/doc/CHANGES-staging/pjsip_send_session_refresh.txt b/doc/CHANGES-staging/pjsip_send_session_refresh.txt
deleted file mode 100644
index 0705c293d7..0000000000
--- a/doc/CHANGES-staging/pjsip_send_session_refresh.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Subject: chan_pjsip
-
-The PJSIP_SEND_SESSION_REFRESH dialplan function now issues a warning, and
-returns unsuccessful if it's used on a channel prior to answering.