summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric@engestrom.ch>2016-05-02 09:49:36 +0100
committerBryce Harrington <bryce@osg.samsung.com>2016-05-02 17:46:32 -0700
commit3c1aafd2a9157a884478bcd32263baad8d8b78fb (patch)
tree40b4f738f8852ca2c69a3b4bb130228a6e826389
parent479945b4f1c34207ad785f844eca3e422af1c6dd (diff)
downloadwayland-3c1aafd2a9157a884478bcd32263baad8d8b78fb.tar.gz
doc: fix typos
Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Armin Krezović <krezovic.armin@gmail.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-rw-r--r--doc/Contributing10
-rw-r--r--doc/publican/sources/Protocol.xml2
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/Contributing b/doc/Contributing
index 65565dc..c790a07 100644
--- a/doc/Contributing
+++ b/doc/Contributing
@@ -22,13 +22,13 @@ The body of the commit message should describe what the patch changes
and why, and also note any particular side effects. This shouldn't be
empty on most of the cases. It shouldn't take a lot of effort to write
a commit message for an obvious change, so an empty commit message
-body is only acceptable if the questions "What?" and "Why" are already
+body is only acceptable if the questions "What?" and "Why?" are already
answered on the one-line summary.
The lines of the commit message should have at most 76 characters, to
cope with the way git log presents them.
-See [2] for a recommend reading on writing commit messages.
+See [2] for a recommended reading on writing commit messages.
Your patches should also include a Signed-off-by line with your name and
email address. If you're not the patch's original author, you should
@@ -122,7 +122,7 @@ try to follow the rules below.
- indent with tabs, and a tab is always 8 characters wide
- opening braces are on the same line as the if statement;
- no braces in an if-body with just one statement;
-- if one of the branches of an if-else codition has braces, than the
+- if one of the branches of an if-else condition has braces, then the
other branch should also have braces;
- there is always an empty line between variable declarations and the
code;
@@ -147,7 +147,7 @@ my_function(void)
- lines should be less than 80 characters wide;
- when breaking lines with functions calls, the parameters are aligned
- with the opening parenthesis;
+ with the opening parentheses;
- when assigning a variable with the result of a function call, if the
line would be longer we break it around the equal '=' sign if it makes
sense;
@@ -166,7 +166,7 @@ Originally, X.org was covered under the MIT X11 license, but changed to
the MIT Expat license. Similarly, Wayland was covered initially as MIT
X11 licensed, but changed to the MIT Expat license, following in X.org's
footsteps. Other than wording, the two licenses are substantially the
-same, with the exeption of a no-advertising clause in X11 not included
+same, with the exception of a no-advertising clause in X11 not included
in Expat.
New source code files should specify the MIT Expat license in their
diff --git a/doc/publican/sources/Protocol.xml b/doc/publican/sources/Protocol.xml
index 481e175..ba6b5f1 100644
--- a/doc/publican/sources/Protocol.xml
+++ b/doc/publican/sources/Protocol.xml
@@ -199,7 +199,7 @@
Every interface is versioned and every protocol object implements a
particular version of its interface. For global objects, the maximum
version supported by the server is advertised with the global and the
- actual verion of the created protocol object is determined by the
+ actual version of the created protocol object is determined by the
version argument passed to wl_registry.bind(). For objects that are
not globals, their version is inferred from the object that created
them.