[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] lots of spelling fixes



Call me crazy. I noticed them while coding, then I did a:
   grep -no '//.*' src/* > comments
   aspell check comments

And also runned aspell over anything else which make sense.

-- 
() ascii ribbon campaign - stop html mail    www.asciiribbon.org
/\ www.the-compiler.org  | I love long mails http://email.is-not-s.ms/
Yow! Are we wet yet? 
>From 2818543d9aef266e8fa93ea5af58a3309e9d5a9e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org>
Date: Tue, 6 Nov 2012 15:43:47 +0100
Subject: [PATCH] Lots of spelling fixes

---
 BUGS                          |  8 ++++----
 HACKING                       |  2 +-
 NEWS                          | 14 +++++++-------
 doc/herbstluftwm-tutorial.txt |  2 +-
 doc/herbstluftwm.txt          | 12 ++++++------
 ipc-client/main.c             |  2 +-
 scripts/loadstate.sh          |  2 +-
 scripts/wselect.sh            |  4 ++--
 src/clientlist.c              |  4 ++--
 src/command.c                 |  4 ++--
 src/key.c                     |  4 ++--
 src/key.h                     |  2 +-
 src/layout.c                  | 24 ++++++++++++------------
 src/layout.h                  |  4 ++--
 src/main.c                    |  8 ++++----
 src/monitor.c                 |  6 +++---
 src/mouse.c                   |  2 +-
 src/mouse.h                   |  2 +-
 src/rules.c                   |  4 ++--
 src/rules.h                   |  4 ++--
 src/settings.c                |  4 ++--
 src/tag.c                     |  4 ++--
 src/utils.c                   | 10 +++++-----
 src/utils.h                   |  2 +-
 www/index.txt                 |  6 +++---
 25 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/BUGS b/BUGS
index cb4ee0e..562c5b7 100644
--- a/BUGS
+++ b/BUGS
@@ -3,16 +3,16 @@ BUGS
 
 Some BUGS:
 
-    - keyboardfocus stays in window, if cursor is over it and
+    - keyboard focus stays in window, if cursor is over it and
       herbstluftwm-focus goes away
     - set range for some integer-setting-values
     - don't always re-layout all if only one thing changes (e.g. border_color)
     - don't reset border width on each layouting
-    - herbstclient: add timeout if server doesnot respond
+    - herbstclient: add timeout if server does not respond
     - herbstclient: errorstatus2string2stderr
     - add function to put window into tag (and use it in manage, merge_tag,
       move)
-    - the default panel.sh spawns too many shells and doesnot clean them up
+    - the default panel.sh spawns too many shells and does not clean them up
       properly at quit. you should do something like killall panel.sh when
       logging out (this is only a workaround!).
     - raise_on_click doesn't work if raise_on_click and numlock is enabled
@@ -59,7 +59,7 @@ Planned features:
     - lastfocused{window,frame,tag} - commands
     - own X-Properties to indicate window state (fullscreen, pseudotile,
       float,...)
-    - bind multiple commands to one keycombindation via keybind, keybindadd
+    - bind multiple commands to one kÙeÙyÙ ÙcÙoÙmÙbÙiÙnÙaÙtÙiÙoÙnÙ via keybind, keybindadd
     - or: chain commands like: cmdchain 4 cmd1 arg1a arg1b arg1c cmd2 arg2a
       arg2b
     - alias commands: alias shortcmd = cmd default arg, alias shortcmd --delete
diff --git a/HACKING b/HACKING
index 22fbdec..e8cb116 100644
--- a/HACKING
+++ b/HACKING
@@ -48,7 +48,7 @@ irc[2].
 Mailing list
 ------------
 The main mailing list for general development, discussion, release
-announcments is:
+announcements is:
 
     herbstluftwm _minus_ devel _at_ lists _dot_ sourceforge _dot_ net
 
diff --git a/NEWS b/NEWS
index 8fa921a..c7ddb65 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Changes:
     * chaining of commands now is possible with the new command: chain
     * new commands: and or
     * tag switch locking for monitors. The new lock_tag and unlock_tag commands
-      control, wether tag switching operations for a monitor are allowed.
+      control, whether tag switching operations for a monitor are allowed.
     * set the urgent flag on _NET_WM_STATE_DEMANDS_ATTENTION
     * clear the urgent flag on window focus
     * new command: list_padding
@@ -36,13 +36,13 @@ This fixes some build system issues:
 Release: 0.4 on 2012-08-18
 --------------------------
 
-Changes that requres user interaction on upgrade:
+Changes that require user interaction on upgrade:
 
     * the setting window_gap is now called frame_gap
 
 Other changes:
 
-    * new setting window_gap which controlls the gap between windows within one
+    * new setting window_gap which controls the gap between windows within one
       frame
     * new setting: frame_padding
     * new command: close_or_remove
@@ -124,10 +124,10 @@ Small bugfixes and major features:
     * new hook: focus_changed
     * client rules with:
 
-        - conditon: class
-        - conditon: instance
-        - conditon: pid
-        - conditon: maxage
+        - condition: class
+        - condition: instance
+        - condition: pid
+        - condition: maxage
         - condition: windowtype
         - condition: windowrole
         - operator: = (equals)
diff --git a/doc/herbstluftwm-tutorial.txt b/doc/herbstluftwm-tutorial.txt
index fe32a49..01650d0 100644
--- a/doc/herbstluftwm-tutorial.txt
+++ b/doc/herbstluftwm-tutorial.txt
@@ -55,7 +55,7 @@ After logging in the next time, you will get a default herbstluftwm session.
 
 Directly from git
 ~~~~~~~~~~~~~~~~~
-If there is no package for your plattform or if you want to use the current git
+If there is no package for your platform or if you want to use the current git
 version, then you can pull directly from the main repository:
 
 ----
diff --git a/doc/herbstluftwm.txt b/doc/herbstluftwm.txt
index 0aaddf3..3b18a31 100644
--- a/doc/herbstluftwm.txt
+++ b/doc/herbstluftwm.txt
@@ -368,7 +368,7 @@ toggle 'NAME'::
 
 cycle_value 'NAME' 'VALUES' ...::
     Cycles value of the setting 'NAME' through 'VALUES': I.e. it searches the
-    first occurence of the current value in 'VALUES' and changes the value to
+    first occurrence of the current value in 'VALUES' and changes the value to
     the next in the list or to the first one if the end is reached or current
     value wasn't found. Example:
 
@@ -416,7 +416,7 @@ move_index 'INDEX' [*--skip-visible*]::
 lock_tag ['INDEX']::
     Lock the tag switching on the monitor specified by INDEX. If no
     argument is given, the currently focused monitor is used. When the
-    tag switching is disabled for a monitor, the commands *use* und
+    tag switching is disabled for a monitor, the commands *use* and
     *use_index* have no effect, when executed there. When
     'swap_monitors_to_get_tag' is enabled, switching to a tag, which
     is located on locked monitor, switches to that monitor instead of
@@ -424,7 +424,7 @@ lock_tag ['INDEX']::
     by "[LOCKED]" in the *list_monitors* output.
 
 unlock_tag ['INDEX']::
-    Reenables the tag switching on the monitor specified by INDEX. If no
+    Re-enables the tag switching on the monitor specified by INDEX. If no
     argument is given, the currently focused  monitor is used. This is the reverse
     operation to *lock_tag* and has no further side effects but removing this lock.
 
@@ -710,7 +710,7 @@ frame_normal_opacity (Integer)::
 
 default_frame_layout (Integer)::
     Index of the frame layout, which is used if a new frame is created (by split
-    or on a new tag). For a list of valid indizes and their meanings, check the
+    or on a new tag). For a list of valid indexes and their meanings, check the
     <<LIST_LAYOUT_ALGORITHMS,list of layout algorithms above>>.
 
 default_direction_external_only (Integer)::
@@ -760,7 +760,7 @@ swap_monitors_to_get_tag (Integer)::
     tag on the focused monitor. If not set, nothing will be swapped.
 
 auto_detect_monitors (Integer)::
-    If set, detect_monitors is automatically executed everytime a monitor is
+    If set, detect_monitors is automatically executed every time a monitor is
     connected, disconnected or resized.
 
 tree_style (String)::
@@ -783,7 +783,7 @@ wmname (String)::
     It controls the value of the +_NET_WM_NAME+ property on the root window,
     which specifies the name of the running window manager. The value of this
     setting is not updated if the actual +_NET_WM_NAME+ property on the root
-    window is changed externaly. Example usage:
+    window is changed externally. Example usage:
 
         * cycle_value wmname herbstluftwm LG3D
 
diff --git a/ipc-client/main.c b/ipc-client/main.c
index 1959bb5..14567ab 100644
--- a/ipc-client/main.c
+++ b/ipc-client/main.c
@@ -63,7 +63,7 @@ void destroy_hook_regex() {
 
 void print_help(char* command) {
     // Eventually replace this and the option parsing with some fancy macro
-    // based thing? Is the cost of maintainence really that high?
+    // based thing? Is the cost of maintainance really that high?
 
     fprintf(stdout,
         "Usage: %s [OPTIONS] COMMAND [ARGS ...]\n"
diff --git a/scripts/loadstate.sh b/scripts/loadstate.sh
index 42a7d37..1c5e0a0 100755
--- a/scripts/loadstate.sh
+++ b/scripts/loadstate.sh
@@ -2,7 +2,7 @@
 
 hc=${herbstclient_command:-herbstclient}
 
-# loads layouts for each tag comming from stdin
+# loads layouts for each tag coming from stdin
 # the format is the one created by savestate.sh
 
 # a common usage is:
diff --git a/scripts/wselect.sh b/scripts/wselect.sh
index fee2847..5a31d69 100755
--- a/scripts/wselect.sh
+++ b/scripts/wselect.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # a window selection utility
-# dependences: wmctrl, awk,
-#              dmenu with multiline support (command line flag -l)
+# dependencies: wmctrl, awk,
+#               dmenu with multiline support (command line flag -l)
 
 dmenu_command=${dmenu_command:-dmenu}
 dmenu_lines=${dmenu_lines:-10}
diff --git a/src/clientlist.c b/src/clientlist.c
index 774e965..9143088 100644
--- a/src/clientlist.c
+++ b/src/clientlist.c
@@ -179,7 +179,7 @@ HSClient* manage_client(Window win) {
     // insert window to the stack
     client->slice = slice_create_client(client);
     stack_insert_slice(client->tag->stack, client->slice);
-    // insert windwo to the tag
+    // insert window to the tag
     frame_insert_window_at_index(client->tag->frame, win, changes.tree_index->str);
     client_update_wm_hints(client);
     if (changes.focus) {
@@ -287,7 +287,7 @@ void window_unfocus_last() {
 void window_focus(Window window) {
     HSClient* client = get_client_from_window(window);
     assert(client != NULL);
-    // set keyboardfocus
+    // set keyboard focus
     if (!client->neverfocus) {
         XSetInputFocus(g_display, window, RevertToPointerRoot, CurrentTime);
     }
diff --git a/src/command.c b/src/command.c
index 20c1370..9161166 100644
--- a/src/command.c
+++ b/src/command.c
@@ -121,7 +121,7 @@ struct {
 };
 
 /* list of completions, if a line matches, then it will be used, the order
- * doesnot matter */
+ * does not matter */
 struct {
     char*   command;
     enum {
@@ -374,7 +374,7 @@ int complete_command(int argc, char** argv, GString* output) {
     if (argc < 2) {
         return HERBST_INVALID_ARGUMENT;
     }
-    // index must be between first and als arg of "commmand to complete ..."
+    // index must be between first and last arg of "command to complete ..."
     int position = CLAMP(atoi(argv[1]), 0, argc-2);
     (void)SHIFT(argc, argv);
     (void)SHIFT(argc, argv);
diff --git a/src/key.c b/src/key.c
index 3431cb4..85b030a 100644
--- a/src/key.c
+++ b/src/key.c
@@ -80,7 +80,7 @@ unsigned int modifiername2mask(const char* name) {
 /**
  * \brief finds a (any) modifier in mask and returns its name
  *
- * \return  the name as a char string. you must not free it.
+ * \return  the name as a char string. You must not free it.
  */
 char*   modifiermask2name(unsigned int mask) {
     int i;
@@ -124,7 +124,7 @@ int keybind(int argc, char** argv) {
 
 bool string2modifiers(char* string, unsigned int* modmask) {
     // example strings: "Mod1-space" "Mod4+f" "f"
-    // splitt string at "+-"
+    // split string at "+-"
     char** splitted = g_strsplit_set(string, KEY_COMBI_SEPARATORS, 0);
     // this should give at least one part
     if (NULL == splitted[0]) {
diff --git a/src/key.h b/src/key.h
index 5c445fd..0c4748d 100644
--- a/src/key.h
+++ b/src/key.h
@@ -16,7 +16,7 @@ typedef struct KeyBinding {
     KeySym keysym;
     unsigned int modifiers;
     int     cmd_argc; // number of arguments for command
-    char**  cmd_argv; // arguemnts for command to call
+    char**  cmd_argv; // arguments for command to call
 } KeyBinding;
 
 unsigned int modifiername2mask(const char* name);
diff --git a/src/layout.c b/src/layout.c
index 57ddcd5..4266637 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -124,7 +124,7 @@ HSFrame* frame_create_empty(HSFrame* parent, HSTag* parenttag) {
     frame->content.clients.layout = *g_default_frame_layout;
     frame->parent = parent;
     frame->tag = parent ? parent->tag : parenttag;
-    // set window atributes
+    // set window attributes
     XSetWindowAttributes at;
     at.background_pixel  = getcolor("red");
     at.background_pixmap = ParentRelative;
@@ -421,8 +421,8 @@ char* load_frame_tree(HSFrame* frame, char* description, GString* errormsg) {
             frame->type = TYPE_CLIENTS;
             frame->content.clients.buf = buf;
             frame->content.clients.count = count;
-            frame->content.clients.selection = 0; // only some sane defauts
-            frame->content.clients.layout = 0; // only some sane defauts
+            frame->content.clients.selection = 0; // only some sane defaults
+            frame->content.clients.layout = 0; // only some sane defaults
         }
 
         // bring child wins
@@ -451,7 +451,7 @@ char* load_frame_tree(HSFrame* frame, char* description, GString* errormsg) {
             // remove window from old tag
             HSMonitor* clientmonitor = find_monitor_with_tag(client->tag);
             if (!frame_remove_window(client->tag->frame, win)) {
-                g_warning("window %lx wasnot found on tag %s\n",
+                g_warning("window %lx was not found on tag %s\n",
                     win, client->tag->name->str);
             }
             if (clientmonitor) {
@@ -675,7 +675,7 @@ void frame_apply_client_layout_linear(HSFrame* frame, XRectangle rect, bool vert
     }
     for (int i = 0; i < count; i++) {
         HSClient* client = get_client_from_window(buf[i]);
-        // add the space, if count doesnot divide frameheight without remainder
+        // add the space, if count does not divide frameheight without remainder
         cur.height += (i == count-1) ? last_step_y : 0;
         cur.width += (i == count-1) ? last_step_x : 0;
         client_setup_border(client, (g_cur_frame == frame) && (i == selection));
@@ -1039,7 +1039,7 @@ int cycle_all_command(int argc, char** argv) {
             int oldselection = frame->content.layout.selection;
             if (oldselection == direction) {
                 // if we already reached the end,
-                // i.e. if we cannot go in the disired direction
+                // i.e. if we cannot go in the desired direction
                 // then wrap around
                 frame->content.layout.selection = other_direction;
                 frame = frame->content.layout.a;
@@ -1150,7 +1150,7 @@ int frame_split_command(int argc, char** argv) {
     int align = ALIGN_VERTICAL;
     if (argv[1][0] == 'h') {
         align = ALIGN_HORIZONTAL;
-    } // else: layout ist vertical
+    } // else: layout is vertical
     int fraction = FRACTION_UNIT* CLAMP(atof(argv[2]),
                                         0.0 + FRAME_MIN_FRACTION,
                                         1.0 - FRAME_MIN_FRACTION);
@@ -1394,7 +1394,7 @@ int frame_move_window_command(int argc, char** argv) {
             frame_remove_window(g_cur_frame, win);
             frame_insert_window(neighbour, win);
             if (*g_focus_follows_shift) {
-                // change selection in parrent
+                // change selection in parent
                 HSFrame* parent = neighbour->parent;
                 assert(parent);
                 parent->content.layout.selection = ! parent->content.layout.selection;
@@ -1482,8 +1482,8 @@ bool frame_focus_window(HSFrame* frame, Window win) {
 }
 
 // focus a window
-// switch_tag tells, wether to switch tag to focus to window
-// switch_monitor tells, wether to switch monitor to focus to window
+// switch_tag tells, whether to switch tag to focus to window
+// switch_monitor tells, whether to switch monitor to focus to window
 // returns if window was focused or not
 bool focus_window(Window win, bool switch_tag, bool switch_monitor) {
     HSClient* client = get_client_from_window(win);
@@ -1597,7 +1597,7 @@ static void frame_show_clients(HSFrame* frame) {
 }
 
 void frame_show_recursive(HSFrame* frame) {
-    // first show parents, then childrend => order = 0
+    // first show parents, then children => order = 0
     frame_do_recursive(frame, frame_show_clients, 2);
 }
 
@@ -1697,7 +1697,7 @@ void frame_set_visible(HSFrame* frame, bool visible) {
 }
 
 // executes action for each client within frame and its subframes
-// if action fails (i.e. returns something != 0), then it abborts with this code
+// if action fails (i.e. returns something != 0), then it aborts with this code
 int frame_foreach_client(HSFrame* frame, ClientAction action, void* data) {
     int status;
     if (frame->type == TYPE_FRAMES) {
diff --git a/src/layout.h b/src/layout.h
index 997de78..ea7733b 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -23,7 +23,7 @@
 
 enum {
     TAG_FLAG_URGENT = 0x01, // is there a urgent window?
-    TAG_FLAG_USED   = 0x02, // the oposit of empty
+    TAG_FLAG_USED   = 0x02, // the opposite of empty
 };
 
 enum {
@@ -121,7 +121,7 @@ void print_tag_tree(HSTag* tag, GString* output);
 void print_frame_tree(HSFrame* frame, char* indent, char* rootprefix, GString* output);
 void dump_frame_tree(HSFrame* frame, GString* output);
 // create apply a described layout to a frame and its subframes
-// returns pointer to string that wasnot parsed yet
+// returns pointer to string that was not parsed yet
 // or NULL on an error
 char* load_frame_tree(HSFrame* frame, char* description, GString* errormsg);
 int find_layout_by_name(char* name);
diff --git a/src/main.c b/src/main.c
index d4956ba..17de3f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -159,7 +159,7 @@ CommandBinding g_commands[] = {
     {{ NULL }}
 };
 
-// core funcitons
+// core functions
 int quit() {
     g_aboutToQuit = true;
     return 0;
@@ -179,7 +179,7 @@ int version(int argc, char* argv[], GString* result) {
 }
 
 // prints or dumps the layout of an given tag
-// first argument tells wether to print or to dump
+// first argument tells whether to print or to dump
 int print_layout_command(int argc, char** argv, GString* result) {
     HSTag* tag = NULL;
     if (argc >= 2) {
@@ -232,7 +232,7 @@ int load_command(int argc, char** argv, GString* result) {
     if (!rest) {
         return HERBST_INVALID_ARGUMENT;
     }
-    if (rest[0] != '\0') { // if string wasnot parsed completely
+    if (rest[0] != '\0') { // if string was not parsed completely
         g_string_append_printf(result,
             "%s: layout description was too long\n", argv[0]);
         g_string_append_printf(result,
@@ -871,7 +871,7 @@ int main(int argc, char* argv[]) {
         g_modules[i].destroy();
     }
     XCloseDisplay(g_display);
-    // check if wie shall restart an other window manager
+    // check if we shall restart an other window manager
     if (g_exec_before_quit) {
         if (g_exec_args) {
             // do actual exec
diff --git a/src/monitor.c b/src/monitor.c
index 7cec851..d83b923 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -298,7 +298,7 @@ int set_monitor_rects(XRectangle* templates, size_t count) {
         HSMonitor* m = monitor_with_index(i);
         m->rect = templates[i];
     }
-    // add aditional monitors
+    // add additional monitors
     for (; i < count; i++) {
         tag = find_unused_tag();
         if (!tag) {
@@ -394,7 +394,7 @@ int remove_monitor(int index) {
     stack_remove_slice(g_monitor_stack, monitor->slice);
     slice_destroy(monitor->slice);
     XDestroyWindow(g_display, monitor->stacking_window);
-    // and remove monitor completly
+    // and remove monitor completely
     g_free(monitor);
     g_array_remove_index(g_monitors, index);
     if (g_cur_monitor >= g_monitors->len) {
@@ -895,7 +895,7 @@ bool detect_monitors_xinerama(XRectangle** ret_rects, size_t* ret_count) {
 
 #endif /* XINERAMA */
 
-// monitor detaction that always works: one monitor across the entire screen
+// monitor detection that always works: one monitor across the entire screen
 bool detect_monitors_simple(XRectangle** ret_rects, size_t* ret_count) {
     *ret_count = 1;
     *ret_rects = g_new0(XRectangle, 1);
diff --git a/src/mouse.c b/src/mouse.c
index 158eb35..b2bc9f4 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -319,7 +319,7 @@ void mouse_function_resize(XMotionEvent* me) {
 }
 
 void mouse_function_zoom(XMotionEvent* me) {
-    // scretch, where center stays at the same position
+    // stretch, where center stays at the same position
     int x_diff = me->x_root - g_button_drag_start.x_root;
     int y_diff = me->y_root - g_button_drag_start.y_root;
     // relative x/y coords in drag window
diff --git a/src/mouse.h b/src/mouse.h
index e39aa3f..cff847c 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -20,7 +20,7 @@ enum SnapFlags {
         SNAP_EDGE_TOP | SNAP_EDGE_BOTTOM | SNAP_EDGE_LEFT | SNAP_EDGE_RIGHT,
 };
 
-// foreward declarations
+// forward declarations
 struct HSClient;
 struct HSTag;
 
diff --git a/src/rules.c b/src/rules.c
index 94e5bd0..8d93180 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -417,7 +417,7 @@ void rules_apply(HSClient* client, HSClientChanges* changes) {
 
             if (!matches && !rule->conditions[i]->negated
                 && rule->conditions[i]->condition_type == g_maxage_type) {
-                // if if not negated maxage doesnot match anymore
+                // if if not negated maxage does not match anymore
                 // then it will never match again in the future
                 rule_expired = true;
             }
@@ -562,7 +562,7 @@ bool condition_windowtype(HSCondition* rule, HSClient* client) {
         // try to find the window type
         if (wintype == g_netatom[i]) {
             // if found, then treat the window type as a string value,
-            // which is registred in g_netatom_names[]
+            // which is registered in g_netatom_names[]
             return condition_string(rule, g_netatom_names[i]);
         }
     }
diff --git a/src/rules.h b/src/rules.h
index 11b2cb9..d2bb2b7 100644
--- a/src/rules.h
+++ b/src/rules.h
@@ -55,8 +55,8 @@ typedef struct {
     GString*        tag_name;
     GString*        tree_index;
     bool            focus; // if client should get focus
-    bool            switchtag; // if the tag may be switchted for focusing it
-    bool            manage; // wether we should manage it
+    bool            switchtag; // if the tag may be switched for focusing it
+    bool            manage; // whether we should manage it
     bool            fullscreen;
     bool            ewmhnotify; // whether to send ewmh-notifications
 } HSClientChanges;
diff --git a/src/settings.c b/src/settings.c
index eba6414..b473bcc 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -146,7 +146,7 @@ int settings_set(SettingsPair* pair, char* value) {
         g_free(pair->value.s);
         pair->value.s = g_strdup(value);
     }
-    // on successfull change, call callback
+    // on successful change, call callback
     if (pair->on_change) {
         pair->on_change();
     }
@@ -191,7 +191,7 @@ int settings_toggle(int argc, char** argv) {
         // only toggle numbers
         return HERBST_INVALID_ARGUMENT;
     }
-    // on successfull change, call callback
+    // on successful change, call callback
     if (pair->on_change) {
         pair->on_change();
     }
diff --git a/src/tag.c b/src/tag.c
index 1c2fd40..3445d85 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -250,7 +250,7 @@ int tag_set_floating_command(int argc, char** argv, GString* result) {
         // just print status
         g_string_append(result, tag->floating ? "on" : "off");
     } else {
-        // asign new value and rearrange if needed
+        // assign new value and rearrange if needed
         tag->floating = new_value;
 
         HSMonitor* m = find_monitor_with_tag(tag);
@@ -371,7 +371,7 @@ void tag_move_client(HSClient* client, HSTag* target) {
 
     // refresh things, hide things, layout it, and then show it if needed
     if (monitor_source && !monitor_target) {
-        // window is moved to unvisible tag
+        // window is moved to invisible tag
         // so hide it
         window_hide(client->window);
     }
diff --git a/src/utils.c b/src/utils.c
index 793fe93..af22f58 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -166,7 +166,7 @@ char** argv_duplicate(int argc, char** argv) {
     return new_argv;
 }
 
-// frees all entrys in argument-vector and then the vector itself
+// frees all entries in argument-vector and then the vector itself
 void argv_free(int argc, char** argv) {
     int i;
     for (i = 0; i < argc; i++) {
@@ -268,7 +268,7 @@ void array_reverse(void* void_buf, size_t elems, size_t size) {
 /**
  * \brief   tells if the string needle is identical to the string *pmember
  */
-bool  memberequals_string(void* pmember, void* needle) {
+bool memberequals_string(void* pmember, void* needle) {
     return !strcmp(*(char**)pmember, (char*)needle);
 }
 
@@ -280,7 +280,7 @@ bool memberequals_int(void* pmember, void* needle) {
 }
 
 /**
- * \brief   finds a element in a table (i.e. array of structs)
+ * \brief   finds an element in a table (i.e. array of structs)
  *
  *          it consecutively searches from the beginning of the table for a
  *          table element whose member is equal to needle. It passes a pointer
@@ -396,11 +396,11 @@ static void subtree_print_to(HSTreeInterface* intface, char* indent,
         g_string_append_printf(output, "%s", rootprefix);
         g_string_append_unichar(output, UTF8_STRING_AT(g_tree_style, 6));
         g_string_append_unichar(output, UTF8_STRING_AT(g_tree_style, 7));
-        // apend caption
+        // append caption
         g_string_append_c(output, ' ');
         intface->append_caption(root, output);
         g_string_append_c(output, '\n');
-        // apend children
+        // append children
         GString* child_indent = g_string_new("");
         GString* child_prefix = g_string_new("");
         for (size_t i = 0; i < child_count; i++) {
diff --git a/src/utils.h b/src/utils.h
index 3115b96..af9f9b9 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -57,7 +57,7 @@ time_t get_monotonic_timestamp();
 
 // duplicates an argument-vector
 char** argv_duplicate(int argc, char** argv);
-// frees all entrys in argument-vector and then the vector itself
+// frees all entries in argument-vector and then the vector itself
 void argv_free(int argc, char** argv);
 
 XRectangle parse_rectangle(char* string);
diff --git a/www/index.txt b/www/index.txt
index 08a6b7d..25d8175 100644
--- a/www/index.txt
+++ b/www/index.txt
@@ -23,7 +23,7 @@ Its main features can be described with:
 Get it!
 -------
 Install herbstluftwm via your package manager! It is currently available on the
-following plattforms:
+following platforms:
 
   * Arch Linux via the
     link:https://aur.archlinux.org/packages.php?O=0&K=herbstluftwm[Arch User
@@ -32,7 +32,7 @@ following plattforms:
     link:http://packages.debian.org/squeeze-backports/herbstluftwm[squeeze-backports],
     link:http://packages.debian.org/wheezy/herbstluftwm[wheezy and kFreeBSD],
     0.4.1 on all link:http://packages.debian.org/sid/herbstluftwm[sid
-    architecutres (including Hurd)])
+    architectures (including Hurd)])
   * link:http://packages.gentoo.org/package/x11-wm/herbstluftwm[Gentoo Linux]
   * Mac OS X via
     link:http://trac.macports.org/browser/trunk/dports/x11/herbstluftwm/Portfile[MacPorts]
@@ -90,7 +90,7 @@ web interface].
 
 Screenshots
 -----------
-// there screenshots are not in the git repo, so they must exist in the target
+// these screenshots are not in the git repo, so they must exist in the target
 // directory
 image:irc-layout-tab-thumb.png["scr",link="irc-layout-tab.png"]
 image:herbstluftwm-autumncolors-thumb.png["scr",link="herbstluftwm-autumncolors.png"]
-- 
1.8.0