From 0b7b9461245ab129e25d5dc5d4f183275cab515d Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Sat, 7 Nov 2015 03:27:06 +0100
Subject: [PATCH] Adjust the default shortcuts for renaming title/tab/terminal,
 and update docs

---
 doc/manual/source/gettingstarted.rst | 18 +++++++++---------
 doc/terminator.1                     | 12 ++++++------
 doc/terminator_config.5              |  8 ++++++--
 terminatorlib/config.py              |  6 +++---
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/doc/manual/source/gettingstarted.rst b/doc/manual/source/gettingstarted.rst
index 4de6e047..c27afd45 100644
--- a/doc/manual/source/gettingstarted.rst
+++ b/doc/manual/source/gettingstarted.rst
@@ -501,15 +501,15 @@ Or maybe for you it is with tabs.
 
 In Terminator you can rename three things:
 
-+----------+---------------------------+-------------------+
-| Edit     | Mouse                     | Default Shortcut  |
-+==========+===========================+===================+
-| Window   | N/A                       | ``Alt``\ +\ ``T`` |
-+----------+---------------------------+-------------------+
-| Titlebar | ``double-click`` titlebar | N/A (TBD)         |
-+----------+---------------------------+-------------------+
-| Tab      | ``double-click`` tab      | N/A (TBD)         |
-+----------+---------------------------+-------------------+
++----------------+---------------------------+--------------------+
+| Edit           | Mouse                     | Default Shortcut   |
++================+===========================+====================+
+| Window title   | N/A                       | ``Ctrl``\ +\ ``W`` |
++----------------+---------------------------+--------------------+
+| Tab title      | ``double-click`` tab      | ``Ctrl``\ +\ ``A`` |
++----------------+---------------------------+--------------------+
+| Terminal title | ``double-click`` titlebar | ``Ctrl``\ +\ ``X`` |
++----------------+---------------------------+--------------------+
 
 Additionally all three can be saved/loaded from a :ref:`layout <layouts>`,
 or the window title can be set using a
diff --git a/doc/terminator.1 b/doc/terminator.1
index cf0bdb78..fbc066fb 100644
--- a/doc/terminator.1
+++ b/doc/terminator.1
@@ -221,15 +221,15 @@ Decrease font size. \fBNote:\fP This may require you to press shift, depending o
 .B Ctrl+Zero (0)
 Restore font size to original setting.
 .TP
-.B Alt+T
-Rename titlebar.
+.B Ctrl+W
+Rename window title.
 .TP
-.B Alt+F2
-Rename terminal title.
-.TP
-.B Alt+Shift+F2
+.B Ctrl+A
 Rename tab title.
 .TP
+.B Ctrl+X
+Rename terminal title.
+.TP
 .B Super+1
 Insert terminal number, i.e. 1 to 12.
 .TP
diff --git a/doc/terminator_config.5 b/doc/terminator_config.5
index cc80ae62..411238a9 100644
--- a/doc/terminator_config.5
+++ b/doc/terminator_config.5
@@ -286,13 +286,17 @@ Note that <Alt><Shift>1 may need to be provided as <Alt>! or similar,
 depending on your keyboard layout.
 Default value: \fBUnbound\fR
 .TP
+.B edit_window_title
+Edit the current active window's title
+Default value: \fB<Ctrl>W\fR
+.TP
 .B edit_tab_title
 Edit the currently active tab's title
-Default value: \fB<Alt><Shift>F2\fR
+Default value: \fB<Ctrl>A\fR
 .TP
 .B edit_terminal_title
 Edit the currently active terminal's title
-Default value: \fB<Alt>F2\fR
+Default value: \fB<Ctrl>X\fR
 .TP
 .B full_screen
 Toggle the window to a fullscreen window.
diff --git a/terminatorlib/config.py b/terminatorlib/config.py
index b0654b9c..797bb94c 100755
--- a/terminatorlib/config.py
+++ b/terminatorlib/config.py
@@ -190,9 +190,9 @@ DEFAULTS = {
             'broadcast_all'    : '<Alt>a',
             'insert_number'    : '<Super>1',
             'insert_padded'    : '<Super>0',
-            'edit_window_title': '<Alt>t',
-            'edit_tab_title'   : '<Alt><Shift>F2',
-            'edit_terminal_title': '<Alt>F2',
+            'edit_window_title': '<Control>w',
+            'edit_tab_title'   : '<Control>a',
+            'edit_terminal_title': '<Control>x',
             'layout_launcher'  : '<Alt>l',
             'next_profile'     : '',
             'previous_profile' : '',