From 7770968d99638c8174182c93f584bfda34e0ca50 Mon Sep 17 00:00:00 2001
From: David Yu Yang <davidyang6us@gmail.com>
Date: Mon, 25 Oct 2021 12:00:27 +0800
Subject: [PATCH] Update news file and remove extraneous lines from reno files

---
 NEWS.rst                                      | 69 +++++++++++++++++--
 ...ault-theme-detection-f2fa7918948e0135.yaml | 24 -------
 .../auto-hide-tabbar-e0809d4f550c970d.yaml    | 20 ------
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/NEWS.rst b/NEWS.rst
index 7766be941..23d23bce3 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -2,6 +2,60 @@
 guake
 =====
 
+(unreleased yet)
+================
+
+Release Summary
+---------------
+
+Fix system font application issue
+
+Use keycodes instead of keyvals for keybindings. This allow to use keybindings with different keyboard layouts.
+
+Known Issues
+------------
+
+- keybindings does not work with not English layout.
+
+Bug Fixes
+---------
+
+- - System font aplied only for last tab #1947 
+
+3.8.1
+=====
+
+Release Summary
+---------------
+
+Added line height and character width adjustment options
+
+Fix keybinding regressions
+
+Lazy focus loss to avoid closing on short-term losses
+
+Moved guake.desktop.metainfo.xml to $datadir
+
+New Features
+------------
+
+- - Feature request: Setting line-spacing / line-height #849 
+
+- - Support of short term focus loss and avoid folding #1643 
+
+Bug Fixes
+---------
+
+- - Some shortcut keys are abnormal #1939
+
+Notes for Package Maintainers
+-----------------------------
+
+- Glade layout file upgraded with 3.38.2 from last used 3.22.2, should
+  still be valid but some things may be deprecated/renamed.
+
+- guake.desktop.metainfo.xml has been moved to $datadir in Makefile
+
 3.8.0
 =====
 
@@ -181,7 +235,6 @@ Notes for Package Maintainers
   In the installation script, replacing [schema directory] with the place
   org.guake.gschema.xml is being saved.
 
-
 3.7.0
 =====
 
@@ -944,6 +997,15 @@ Notes for Package Maintainers
   I invite package maintainers to open tickets on Github about any other difficulties
   encountered when packaging Guake.
 
+3.0.6
+=====
+
+Bug Fixes
+---------
+
+- Hotfix of #1198 (Ctrl+D in the terminal does not close)
+  and #1014 (guake hangs on exit)
+
 3.0.5
 =====
 
@@ -1070,8 +1132,8 @@ Other
 -----
 
 - The dependencies of the Guake executable has been slightly better described in README.
-  There is an example for Debian/Ubuntu in the file ``scripts/bootstrap-dev-debian.sh`` which is
-  the main environment where Guake is developed and tested.
+  There is an example for Debian/Ubuntu in the file ``bootstrap-dev-debian.sh`` which is the main
+  environment where Guake is developed and tested.
 
 - Package maintainers are encouraged to submit their ``bootstrap-dev-[distribution].sh``,
   applicable for other distributions, to help users install Guake from source, and other package
@@ -1165,7 +1227,6 @@ New Features
   note directly from their Pull Request.
 
 - Update Guake window title when:
-  
     - the active tab changes
     - the active tab is renamed
     - the vte title changes
diff --git a/releasenotes/notes/add-system-default-theme-detection-f2fa7918948e0135.yaml b/releasenotes/notes/add-system-default-theme-detection-f2fa7918948e0135.yaml
index 9abc02b0f..53f468d66 100644
--- a/releasenotes/notes/add-system-default-theme-detection-f2fa7918948e0135.yaml
+++ b/releasenotes/notes/add-system-default-theme-detection-f2fa7918948e0135.yaml
@@ -6,32 +6,8 @@ features:
       - Now defaults to system default theme
       - New option to still allow independently setting guake's theme.
 
-known_issues:
-  - |
-      - None
-
 upgrade:
   - |
       - If a different theme from system default was already selected and
         desired, users may need to uncheck "Use system default theme" in
         properties->general
-
-deprecations:
-  - |
-    None
-
-security:
-  - |
-    None
-
-fixes:
-  - |
-    None
-
-notes_for_package_maintainers:
-  - |
-    None
-
-other:
-  - |
-    None
diff --git a/releasenotes/notes/auto-hide-tabbar-e0809d4f550c970d.yaml b/releasenotes/notes/auto-hide-tabbar-e0809d4f550c970d.yaml
index 3f98b93b7..3645b01ec 100644
--- a/releasenotes/notes/auto-hide-tabbar-e0809d4f550c970d.yaml
+++ b/releasenotes/notes/auto-hide-tabbar-e0809d4f550c970d.yaml
@@ -5,30 +5,10 @@ features:
   - |
       - Automatically hide the tab bar when there is only one tab #924
 
-known_issues:
-  - |
-      - None
-
 upgrade:
   - |
     If setting is undesired, uncheck the hide tab if one tab option in settings
 
-deprecations:
-  - |
-    None
-
-security:
-  - |
-    None
-
 fixes:
   - |
     fixes #924
-
-notes_for_package_maintainers:
-  - |
-    None
-
-other:
-  - |
-    None