Merge.

man/wmii.tex

@@ -66,7 +66,7 @@ the bar, which are described in detail in the
 	\emph{work}, or several tags, e.g.  \emph{work+mail}.
 	Tags are separated with the \emph{+} character.
 \item[View] A set of clients containing a specific tag, quite
-	similiar to a workspace in other window managers.  It
+	similar to a workspace in other window managers.  It
 	consists of the floating and managed layers.
 \item[Column] A column is a screen area which arranges clients
 	vertically in a non-overlapping way. Columns provide
@@ -285,9 +285,9 @@ represents the currently selected client.
 \item[label] Set or read a client's label (title).
 \item[props] Returns a clients class and label as:
 	\emph{name}:\emph{class}:\emph{label}
-\item[tags] Set or read a client's tags. Tags are seperated by
-	\emph{+} or \emph{-}. Tags begining with \emph{+} are
-	added, while those begining with \emph{-} are removed.
+\item[tags] Set or read a client's tags. Tags are separated by
+	\emph{+} or \emph{-}. Tags beginning with \emph{+} are
+	added, while those beginning with \emph{-} are removed.
 	If the tag string written begins with \emph{+} or
 	\emph{-}, the written tags are added to or removed from
 	the client's set, otherwise, the set is overwritten.
@@ -333,7 +333,7 @@ occupying all extra available space. The items are sorted
 lexicographically.
 
 The files may be read to obtain the colors and text of the bars.
-The colors are at the begining of the string, represented as a
+The colors are at the beginning of the string, represented as a
 tuple of 3 hex color codes for the foreground, background, and
 border, respectively. When writing the bar files, the colors may
 be omitted if the text would not otherwise appear to contain