summaryrefslogtreecommitdiff
path: root/CPP_STYLE_GUIDE.md
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2017-11-28 21:53:24 -0500
committerRich Trott <rtrott@gmail.com>2017-12-01 14:46:36 -0800
commitff9a6bc1f343c146c4d54034e351e1afb1da3238 (patch)
tree6f8124f4fbe096149547a2d5acc4071722f9ae67 /CPP_STYLE_GUIDE.md
parentd2b2baf2a5d61c3ce8a5be1e4eac5f4cf984efce (diff)
downloadandroid-node-v8-ff9a6bc1f343c146c4d54034e351e1afb1da3238.tar.gz
android-node-v8-ff9a6bc1f343c146c4d54034e351e1afb1da3238.tar.bz2
android-node-v8-ff9a6bc1f343c146c4d54034e351e1afb1da3238.zip
doc: add missing serial commas
PR-URL: https://github.com/nodejs/node/pull/17384 Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'CPP_STYLE_GUIDE.md')
-rw-r--r--CPP_STYLE_GUIDE.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CPP_STYLE_GUIDE.md b/CPP_STYLE_GUIDE.md
index 1dad8592f9..d3afd3c1ab 100644
--- a/CPP_STYLE_GUIDE.md
+++ b/CPP_STYLE_GUIDE.md
@@ -7,7 +7,7 @@
* [4 spaces of indentation for statement continuations](#4-spaces-of-indentation-for-statement-continuations)
* [Align function arguments vertically](#align-function-arguments-vertically)
* [Initialization lists](#initialization-lists)
-* [CamelCase for methods, functions and classes](#camelcase-for-methods-functions-and-classes)
+* [CamelCase for methods, functions, and classes](#camelcase-for-methods-functions-and-classes)
* [snake\_case for local variables and parameters](#snake_case-for-local-variables-and-parameters)
* [snake\_case\_ for private class fields](#snake_case_-for-private-class-fields)
* [Space after `template`](#space-after-template)
@@ -87,7 +87,7 @@ HandleWrap::HandleWrap(Environment* env,
handle_(handle) {
```
-## CamelCase for methods, functions and classes
+## CamelCase for methods, functions, and classes
Exceptions are simple getters/setters, which are named `property_name()` and
`set_property_name()`, respectively.