From 466f7c16f9edabf0bf2de634e3106e3495f05f3f Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 25 Oct 2020 21:54:07 +0100 Subject: [PATCH 1/4] travis: fix bintray deploy step Commit be1065f62d156fb825f566b7e1e6ab4937dc9db4 moved the Debian/Ubuntu package builds into the distbuild/ directory. fixes #4179 --- travis/bintray-autobuild-debian.json | 4 ++-- travis/bintray-autobuild-ubuntu.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/travis/bintray-autobuild-debian.json b/travis/bintray-autobuild-debian.json index 23fe60506..d01b7dbaa 100644 --- a/travis/bintray-autobuild-debian.json +++ b/travis/bintray-autobuild-debian.json @@ -13,7 +13,7 @@ "files": [ { - "includePattern": "build/deb/debian-amd64/(.*\\.deb)$", + "includePattern": "distbuild/deb/debian-amd64/(.*\\.deb)$", "matrixParams": { "deb_distribution": "sid", "deb_component": "main", @@ -22,7 +22,7 @@ "uploadPattern": "$1" }, { - "includePattern": "build/deb/debian-i386/(.*\\.deb)$", + "includePattern": "distbuild/deb/debian-i386/(.*\\.deb)$", "matrixParams": { "deb_distribution": "sid", "deb_component": "main", diff --git a/travis/bintray-autobuild-ubuntu.json b/travis/bintray-autobuild-ubuntu.json index 37f2f1800..4c0d6114c 100644 --- a/travis/bintray-autobuild-ubuntu.json +++ b/travis/bintray-autobuild-ubuntu.json @@ -13,7 +13,7 @@ "files": [ { - "includePattern": "build/deb/ubuntu-amd64/(.*\\.deb)$", + "includePattern": "distbuild/deb/ubuntu-amd64/(.*\\.deb)$", "matrixParams": { "deb_distribution": "bionic", "deb_component": "main", @@ -22,7 +22,7 @@ "uploadPattern": "$1" }, { - "includePattern": "build/deb/ubuntu-i386/(.*\\.deb)$", + "includePattern": "distbuild/deb/ubuntu-i386/(.*\\.deb)$", "matrixParams": { "deb_distribution": "bionic", "deb_component": "main", From 5c565d0ad46b66f0941424c06acfb67808b5164b Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 28 Oct 2020 17:31:43 +0100 Subject: [PATCH 2/4] debian/rules: explicitly enable building manpages This fixes a build failure in dh_installwms. fixes #4136 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 28436d292..95b1c7314 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_autoreconf: override_dh_auto_configure: # Set -Ddocdir; the default is /usr/share/doc/i3 - dh_auto_configure -- -Ddocdir=/usr/share/doc/i3-wm + dh_auto_configure -- -Ddocdir=/usr/share/doc/i3-wm -Dmans=true override_dh_builddeb: # bintray does not support xz currently. From 8a7ac068c8359e5aae513854f0b21bce4460e8aa Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 28 Oct 2020 17:32:33 +0100 Subject: [PATCH 3/4] =?UTF-8?q?meson.build:=20fix=20typo=20in=20summary:?= =?UTF-8?q?=20docs=20=E2=86=92=20mans?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0c3f14c9c..938558402 100644 --- a/meson.build +++ b/meson.build @@ -289,7 +289,7 @@ else endif if meson.version().version_compare('>=0.53') - summary('build manpages (-Dmans)', get_option('docs')) + summary('build manpages (-Dmans)', get_option('mans')) endif # Required for e.g. struct ucred to be defined as per unix(7). From 6a1806931b0903f8c0cc3b400944dd9485ce33f5 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 1 Nov 2020 10:09:43 +0100 Subject: [PATCH 4/4] =?UTF-8?q?userguide:=20may=20=E2=86=92=20might=20in?= =?UTF-8?q?=20most=20places=20(thanks=20Bruce)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quoting https://www.freelists.org/post/i3-discuss/Grammar-check-in-the-doc May inquires only into permission. Might inquires into probability. Can inquires into possibility. Will/shall inquires into certainty. --- docs/userguide | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/userguide b/docs/userguide index 5773e96b1..bc4afb3f9 100644 --- a/docs/userguide +++ b/docs/userguide @@ -54,7 +54,7 @@ existing window (rotated displays). image:two_terminals.png[Two terminals] To move the focus between the two terminals, you can use the direction keys -which you may know from the editor +vi+. However, in i3, your homerow is used +which you might know from the editor +vi+. However, in i3, your homerow is used for these keys (in +vi+, the keys are shifted to the left by one for compatibility with most keyboard layouts). Therefore, +$mod+j+ is left, +$mod+k+ is down, +$mod+l+ is up and `$mod+;` is right. So, to switch between the @@ -924,7 +924,7 @@ available outputs by running +xrandr --current+. If your X server supports RandR 1.5 or newer, i3 will use RandR monitor objects instead of output objects. Run +xrandr --listmonitors+ to see a list. Usually, a monitor object contains exactly one output, and has the same name as the -output; but should that not be the case, you may specify the name of either the +output; but should that not be the case, you can specify the name of either the monitor or the output in i3's configuration. For example, the Dell UP2414Q uses two scalers internally, so its output names might be “DP1” and “DP2”, but the monitor name is “Dell UP2414Q”. @@ -1066,7 +1066,7 @@ mouse_warping none === Popups during fullscreen mode When you are in fullscreen mode, some applications still open popup windows -(take Xpdf for example). This is because these applications may not be aware +(take Xpdf for example). This is because these applications might not be aware that they are in fullscreen mode (they do not check the corresponding hint). There are three things which are possible to do in this situation: @@ -1176,9 +1176,9 @@ workspace_auto_back_and_forth yes === Delaying urgency hint reset on workspace change If an application on another workspace sets an urgency hint, switching to this -workspace may lead to immediate focus of the application, which also means the +workspace might lead to immediate focus of the application, which also means the window decoration color would be immediately reset to +client.focused+. This -may make it unnecessarily hard to tell which window originally raised the +might make it unnecessarily hard to tell which window originally raised the event. In order to prevent this, you can tell i3 to delay resetting the urgency state @@ -1201,9 +1201,9 @@ force_display_urgency_hint 500 ms === Focus on window activation If a window is activated, e.g., via +google-chrome www.google.com+, it may request -to take focus. Since this may not be preferable, different reactions can be configured. +to take focus. Since this might not be preferable, different reactions can be configured. -Note that this may not affect windows that are being opened. To prevent new windows +Note that this might not affect windows that are being opened. To prevent new windows from being focused, see <>. *Syntax*: @@ -1649,7 +1649,7 @@ bar { By default, the width a workspace button is determined by the width of the text showing the workspace name. If the name is too short (say, one letter), then the -workspace button may look too small. +workspace button might look too small. This option specifies the minimum width for workspace buttons. If the name of a workspace is too short to cover the button, an additional padding is added on @@ -1659,7 +1659,7 @@ The default value of zero means that no additional padding is added. The setting also applies to the current binding mode indicator. -Note that the specified pixels refer to logical pixels, which may translate +Note that the specified pixels refer to logical pixels, which might translate into more pixels on HiDPI displays. *Syntax*: @@ -2471,7 +2471,7 @@ for_window [class="urxvt"] resize set 640 480 === Jumping to specific windows Often when in a multi-monitor environment, you want to quickly jump to a -specific window. For example, while working on workspace 3 you may want to +specific window. For example, while working on workspace 3 you might want to jump to your mail client to email your boss that you’ve achieved some important goal. Instead of figuring out how to navigate to your mail client, it would be more convenient to have a shortcut. You can use the +focus+ command @@ -2506,7 +2506,7 @@ for this purpose: It lets you input a command and sends the command to i3. It can also prefix this command and display a custom prompt for the input dialog. The additional +--toggle+ option will remove the mark if the window already has -this mark or add it otherwise. Note that you may need to use this in +this mark or add it otherwise. Note that you might need to use this in combination with +--add+ (see below) as any other marks will otherwise be removed. @@ -2605,7 +2605,7 @@ optional pixel argument can be used to specify the border width when switching to the normal and pixel styles. Note that "pixel" refers to logical pixel. On HiDPI displays, a logical pixel -may be represented by multiple physical pixels, so +pixel 1+ might not +is represented by multiple physical pixels, so +pixel 1+ might not necessarily translate into a single pixel row wide border. *Syntax*: @@ -2868,7 +2868,7 @@ See also <> for more examples of multi-monitor setups. === Interesting configuration for multi-monitor environments -There are several things to configure in i3 which may be interesting if you +There are several things to configure in i3 which might be interesting if you have more than one monitor: 1. You can specify which workspace should be put on which screen. This