Merge branch 'master' into next

RELEASE-NOTES-4.10

@@ -0,0 +1,65 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.10   │
+ └──────────────────────────────┘
+
+This is i3 v4.10. This version is considered stable. All users of i3 are
+strongly encouraged to upgrade.
+
+This release contains mostly bugfixes, but we felt it was necessary since there
+are two important changes in behavior: we have reverted the pango markup
+parsing by default (introduced with i3 v4.9) and the change in how the
+“workspace” command behaves (introduced with i3 v4.9). Both of them broke some
+user’s setups, which is not acceptable. In order to help us avoid such mistakes
+in the future, please consider using the i3 git version — it is typically
+stable.
+
+ ┌────────────────────────────┐
+ │ Changes in i3 v4.10        │
+ └────────────────────────────┘
+
+  • i3bar: cut long statuslines from the left
+  • i3bar: add support for the short_text property
+  • i3-sensible-terminal: launch i3-nagbar when no terminal is found
+  • i3-config-wizard: switch modifier on key up/down
+  • docs/layout-saving: added a troubleshooting section
+  • docs: degender all the terms
+  • Revert "Workspace command number selection"
+  • don’t parse blocks as markup by default
+  • Allow escaping backslashes in commands.
+  • switch default font from “DejaVu Sans Mono 8” to “monospace 8”, which is
+    typically a synonym, except for users who prefer a different font.
+  • When renaming a workspace, look for assignments and move the renamed
+    workspace to the appropriate output.
+  • i3-save-tree: make --workspace optional by defaulting to the focused
+    workspace
+  • Allow nop command without argument
+
+ ┌────────────────────────────┐
+ │ Bugfixes                   │
+ └────────────────────────────┘
+
+  • i3bar: buffer the statusline to avoid flickering
+  • i3bar: fix click events for workspace buttons with long statusline
+  • i3bar: set correct initial position when reconfiguring
+  • i3bar: reconfigure strut partial on reload
+  • i3-nagbar: fix sizes/positioning on hi-dpi displays
+  • i3-config-wizard: fix sizes/positioning on hi-dpi displays
+  • i3-input: fix sizes/positioning on hi-dpi displays
+  • Fix scrolling in window decoration with hidden cursor.
+  • workspace rename focus mismatch
+  • Don’t overwrite border width when already set (placeholders).
+  • fix a segfault during config file validation
+  • Restore placeholder windows after restarting.
+  • Don’t focus placeholder windows.
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  Chih-Chyuan Hwang, Deiz, Diana Dinosaur, Ingo Bürk, Michael Hofmann,
+  Michael Tipton, Micha Rosenbaum, shdown, Tony Crisci
+
+-- Michael Stapelberg, 2015-03-29

RELEASE-NOTES-4.9.1

@@ -1,36 +0,0 @@
-
- ┌──────────────────────────────┐
- │ Release notes for i3 v4.9.1  │
- └──────────────────────────────┘
-
-This is i3 v4.9.1. This version is considered stable. All users of i3 are
-strongly encouraged to upgrade.
-
-This is a bugfix release for i3 v4.9.
-
- ┌────────────────────────────┐
- │ Bugfixes                   │
- └────────────────────────────┘
-
-  • i3bar: fix incorrect y-offset for text
-  • fix key bindings on big-endian platforms
-  • fix key bindings using Mode_switch
-  • fix keyboard layout change detection
-  • revert "Handle WM_CHANGE_STATE requests for iconic state" (fixes problems
-    with application windows disappearing, like SDL-based games when switching
-    workspaces)
-  • insert id-based match at HEAD, not TAIL (fixes window swallowing not
-    working when the criteria match the placeholder window)
-  • improve error messages on failing commands
-  • replace ~ in filepath when calling append_layout
-  • properly error out when the layout file cannot be read
-
- ┌────────────────────────────┐
- │ Thanks!                    │
- └────────────────────────────┘
-
-Thanks for testing, bugfixes, discussions and everything I forgot go out to:
-
-  Steven McDonald, Ton van den Heuvel, Ingo Bürk
-
--- Michael Stapelberg, 2015-03-07

man/asciidoc.conf

@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3</refmiscinfo>
-<refmiscinfo class="version">4.9.1</refmiscinfo>
+<refmiscinfo class="version">4.10</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>