mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-31 07:11:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc: fix typos

Browse source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Eric Engestrom 2016-05-02 09:49:36 +01:00 • committed by Bryce Harrington
parent 479945b4f1
commit 3c1aafd2a9
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/Contributing
View file

@ -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 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 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 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. answered on the one-line summary.
The lines of the commit message should have at most 76 characters, to The lines of the commit message should have at most 76 characters, to
cope with the way git log presents them. 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 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 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 - indent with tabs, and a tab is always 8 characters wide
- opening braces are on the same line as the if statement; - opening braces are on the same line as the if statement;
- no braces in an if-body with just one 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; other branch should also have braces;
- there is always an empty line between variable declarations and the - there is always an empty line between variable declarations and the
code; code;
@ -147,7 +147,7 @@ my_function(void)
- lines should be less than 80 characters wide; - lines should be less than 80 characters wide;
- when breaking lines with functions calls, the parameters are aligned - 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 - 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 line would be longer we break it around the equal '=' sign if it makes
sense; 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 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 X11 licensed, but changed to the MIT Expat license, following in X.org's
footsteps. Other than wording, the two licenses are substantially the 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. in Expat.
New source code files should specify the MIT Expat license in their New source code files should specify the MIT Expat license in their

2
doc/publican/sources/Protocol.xml
View file

@ -199,7 +199,7 @@
Every interface is versioned and every protocol object implements a Every interface is versioned and every protocol object implements a
particular version of its interface. For global objects, the maximum particular version of its interface. For global objects, the maximum
version supported by the server is advertised with the global and the 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 version argument passed to wl_registry.bind(). For objects that are
not globals, their version is inferred from the object that created not globals, their version is inferred from the object that created
them. them.