Attached is a 3 patch series of spelling and grammar corrections to the
code/comments, documentation and man pages.
I split them up in case you would like some, but hate the other changes.
Thanks,
- Brian Gianforcaro
From 4eeebb663d76e65bd2df41c30e25fa7710cd1ee6 Mon Sep 17 00:00:00 2001
From: Brian Gianforcaro <b.gia...@gmail.com>
Date: Sun, 30 Aug 2009 00:20:52 -0400
Subject: [PATCH 1/3] Fix spelling errors in luadoc
Signed-off-by: Brian Gianforcaro <b.gia...@gmail.com>
---
luadoc/button.lua | 2 +-
luadoc/client.lua | 4 ++--
luadoc/image.lua | 4 ++--
luadoc/key.lua | 2 +-
luadoc/keygrabber.lua | 2 +-
luadoc/screen.lua | 6 +++---
luadoc/tag.lua | 2 +-
luadoc/timer.lua | 4 ++--
luadoc/wibox.lua | 2 +-
luadoc/widget.lua | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/luadoc/button.lua b/luadoc/button.lua
index a2b8d8f..5adeb3f 100644
--- a/luadoc/button.lua
+++ b/luadoc/button.lua
@@ -12,7 +12,7 @@ module("button")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/client.lua b/luadoc/client.lua
index b8c15e0..92cd94f 100644
--- a/luadoc/client.lua
+++ b/luadoc/client.lua
@@ -45,7 +45,7 @@ module("client")
-- @name client
--- Get all clients into a table.
--- @param screen An optional screen nunmber.
+-- @param screen An optional screen number.
-- @return A table with all clients.
-- @name client.get
-- @class function
@@ -118,7 +118,7 @@ module("client")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name client.add_signal
-- @class function
diff --git a/luadoc/image.lua b/luadoc/image.lua
index e4d369c..834d2ed 100644
--- a/luadoc/image.lua
+++ b/luadoc/image.lua
@@ -6,7 +6,7 @@ module("image")
--- Image objects.
-- @field width The image width. Immutable.
-- @field height The image height. Immutable.
--- @field alpha Boolean indiacating if the image alpha channel is present.
+-- @field alpha Boolean indicating if the image alpha channel is present.
-- @class table
-- @name image
@@ -113,7 +113,7 @@ module("image")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/key.lua b/luadoc/key.lua
index 5d2eb3c..d166ad9 100644
--- a/luadoc/key.lua
+++ b/luadoc/key.lua
@@ -15,7 +15,7 @@ module("key")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/keygrabber.lua b/luadoc/keygrabber.lua
index ccb009d..eb041f0 100644
--- a/luadoc/keygrabber.lua
+++ b/luadoc/keygrabber.lua
@@ -8,7 +8,7 @@ module("keygrabber")
-- continue grabbing, false to stop.
-- The function is called with 3 arguments:
-- a table containing modifiers keys, a string with the key pressed and a
--- string with eithe "press" or "release" to indicate the event type.
+-- string with either "press" or "release" to indicate the event type.
-- @param func A callback function as described above.
-- @name run
-- @class function
diff --git a/luadoc/screen.lua b/luadoc/screen.lua
index cb8b828..488a3b4 100644
--- a/luadoc/screen.lua
+++ b/luadoc/screen.lua
@@ -3,8 +3,8 @@
-- @copyright 2008-2009 Julien Danjou
module("screen")
---- Scree is a table where indexes are screen number. You can use screen[1] to get acces to the
--- first screen, etc. Each screen has a set of properties.
+--- Screen is a table where indexes are screen number. You can use screen[1]
+-- to get access to the first screen, etc. Each screen has a set of properties.
-- @field geometry The screen coordinates. Immutable.
-- @field workarea The screen workarea.
-- @field index The screen number.
@@ -19,7 +19,7 @@ module("screen")
--- Add a signal to a screen.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/tag.lua b/luadoc/tag.lua
index 5ec14f1..a6776cc 100644
--- a/luadoc/tag.lua
+++ b/luadoc/tag.lua
@@ -18,7 +18,7 @@ module("tag")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/timer.lua b/luadoc/timer.lua
index 89cac2d..d41baaa 100644
--- a/luadoc/timer.lua
+++ b/luadoc/timer.lua
@@ -3,7 +3,7 @@
-- @copyright 2009 Julien Danjou
module("timer")
---- Timer object. This type of objects is useful to trigger events in a repeated manner.
+--- Timer object. This type of object is useful when triggering events in a repeatedly.
-- The timer will emit the "timeout" signal every N seconds, N being the timeout value.
-- @field timeout Interval in seconds to emit the timeout signal.
-- Can be any value, including floating ones (i.e. 1.5 second).
@@ -23,7 +23,7 @@ module("timer")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/wibox.lua b/luadoc/wibox.lua
index 6bf66f8..5b88a21 100644
--- a/luadoc/wibox.lua
+++ b/luadoc/wibox.lua
@@ -48,7 +48,7 @@ module("wibox")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
diff --git a/luadoc/widget.lua b/luadoc/widget.lua
index e7f40c7..e3a10ba 100644
--- a/luadoc/widget.lua
+++ b/luadoc/widget.lua
@@ -51,7 +51,7 @@ module("widget")
--- Add a signal.
-- @param name A signal name.
--- @param func A function to call when the signal is emited.
+-- @param func A function to call when the signal is emitted.
-- @name add_signal
-- @class function
--
1.6.3.3
From 63ee8ab47fa3889c47a786e4eec6d5dbbbb72643 Mon Sep 17 00:00:00 2001
From: Brian Gianforcaro <b.gia...@gmail.com>
Date: Sun, 30 Aug 2009 00:21:54 -0400
Subject: [PATCH 2/3] Grammar and spelling fixes in man pages
Signed-off-by: Brian Gianforcaro <b.gia...@gmail.com>
---
manpages/awesome-client.1.txt | 4 ++--
manpages/awesome.1.txt | 24 ++++++++++++------------
manpages/awesomerc.5.txt | 16 ++++++++--------
manpages/awsetbg.1.txt | 10 +++++-----
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/manpages/awesome-client.1.txt b/manpages/awesome-client.1.txt
index 3a1b6e5..ddff197 100644
--- a/manpages/awesome-client.1.txt
+++ b/manpages/awesome-client.1.txt
@@ -15,11 +15,11 @@ DESCRIPTION
-----------
awesome-client is a remote command line interface to awesome.
-It communicates with awesome via D-Bus. It permits to execute Lua code remotely.
+It communicates with awesome via D-Bus, allowing remote execution of Lua code.
USAGE
-----
-awesome-client reads commands from standard input and send via D-Bus to awesome.
+awesome-client reads commands from standard input and sends them via D-Bus to awesome.
If 'rlwrap' is installed, it will be used to provide a readline command line interface.
The 'awful.remote' module has to be loaded if you want this command to work.
diff --git a/manpages/awesome.1.txt b/manpages/awesome.1.txt
index 7118f6d..b2b6867 100644
--- a/manpages/awesome.1.txt
+++ b/manpages/awesome.1.txt
@@ -15,22 +15,22 @@ DESCRIPTION
-----------
*awesome* is a window manager for X. It manages windows in different layouts, like
-floating or tiled. Either layout can be applied dynamically, optimizing the
-environment for the application in use and the task performed.
+floating or tiled. Any layout can be applied dynamically, optimizing the
+environment for the application in use and the task currently being performed.
-In tiled layout, windows are managed in a master and stacking area. The master
-area contains the windows which currently need most attention, whereas the
-stacking area contains all other windows. In floating layout windows can be
-resized and moved freely. Dialog windows are always managed floating,
-regardless of the layout applied. The spiral and dwindle layout are special cases
-of the tiled layout where the stacking area is arranged in a spiral for the
-former or as a rectangular fractal for the later.
+In a tiled layout, windows are managed in a master and stacking area. The master
+area contains the windows which currently need the most attention, whereas the
+stacking area contains all other windows. In a floating layout windows can be
+resized and moved freely. Dialog windows are always managed as floating,
+regardless of the layout currently applied. The spiral and dwindle layouts are
+special cases of the tiled layout where the stacking area is arranged in a
+spiral for the former or as a rectangular fractal for the later.
-Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting certain tags displays all windows with these tags.
+Windows are grouped by tags in awesome. Each window can be tagged with one or
+more tags. Selecting certain tags displays all windows with these tags.
*awesome* can contain small wiboxes which can display anything you want:
-all available tags, the layout, the title of the visible windows, a text, etc.
+all available tags, the current layout, the title of the visible windows, text, etc.
OPTIONS
-------
diff --git a/manpages/awesomerc.5.txt b/manpages/awesomerc.5.txt
index 8b8a83a..0a3dff7 100644
--- a/manpages/awesomerc.5.txt
+++ b/manpages/awesomerc.5.txt
@@ -8,7 +8,7 @@ awesomerc - Configuration file for the awesome window manager
SYNOPSIS
--------
-*awesome* looks for this configuration file in this order:
+*awesome* looks for a configuration file in this order:
* $XDG_CONFIG_HOME/awesome/rc.lua
* $HOME/.config/awesome/rc.lua
@@ -16,8 +16,8 @@ SYNOPSIS
DESCRIPTION
-----------
-The *rc.lua* file contains configuration informations for *awesome*. It can
-be used to configure the behaviour and look of awesome in a variety of ways.
+The *rc.lua* file contains configuration information for *awesome*. It can
+be used to configure the behavior and look of awesome in a variety of ways.
It can be assimilated as a Lua program/script run at startup by *awesome*.
Therefore, it should use the awesome Lua API described in the API section.
This file is read at startup.
@@ -28,17 +28,17 @@ Documentation for the Lua API can be found in the luadoc directory.
COLORS FORMAT
-------------
-Colors format in *awesome* are either standard X color names
-(blue, darkblue, lightred, etc) or hexadecimal formatted colors (#rrggbb
+The color format in *awesome* is either a standard X color name
+(blue, darkblue, lightred, etc) or a hexadecimal formatted color (#rrggbb
or #rrggbbaa).
-By using hexadecimal format, you can also specifies an alpha channel:
+By using the hexadecimal format, you can also specify an alpha channel:
that means that #00ff00 will draw pure green, but #00ff00aa will set the
alpha channel to `aa' and will blend the green with the color under it.
TEXT FORMAT
-----------
-You can use Pango markup in text string.
-This allows to format the text rendered in widgets.
+You can use Pango markup in a text string.
+This allows formating the text rendered inside widgets.
Pango markup documentation can be found in the Pango documentation at
http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html.
diff --git a/manpages/awsetbg.1.txt b/manpages/awsetbg.1.txt
index 167bfda..52d1de9 100644
--- a/manpages/awsetbg.1.txt
+++ b/manpages/awsetbg.1.txt
@@ -13,7 +13,7 @@ DESCRIPTION
-----------
*awsetbg* is a wrapper that tries to find a suitable background setting application and then
tries to set the wallpaper using that application. You do not have to configure *awsetbg*, since
-it just uses te first application it find.
+it just uses the first application it finds.
Furthermore, it remembers the last wallpaper set, so you do not have to edit anything to change
the wallpaper.
@@ -27,14 +27,14 @@ OPTIONS
*-t* file::
Set tiled wallpaper.
*-a* file::
- Set maximized wallpaper, preserving aspect. If the application chosen do not support this
- option, fullscreen is used as fallback.
+ Set maximized wallpaper, preserving the aspect ratio. If the application chosen does not support this
+ option, fullscreen is used as fall back.
*-u* wallpapersetter::
Use the specified wallpaper setter tool.
*-r* directory::
Set a random wallpaper from this directory.
*-F, -C, -T, -A, -U, -R*::
- Same as the lowercaser option, but without remembering.
+ Same as the lowercase options, but without remembering.
*-l*::
Set the previous wallpaper. If the random feature was the last used, it will set another
random wallpaper from this same directory.
@@ -42,7 +42,7 @@ OPTIONS
Display useful information about the best application to set the wallpaper found.
*-m #*::
Use montage to create a big image (image should fit screen size). Requires montage(1).
- # is the number of screen (columns in montage).
+ # is the number of screens (columns in montage).
*-p*::
Display useful tips.
*-h*::
--
1.6.3.3
From 1a296a222004d889d6ddc26360a7c18b40eeef8d Mon Sep 17 00:00:00 2001
From: Brian Gianforcaro <b.gia...@gmail.com>
Date: Sun, 30 Aug 2009 01:26:19 -0400
Subject: [PATCH 3/3] Grammar/spelling corrections in comments and docs.
Signed-off-by: Brian Gianforcaro <b.gia...@gmail.com>
---
README | 6 +++---
awesome.c | 8 ++++----
client.c | 14 +++++++-------
color.c | 4 ++--
common/atoms.c | 2 +-
common/buffer.h | 2 +-
common/luaobject.c | 6 +++---
common/luaobject.h | 2 +-
common/util.h | 4 ++--
draw.c | 2 +-
image.c | 6 +++---
key.c | 2 +-
keygrabber.c | 4 ++--
luaa.c | 4 ++--
luaa.h | 4 ++--
mouse.c | 4 ++--
screen.c | 6 +++---
screen.h | 2 +-
selection.c | 2 +-
systray.c | 4 ++--
titlebar.h | 4 ++--
utils/awsetbg | 2 +-
wibox.c | 10 +++++-----
widget.c | 4 ++--
widgets/graph.c | 2 +-
widgets/progressbar.c | 6 +++---
26 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/README b/README
index f28d488..4024359 100644
--- a/README
+++ b/README
@@ -10,9 +10,9 @@ After extracting the dist tarball, run:
This will create a build directory, run cmake in it and build awesome.
-After the building done, you can type this to install:
+After building is finished, you can install:
- make install # might need root permissions
+ make install # you might need root permissions
Running awesome
---------------
@@ -32,7 +32,7 @@ the DISPLAY environment variable is set correctly, e.g.:
Configuration
-------------
The configuration of awesome is done by creating a $XDG_CONFIG_HOME/awesome/rc.lua file.
-An example is provided in the sources.
+An example configuration named "awesomerc.lua.in" is provided in the source.
Troubleshooting
---------------
diff --git a/awesome.c b/awesome.c
index 471a3e2..157880d 100644
--- a/awesome.c
+++ b/awesome.c
@@ -274,8 +274,8 @@ awesome_restart(void)
a_exec(globalconf.argv);
}
-/** Function to restart aweome on some signals.
- * \param w the signam received, unused
+/** Function to restart awesome on some signals.
+ * \param w the signal received, unused
* \param revents Currently unused
*/
static void
@@ -289,7 +289,7 @@ restart_on_signal(EV_P_ ev_signal *w, int revents)
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit.
* \param data Currently unused.
- * \param c The connectiont to the X server.
+ * \param c The connection to the X server.
* \param e The error event.
* \return 0 if no error, or xerror's xlib return status.
*/
@@ -446,7 +446,7 @@ main(int argc, char **argv)
xtest_query = xcb_get_extension_data(globalconf.connection, &xcb_test_id);
globalconf.have_xtest = xtest_query->present;
- /* initiliaze dbus */
+ /* initialize dbus */
a_dbus_init();
/* Grab server */
diff --git a/client.c b/client.c
index 44f36c0..9950958 100644
--- a/client.c
+++ b/client.c
@@ -305,7 +305,7 @@ client_unfocus(client_t *c)
client_unfocus_update(c);
}
-/** Check if client supports protocol a protocole in WM_PROTOCOL.
+/** Check if client supports atom a protocol in WM_PROTOCOL.
* \param c The client.
* \param atom The protocol atom to check for.
* \return True if client has the atom in protocol, false otherwise.
@@ -355,7 +355,7 @@ client_ban(client_t *c)
}
}
-/** This is part of The Bob Marley Algorithmm: we ignore enter and leave window
+/** This is part of The Bob Marley Algorithm: we ignore enter and leave window
* in certain cases, like map/unmap or move, so we don't get spurious events.
*/
void
@@ -688,7 +688,7 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, int phys_screen,
/* Always stay in NORMAL_STATE. Even though iconified seems more
* appropriate sometimes. The only possible loss is that clients not using
- * visibility events may continue to proces data (when banned).
+ * visibility events may continue to process data (when banned).
* Without any exposes or other events the cost should be fairly limited though.
*
* Some clients may expect the window to be unmapped when STATE_ICONIFIED.
@@ -830,7 +830,7 @@ client_geometry_hints(client_t *c, area_t geometry)
}
/** Resize client window.
- * The sizse given as parameters are with titlebar and borders!
+ * The sizes given as parameters are with titlebar and borders!
* \param c Client to resize.
* \param geometry New window geometry.
* \param hints Use size hints.
@@ -863,7 +863,7 @@ client_resize(client_t *c, area_t geometry, bool hints)
if(geometry_internal.width == 0 || geometry_internal.height == 0)
return false;
- /* Also let client hints propegate to the "official" geometry. */
+ /* Also let client hints propagate to the "official" geometry. */
geometry = titlebar_geometry_add(c->titlebar, c->border_width, geometry_internal);
if(c->geometries.internal.x != geometry_internal.x
@@ -1229,7 +1229,7 @@ client_unmanage(client_t *c)
{
tag_array_t *tags = &c->screen->tags;
- /* Reset transient_for attributes of widows that maybe refering to us */
+ /* Reset transient_for attributes of widows that maybe referring to us */
foreach(_tc, globalconf.clients)
{
client_t *tc = *_tc;
@@ -1317,7 +1317,7 @@ client_kill(client_t *c)
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
- * \lparam An optional screen nunmber.
+ * \lparam An optional screen number.
* \lreturn A table with all clients.
*/
static int
diff --git a/color.c b/color.c
index 0fb929c..31d3348 100644
--- a/color.c
+++ b/color.c
@@ -128,7 +128,7 @@ color_init_unchecked(color_t *color, const char *colstr, ssize_t len)
/** Initialize a color.
* \param req color_init request.
- * \return True if color allocation was successfull.
+ * \return True if color allocation was successful.
*/
bool
color_init_reply(color_init_cookie_t req)
@@ -218,7 +218,7 @@ xcolor_init_unchecked(xcolor_t *color, const char *colstr, ssize_t len)
/** Initialize a X color.
* \param req xcolor_init request.
- * \return True if color allocation was successfull.
+ * \return True if color allocation was successful.
*/
bool
xcolor_init_reply(xcolor_init_request_t req)
diff --git a/common/atoms.c b/common/atoms.c
index b3760e7..fd7f612 100644
--- a/common/atoms.c
+++ b/common/atoms.c
@@ -49,7 +49,7 @@ atoms_init(xcb_connection_t *conn)
for(i = 0; i < countof(ATOM_LIST); i++)
{
if(!(r = xcb_intern_atom_reply(conn, cs[i], NULL)))
- /* An error occured, get reply for next atom */
+ /* An error occurred, get reply for next atom */
continue;
*ATOM_LIST[i].atom = r->atom;
diff --git a/common/buffer.h b/common/buffer.h
index 403d655..c55782f 100644
--- a/common/buffer.h
+++ b/common/buffer.h
@@ -83,7 +83,7 @@ buffer_wipe(buffer_t *buf)
}
/** Get a new buffer.
- * \return A new allocatedbuffer.
+ * \return A new allocated buffer.
*/
static inline buffer_t *
buffer_new(void)
diff --git a/common/luaobject.c b/common/luaobject.c
index 10a9597..66bfe95 100644
--- a/common/luaobject.c
+++ b/common/luaobject.c
@@ -52,7 +52,7 @@ luaA_object_incref(lua_State *L, int tud, int oud)
/* Get pointer value of the item */
void *pointer = (void *) lua_topointer(L, oud);
- /* Not referencable. */
+ /* Not reference able. */
if(!pointer)
{
lua_remove(L, oud);
@@ -152,7 +152,7 @@ luaA_settype(lua_State *L, lua_class_t *lua_class)
* \param L The Lua VM state.
* \param oud The object index on the stack.
* \param name The name of the signal.
- * \param ud The index of function to call when signal is emited.
+ * \param ud The index of function to call when signal is emitted.
*/
void
luaA_object_add_signal(lua_State *L, int oud,
@@ -167,7 +167,7 @@ luaA_object_add_signal(lua_State *L, int oud,
* \param L The Lua VM state.
* \param oud The object index on the stack.
* \param name The name of the signal.
- * \param ud The index of function to call when signal is emited.
+ * \param ud The index of function to call when signal is emitted.
*/
void
luaA_object_remove_signal(lua_State *L, int oud,
diff --git a/common/luaobject.h b/common/luaobject.h
index d0c6801..19aca17 100644
--- a/common/luaobject.h
+++ b/common/luaobject.h
@@ -95,7 +95,7 @@ luaA_object_registry_push(lua_State *L)
* That only works with userdata, table, thread or function.
* \param L The Lua VM state.
* \param oud The object index on the stack.
- * \return The object reference, or NULL if not referencable.
+ * \return The object reference, or NULL if not referenceable.
*/
static inline void *
luaA_object_ref(lua_State *L, int oud)
diff --git a/common/util.h b/common/util.h
index 019cc95..4c53632 100644
--- a/common/util.h
+++ b/common/util.h
@@ -52,7 +52,7 @@ typedef enum
Left
} position_t;
-/** \brief replace \c NULL strings with emtpy strings */
+/** \brief replace \c NULL strings with empty strings */
#define NONULL(x) (x ? x : "")
#define DO_NOTHING(...)
@@ -200,7 +200,7 @@ static inline ssize_t a_strnlen(const char *s, ssize_t n)
/** \brief \c NULL resistant strdup.
*
- * the a_strdup() function returns a pointer to a new string, which is a
+ * The a_strdup() function returns a pointer to a new string, which is a
* duplicate of \c s. Memory should be freed using p_delete().
*
* \warning when s is \c "", it returns NULL !
diff --git a/draw.c b/draw.c
index e94215b..7bcb0ab 100644
--- a/draw.c
+++ b/draw.c
@@ -668,7 +668,7 @@ draw_text_extents(draw_text_context_t *data)
/** Transform a string to a alignment_t type.
* Recognized string are flex, fixed, left, center, middle or right.
- * \param align Atring with align text.
+ * \param align A string with align text.
* \param len The string length.
* \return An alignment_t type.
*/
diff --git a/image.c b/image.c
index a472133..76ad084 100644
--- a/image.c
+++ b/image.c
@@ -67,11 +67,11 @@ image_imlib_load_strerror(Imlib_Load_Error e)
case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
return "path too long";
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
- return "path component non existant";
+ return "path component non existent";
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
- return "path compoment not a directory";
+ return "path component not a directory";
case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
- return "path points oustide address space";
+ return "path points outside address space";
case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
return "too many symbolic links";
case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
diff --git a/key.c b/key.c
index 624a33a..cc8587b 100644
--- a/key.c
+++ b/key.c
@@ -957,7 +957,7 @@ key_getkeysym(xcb_keycode_t detail, uint16_t state)
* instead */
return k1;
- /* The Shift modifer is on, or the Lock modifier is on and is
+ /* The Shift modifier is on, or the Lock modifier is on and is
* interpreted as ShiftLock, or both */
else if((state & XCB_MOD_MASK_SHIFT)
|| (state & XCB_MOD_MASK_LOCK && (state & globalconf.shiftlockmask)))
diff --git a/keygrabber.c b/keygrabber.c
index e9d409e..88cfd98 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -57,7 +57,7 @@ keygrabber_grab(void)
/** Handle keypress event.
* \param L Lua stack to push the key pressed.
* \param e Received XKeyEvent.
- * \return True if a key was succesfully get, false otherwise.
+ * \return True if a key was successfully get, false otherwise.
*/
bool
keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
@@ -92,7 +92,7 @@ keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
* continue grabbing, false to stop.
* The function is called with 3 arguments:
* a table containing modifiers keys, a string with the key pressed and a
- * string with eithe "press" or "release" to indicate the event type.
+ * string with either "press" or "release" to indicate the event type.
*
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
diff --git a/luaa.c b/luaa.c
index d508e8b..f278cda 100644
--- a/luaa.c
+++ b/luaa.c
@@ -237,7 +237,7 @@ luaAe_type(lua_State *L)
}
/** Modified version of os.execute() which use spawn code to reset signal
- * handlers correctly before exec()ing the new program.
+ * handlers correctly before exec()'ing the new program.
* \param L The Lua VM state.
* \return The number of arguments pushed on stack.
*/
@@ -342,7 +342,7 @@ luaA_wtable_index(lua_State *L)
return 1;
}
-/** Newndex function of wtable objects.
+/** Newindex function of wtable objects.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
*/
diff --git a/luaa.h b/luaa.h
index e56d3fe..4ed896f 100644
--- a/luaa.h
+++ b/luaa.h
@@ -112,7 +112,7 @@ luaA_pusharea(lua_State *L, area_t geometry)
* \param L The Lua stack.
* \param idx Index of the object in the stack.
* \param ref A int address: it will be filled with the int
- * registered. If the adresse point to an already registered object, it will
+ * registered. If the address points to an already registered object, it will
* be unregistered.
* \return Always 0.
*/
@@ -141,7 +141,7 @@ luaA_unregister(lua_State *L, int *ref)
* \param L The Lua stack.
* \param idx Index of the function in the stack.
* \param fct A int address: it will be filled with the int
- * registered. If the adresse point to an already registered function, it will
+ * registered. If the address points to an already registered function, it will
* be unregistered.
* \return luaA_register value.
*/
diff --git a/mouse.c b/mouse.c
index 24acf56..98f4772 100644
--- a/mouse.c
+++ b/mouse.c
@@ -34,7 +34,7 @@
* \param y will be set to the Pointer-y-coordinate relative to window
* \param child Will be set to the window under the pointer.
* \param mask will be set to the current buttons state
- * \return true on success, false if an error occured
+ * \return true on success, false if an error occurred
**/
bool
mouse_query_pointer(xcb_window_t window, int16_t *x, int16_t *y, xcb_window_t *child, uint16_t *mask)
@@ -66,7 +66,7 @@ mouse_query_pointer(xcb_window_t window, int16_t *x, int16_t *y, xcb_window_t *c
* \param y This will be set to the Pointer-y-coordinate relative to window.
* \param child This will be set to the window under the pointer.
* \param mask This will be set to the current buttons state.
- * \return True on success, false if an error occured.
+ * \return True on success, false if an error occurred.
*/
static bool
mouse_query_pointer_root(screen_t **s, int16_t *x, int16_t *y, xcb_window_t *child, uint16_t *mask)
diff --git a/screen.c b/screen.c
index 5a2c8e5..8218285 100644
--- a/screen.c
+++ b/screen.c
@@ -255,7 +255,7 @@ screen_virttophys(int screen)
/** Move a client to a virtual screen.
* \param c The client to move.
- * \param new_screen The destinatiuon screen.
+ * \param new_screen The destination screen.
* \param doresize Set to true if we also move the client to the new x and
* y of the new screen.
*/
@@ -340,7 +340,7 @@ screen_client_moveto(client_t *c, screen_t *new_screen, bool doresize)
/** Push a screen onto the stack.
* \param L The Lua VM state.
- * \param s The scren to push.
+ * \param s The screen to push.
* \return The number of elements pushed on stack.
*/
int
@@ -455,7 +455,7 @@ luaA_screen_index(lua_State *L)
* \luastack
* \lvalue A screen.
* \lparam A signal name.
- * \lparam A function to call when the signal is emited.
+ * \lparam A function to call when the signal is emitted.
*/
static int
luaA_screen_add_signal(lua_State *L)
diff --git a/screen.h b/screen.h
index 2172ac7..019e2a6 100644
--- a/screen.h
+++ b/screen.h
@@ -47,7 +47,7 @@ struct a_screen
SnMonitorContext *snmonitor;
/** The default visual, used to draw */
xcb_visualtype_t *visual;
- /** The signals emited by screen objects */
+ /** The signals emitted by screen objects */
signal_array_t signals;
};
ARRAY_FUNCS(screen_t, screen, DO_NOTHING)
diff --git a/selection.c b/selection.c
index 23596ec..a443364 100644
--- a/selection.c
+++ b/selection.c
@@ -71,7 +71,7 @@ luaA_selection_get(lua_State *L)
* xcb_event_poll_for_event_loop() and awesome_refresh(),
* then check if some static buffer has been filled with data.
* If yes, that'd be the xsel data, otherwise, re-loop.
- * Anyway that's still brokes the socket or D-Bus, so maybe using
+ * Anyway that's still brakes the socket or D-Bus, so maybe using
* ev_loop() would be even better.
*/
xcb_event_handle(&globalconf.evenths, event);
diff --git a/systray.c b/systray.c
index b286382..1f573ee 100644
--- a/systray.c
+++ b/systray.c
@@ -127,7 +127,7 @@ systray_cleanup(int phys_screen)
/** Handle a systray request.
* \param embed_win The window to embed.
* \param phys_screen The physical monitor to display on.
- * \param info The embeding info
+ * \param info The embedding info
* \return 0 on no error.
*/
int
@@ -221,7 +221,7 @@ systray_iskdedockapp(xcb_window_t w)
xcb_get_property_reply_t *kde_check;
bool ret;
- /* Check if that is a KDE tray because it does not repect fdo standards,
+ /* Check if that is a KDE tray because it does not respect fdo standards,
* thanks KDE. */
kde_check_q = xcb_get_property_unchecked(globalconf.connection, false, w,
_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR,
diff --git a/titlebar.h b/titlebar.h
index 3d084c3..42d0af6 100644
--- a/titlebar.h
+++ b/titlebar.h
@@ -62,7 +62,7 @@ static inline area_t
titlebar_geometry_add(wibox_t *t, int border, area_t geometry)
{
/* We need to add titlebar border to the total width and height.
- * This can then be substracted/added to the witdh/height/x/y.
+ * This can then be subtracted/added to the width/height/x/y.
* In this case the border is included, because it belongs to a different window.
*/
if(t && t->visible)
@@ -103,7 +103,7 @@ static inline area_t
titlebar_geometry_remove(wibox_t *t, int border, area_t geometry)
{
/* We need to add titlebar border to the total width and height.
- * This can then be substracted/added to the witdh/height/x/y.
+ * This can then be subtracted/added to the width/height/x/y.
* In this case the border is included, because it belongs to a different window.
*/
if(t && t->visible)
diff --git a/utils/awsetbg b/utils/awsetbg
index f2f1b1e..f5e7dce 100755
--- a/utils/awsetbg
+++ b/utils/awsetbg
@@ -89,7 +89,7 @@ Options:
-u Use specified wallpapersetter, use no argument to forget.
-r set random wallpaper from a directory
- -F,-C,-T,-A,-U,-R same as uncapsed but without remembering.
+ -F,-C,-T,-A,-U,-R same as lowercase but without remembering.
-h Display this help.
diff --git a/wibox.c b/wibox.c
index be14898..a6e9610 100644
--- a/wibox.c
+++ b/wibox.c
@@ -94,7 +94,7 @@ shape_update(xcb_window_t win, xcb_shape_kind_t kind, image_t *image, int offset
}
/** Update the window's shape.
- * \param wibox The simplw window whose shape should be updated.
+ * \param wibox The simple window whose shape should be updated.
*/
static void
wibox_shape_update(wibox_t *wibox)
@@ -258,13 +258,13 @@ wibox_moveresize(lua_State *L, int udx, area_t geometry)
wibox_draw_context_update(w, s);
}
- /* Activatate BMA */
+ /* Activate BMA */
client_ignore_enterleave_events();
if(mask_vals)
xcb_configure_window(globalconf.connection, w->window, mask_vals, moveresize_win_vals);
- /* Deactivatate BMA */
+ /* Deactivate BMA */
client_restore_enterleave_events();
w->screen = screen_getbycoord(w->screen, w->geometry.x, w->geometry.y);
@@ -369,7 +369,7 @@ wibox_map(wibox_t *wibox)
client_ignore_enterleave_events();
/* Map the wibox */
xcb_map_window(globalconf.connection, wibox->window);
- /* Deactivatate BMA */
+ /* Deactivate BMA */
client_restore_enterleave_events();
/* We must make sure the wibox does not display garbage */
wibox_need_update(wibox);
@@ -784,7 +784,7 @@ wibox_attach(lua_State *L, int udx, screen_t *s)
* \param L The Lua VM state.
*
* \luastack
- * \lparam A table with optionaly defined values:
+ * \lparam A table with optionally defined values:
* fg, bg, border_width, border_color, ontop, width and height.
* \lreturn A brand new wibox.
*/
diff --git a/widget.c b/widget.c
index aecb3f2..0698e57 100644
--- a/widget.c
+++ b/widget.c
@@ -98,7 +98,7 @@ widget_getbycoords(orientation_t orientation, widget_node_array_t *widgets,
return NULL;
}
-/** Convert a Lua table to a list of widget nodet.
+/** Convert a Lua table to a list of widget nodes.
* \param L The Lua VM state.
* \param widgets The linked list of widget node.
*/
@@ -534,7 +534,7 @@ luaA_widget_set_type(lua_State *L, widget_t *w)
}
if(!wc)
- luaL_error(L, "unkown widget type: %s", type);
+ luaL_error(L, "unknown widget type: %s", type);
wc(w);
w->type = wc;
diff --git a/widgets/graph.c b/widgets/graph.c
index 9ece773..2dbe6a3 100644
--- a/widgets/graph.c
+++ b/widgets/graph.c
@@ -36,7 +36,7 @@ typedef enum
/** The plot data structure. */
typedef struct
{
- /** Grapht title of the plot sections */
+ /** Graph title of the plot sections */
char *title;
/** Represents a full graph */
float max_value;
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 989b8f5..12bae0a 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -195,7 +195,7 @@ progressbar_draw(widget_t *widget, draw_context_t *ctx, area_t geometry, wibox_t
* basic progressbar:
* 1. the full space gets the size of the formerly empty one
* 2. the pattern must be mirrored
- * 3. the formerly 'empty' side gets drawed with fg colors, the 'full' with bg-color
+ * 3. the formerly 'empty' side is drawn with fg colors, the 'full' with bg-color
*
* ticks:
* 1. round the values to a full tick accordingly
@@ -307,7 +307,7 @@ progressbar_draw(widget_t *widget, draw_context_t *ctx, area_t geometry, wibox_t
else
draw_rectangle(ctx, rectangle, 1.0, true, &bar->fg_off);
}
- /* draw gaps TODO: improve e.g all in one */
+ /* draw gaps \todo improve e.g all in one */
if(d->ticks_count && d->ticks_gap)
{
rectangle.width = pb_width;
@@ -415,7 +415,7 @@ progressbar_draw(widget_t *widget, draw_context_t *ctx, area_t geometry, wibox_t
else
draw_rectangle(ctx, rectangle, 1.0, true, &bar->fg_off);
}
- /* draw gaps TODO: improve e.g all in one */
+ /* draw gaps \todo improve e.g all in one */
if(d->ticks_count && d->ticks_gap)
{
rectangle.width = d->ticks_gap;
--
1.6.3.3
