From 6b60a5c6d6629cf7b9431125a4625808f9ee6b3c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 27 Jul 2017 23:22:54 +0100
Subject: [PATCH] Update CHANGES.

---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index a5834dfd..81ae654f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,13 @@
 CHANGES FROM 2.5 to master
 
+* Add pane_at_left, pane_at_right, pane_at_top and pane_at_bottom formats.
+
+* Make bell, activity and silence alerting more consistent by: removing the
+  bell-on-alert option; adding activity-action and silence-action options with
+  the same possible values as the existing bell-action; adding a "both" value
+  for the visual-bell, visual-activity and visual-silence options to trigger
+  both a bell and a message.
+
 * Add a pane_pipe format to show if pipe-pane is active.
 
 * Block signals between forking and resetting signal handlers so that the