i3 - improved tiling WM


Typo and usage fixes in documentation and comments.

Patch status: merged

Patch by Eric S. Raymond

To apply this patch, use:
curl http://cr.i3wm.org/patch/128/raw.patch | git am

b/docs/hacking-howto

15
@@ -57,7 +57,7 @@ all, most users sooner or later tend to lay out their windows in a way which
16
 corresponds to tiling or stacking mode in i3. Therefore, why not let i3 do this
17
 for you? Certainly, it’s faster than you could ever do it.
18
 
19
-The problem with most tiling window managers is that they are too unflexible.
20
+The problem with most tiling window managers is that they are too inflexible.
21
 In my opinion, a window manager is just another tool, and similar to vim which
22
 can edit all kinds of text files (like source code, HTML, …) and is not limited
23
 to a specific file type, a window manager should not limit itself to a certain
24
@@ -361,7 +361,7 @@ managed at all:
25
  * The override_redirect must not be set. Windows with override_redirect shall
26
    not be managed by a window manager
27
 
28
-Afterwards, i3 gets the intial geometry and reparents the window (see
29
+Afterwards, i3 gets the initial geometry and reparents the window (see
30
 `reparent_window()`) if it wasn’t already managed.
31
 
32
 Reparenting means that for each window which is reparented, a new window,
33
@@ -383,7 +383,7 @@ target workspace is not visible, the window will not be mapped.
34
 
35
 == What happens when an application is started?
36
 
37
-i3 does not care for applications. All it notices is when new windows are
38
+i3 does not care about applications. All it notices is when new windows are
39
 mapped (see `src/handlers.c`, `handle_map_request()`). The window is then
40
 reparented (see section "Manage windows").
41
 
42
@@ -534,7 +534,7 @@ position/size is different: They are placed next to each other on a single line
43
 
44
 ==== Dock area layout
45
 
46
-This is a special case. Users cannot chose the dock area layout, but it will be
47
+This is a special case. Users cannot choose the dock area layout, but it will be
48
 set for the dock area containers. In the dockarea layout (at the moment!),
49
 windows will be placed above each other.
50
 

b/docs/userguide

55
@@ -26,8 +26,8 @@ are your homerow.
56
 == Using i3
57
 
58
 Throughout this guide, the keyword +$mod+ will be used to refer to the
59
-configured modifier. This is the Alt key (Mod1) by default, with windows (Mod4)
60
-being a popular alternative.
61
+configured modifier. This is the Alt key (Mod1) by default, with the Windows 
62
+key (Mod4) being a popular alternative.
63
 
64
 === Opening terminals and moving around
65
 
66
@@ -147,7 +147,7 @@ columns/rows with your keyboard.
67
 
68
 === Restarting i3 inplace
69
 
70
-To restart i3 inplace (and thus get into a clean state if there is a bug, or
71
+To restart i3 in place (and thus get into a clean state if there is a bug, or
72
 to upgrade to a newer version of i3) you can use +$mod+Shift+r+.
73
 
74
 === Exiting i3
75
@@ -156,11 +156,12 @@ To cleanly exit i3 without killing your X server, you can use +$mod+Shift+e+.
76
 
77
 === Floating
78
 
79
-Floating mode is the opposite of tiling mode. The position and size of a window
80
-are not managed by i3, but by you. Using this mode violates the tiling
81
-paradigm but can be useful for some corner cases like "Save as" dialog
82
-windows, or toolbar windows (GIMP or similar). Those windows usually set the
83
-appropriate hint and are opened in floating mode by default.
84
+Floating mode is the opposite of tiling mode. The position and size of
85
+a window are not managed automatically by i3, but manually by
86
+you. Using this mode violates the tiling paradigm but can be useful
87
+for some corner cases like "Save as" dialog windows, or toolbar
88
+windows (GIMP or similar). Those windows usually set the appropriate
89
+hint and are opened in floating mode by default.
90
 
91
 You can toggle floating mode for a window by pressing +$mod+Shift+Space+. By
92
 dragging the window’s titlebar with your mouse you can move the window
93
@@ -259,7 +260,7 @@ other one being the terminal window you moved down.
94
 [[configuring]]
95
 == Configuring i3
96
 
97
-This is where the real fun begins ;-). Most things are very dependant on your
98
+This is where the real fun begins ;-). Most things are very dependent on your
99
 ideal working environment so we can’t make reasonable defaults for them.
100
 
101
 While not using a programming language for the configuration, i3 stays
102
@@ -761,7 +762,7 @@ from single windows outside of a split container.
103
 
104
 === Interprocess communication
105
 
106
-i3 uses unix sockets to provide an IPC interface. This allows third-party
107
+i3 uses Unix sockets to provide an IPC interface. This allows third-party
108
 programs to get information from i3, such as the current workspaces
109
 (to display a workspace bar), and to control i3.
110
 
111
@@ -1223,7 +1224,7 @@ bindsym $mod+x move container to workspace 3; workspace 3
112
 
113
 [[command_criteria]]
114
 
115
-Furthermore, you can change the scope of a command, that is, which containers
116
+Furthermore, you can change the scope of a command - that is, which containers
117
 should be affected by that command, by using various criteria. These are
118
 prefixed in square brackets to every command. If you want to kill all windows
119
 which have the class Firefox, use:

b/src/commands_parser.c

124
@@ -13,7 +13,7 @@
125
  * We use a hand-written parser instead of lex/yacc because our commands are
126
  * easy for humans, not for computers. Thus, it’s quite hard to specify a
127
  * context-free grammar for the commands. A PEG grammar would be easier, but
128
- * there’s downsides to every PEG parser generator I have come accross so far.
129
+ * there’s downsides to every PEG parser generator I have come across so far.
130
  *
131
  * This parser is basically a state machine which looks for literals or strings
132
  * and can push either on a stack. After identifying a literal or string, it