From 68a0c5b86fc8f074fbb2ad50ffdbf9aa388f76f1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Apr 2025 19:10:15 +0530
Subject: [PATCH] DRYer

---
 docs/changelog.rst                     | 14 ++++++++++-
 docs/kittens/panel.rst                 | 33 ++------------------------
 docs/kittens/quick-access-terminal.rst | 25 +------------------
 docs/quake-screenshots.rst             | 29 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 56 deletions(-)
 create mode 100644 docs/quake-screenshots.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 08fe04ffd..4e92fd6f3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,18 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 Recent major new features
 ---------------------------
 
+Access kitty with a single keypress [0.42]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: quake-screenshots.rst
+
+kitty now has a Quake like floating, translucent terminal window, so you can access
+all that kitty goodness instantly with a single keypress.
+
+See the screenshots on the side and head over to the :doc:`kitten page for details
+on how to set it up </kittens/quick-access-terminal>`.
+
+
 Multiple sized text [0.40]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -97,7 +109,7 @@ Detailed list of changes
 0.42.0 [future]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- A new :doc:`kitten quick-access-terminal </kittens/quick-access-terminal>` can now be used to :ref:`quake`
+- A new kitten: :doc:`quick-access-terminal </kittens/quick-access-terminal>` to :ref:`quake`
 
 - The :doc:`panel kitten </kittens/panel>` now works on macOS as well as Wayland (:iss:`2590`)
 
diff --git a/docs/kittens/panel.rst b/docs/kittens/panel.rst
index 3be74b992..d7b9926f6 100644
--- a/docs/kittens/panel.rst
+++ b/docs/kittens/panel.rst
@@ -8,6 +8,8 @@ Draw a GPU accelerated dock panel on your desktop
     Overview
     --------------
 
+.. include:: ../quake-screenshots.rst
+
 Draw the desktop wallpaper or docks and panels using arbitrary
 terminal programs, For example, have `btop
 <https://github.com/aristocratos/btop>`__ or `cava
@@ -16,37 +18,6 @@ terminal programs, For example, have `btop
 It is useful for showing status information or notifications on your desktop
 using terminal programs instead of GUI toolkits.
 
-.. only:: not man
-
-    .. sidebar::
-
-        **Screenshots**
-
-        .. figure:: ../screenshots/quake-macos.webp
-            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program ``btop``, running inside kitty, on macOS
-            :align: center
-            :width: 100%
-
-            macOS
-
-
-        .. figure:: ../screenshots/quake-hypr.webp
-            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program ``btop``, running inside kitty, on Hyprland in Linux
-            :align: center
-            :width: 100%
-
-            Linux
-
-        .. figure:: ../screenshots/panel.png
-            :alt: Screenshot, showing a sample panel
-            :align: center
-            :width: 100%
-
-            A sample panel on Linux
-
-        How the screenshots were generated is :ref:`described below
-        <quake_ss>`.
-
 
 The screenshot to the side shows some uses of the panel kitten to draw various
 desktop components such as the background, a quick access floating terminal and
diff --git a/docs/kittens/quick-access-terminal.rst b/docs/kittens/quick-access-terminal.rst
index 5f7ecb2c9..2192b9c16 100644
--- a/docs/kittens/quick-access-terminal.rst
+++ b/docs/kittens/quick-access-terminal.rst
@@ -11,30 +11,7 @@ Make a Quake like quick access terminal
     --------------
 
 
-.. only:: not man
-
-    .. sidebar::
-
-        **Screenshots**
-
-        .. figure:: ../screenshots/quake-macos.webp
-            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program ``btop``, running inside kitty, on macOS
-            :align: center
-            :width: 100%
-
-            macOS
-
-
-        .. figure:: ../screenshots/quake-hypr.webp
-            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program ``btop``, running inside kitty, on Hyprland in Linux
-            :align: center
-            :width: 100%
-
-            Linux
-
-        How the screenshots were generated is :ref:`described in the panel
-        kitten docs <quake_ss>`.
-
+.. include:: ../quake-screenshots.rst
 
 .. versionadded:: 0.42.0
    Works on macOS and Wayland, except for GNOME.
diff --git a/docs/quake-screenshots.rst b/docs/quake-screenshots.rst
new file mode 100644
index 000000000..bd5a8ff76
--- /dev/null
+++ b/docs/quake-screenshots.rst
@@ -0,0 +1,29 @@
+.. only:: not man
+
+    .. sidebar::
+
+        **Screenshots**
+
+        .. figure:: /screenshots/quake-macos.webp
+            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program btop, running inside kitty, on macOS
+            :align: center
+            :width: 100%
+
+            macOS
+
+
+        .. figure:: /screenshots/quake-hypr.webp
+            :alt: Screenshot, showing the kitty floating quick access terminal above the background which is the program btop, running inside kitty, on Hyprland in Linux
+            :align: center
+            :width: 100%
+
+            Linux
+
+        .. figure:: /screenshots/panel.png
+            :alt: Screenshot, showing a sample panel
+            :align: center
+            :width: 100%
+
+            A sample panel on Linux
+
+        How the screenshots :ref:`were generated <quake_ss>`.