diff --git a/awesomerc.lua b/awesomerc.lua
index 4319b2c6f..af58640a3 100755
--- a/awesomerc.lua
+++ b/awesomerc.lua
@@ -390,7 +390,7 @@ for i = 1, 9 do
                      end
                   end,
                   {description = "move focused client to tag #"..i, group = "tag"}),
-        -- Toggle tag.
+        -- Toggle tag on focused client.
         awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
                   function ()
                       if client.focus then
diff --git a/lib/awful/prompt.lua b/lib/awful/prompt.lua
index 63c2e4d4f..549d77266 100644
--- a/lib/awful/prompt.lua
+++ b/lib/awful/prompt.lua
@@ -261,8 +261,9 @@ end
 -- with command as argument when a command was changed.
 -- @param[opt] keypressed_callback The callback function to call
 --   with mod table, key and command as arguments when a key was pressed.
-
-function prompt.run(args, textbox, exe_callback, completion_callback, history_path, history_max, done_callback, changed_callback, keypressed_callback)
+function prompt.run(args, textbox, exe_callback, completion_callback,
+                    history_path, history_max, done_callback,
+                    changed_callback, keypressed_callback)
     local grabber
     local theme = beautiful.get()
     if not args then args = {} end
diff --git a/lib/awful/spawn.lua b/lib/awful/spawn.lua
index 12fa498d8..e34998155 100644
--- a/lib/awful/spawn.lua
+++ b/lib/awful/spawn.lua
@@ -129,21 +129,23 @@ function spawn.with_shell(cmd)
     end
 end
 
---- Spawn a program and asynchronously and capture its output line by line.
+--- Spawn a program and asynchronously capture its output line by line.
 -- @tparam string|table cmd The command.
--- @tab callbacks Table containing callbacks that should be
---   invoked on various conditions.
--- @tparam[opt] function callbacks.stdout Function that is called with each line of
---   output on stdout, e.g. `stdout(line)`.
--- @tparam[opt] function callbacks.stderr Function that is called with each line of
---   output on stderr, e.g. `stderr(line)`.
--- @tparam[opt] function callbacks.output_done Function to call when no more output
---   is produced.
--- @tparam[opt] function callbacks.exit Function to call when the spawned process
--- exits. This function gets the exit reason and code as its argument. The
--- reason can be "exit" or "signal". For "exit", the second argument is the exit
--- code. For "signal", the second argument is the signal causing process
--- termination.
+-- @tab callbacks Table containing callbacks that should be invoked on
+--   various conditions.
+-- @tparam[opt] function callbacks.stdout Function that is called with each
+--   line of output on stdout, e.g. `stdout(line)`.
+-- @tparam[opt] function callbacks.stderr Function that is called with each
+--   line of output on stderr, e.g. `stderr(line)`.
+-- @tparam[opt] function callbacks.output_done Function to call when no more
+--   output is produced.
+-- @tparam[opt] function callbacks.exit Function to call when the spawned
+--   process exits. This function gets the exit reason and code as its
+--   arguments.
+--   The reason can be "exit" or "signal".
+--   For "exit", the second argument is the exit code.
+--   For "signal", the second argument is the signal causing process
+--   termination.
 -- @treturn[1] Integer the PID of the forked process.
 -- @treturn[2] string Error message.
 function spawn.with_line_callback(cmd, callbacks)
diff --git a/lib/awful/widget/keyboardlayout.lua b/lib/awful/widget/keyboardlayout.lua
index f9142b894..b6e8ce070 100644
--- a/lib/awful/widget/keyboardlayout.lua
+++ b/lib/awful/widget/keyboardlayout.lua
@@ -113,7 +113,7 @@ keyboardlayout.xkeyboard_country_code = {
     ["za"] = true,    -- South Africa
 }
 
--- Callback for updaing current layout
+-- Callback for updating current layout.
 local function update_status (self)
     self._current = awesome.xkb_get_layout_group();
     local text = ""