From c88eea508ac0fe111dab8124b25e3378f3f6b74a Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 4 Dec 2017 19:56:43 -0800 Subject: [PATCH 1/3] doc: add serial comma in CPP_STYLE_GUIDE.md --- CPP_STYLE_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CPP_STYLE_GUIDE.md b/CPP_STYLE_GUIDE.md index 7f8e5a3de42e35..62c96a8fd12e35 100644 --- a/CPP_STYLE_GUIDE.md +++ b/CPP_STYLE_GUIDE.md @@ -8,7 +8,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) From 6ef39ae9179bec31bfe0ba5cac14b24a80a6ccb7 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 4 Dec 2017 19:57:00 -0800 Subject: [PATCH 2/3] build: add serial commas to messages in configure script --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 13dcb601d09e32..98a96ac0cbc64d 100755 --- a/configure +++ b/configure @@ -146,7 +146,7 @@ parser.add_option("--enable-vtune-profiling", dest="enable_vtune_profiling", help="Enable profiling support for Intel VTune profiler to profile " "JavaScript code executed in nodejs. This feature is only available " - "for x32, x86 and x64 architectures.") + "for x32, x86, and x64 architectures.") parser.add_option("--link-module", @@ -883,7 +883,7 @@ def configure_node(o): o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling) elif options.enable_vtune_profiling: raise Exception( - 'The VTune profiler for JavaScript is only supported on x32, x86 and x64 ' + 'The VTune profiler for JavaScript is only supported on x32, x86, and x64 ' 'architectures.') else: o['variables']['node_enable_v8_vtunejit'] = 'false' From 89f1fcb6da77b61bd644d4a9a15226ebbe01898d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 4 Dec 2017 23:49:38 -0800 Subject: [PATCH 3/3] doc: use serial comma in tls.md --- doc/api/tls.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/tls.md b/doc/api/tls.md index 268460cfdfd963..38e35fb5d2d99d 100644 --- a/doc/api/tls.md +++ b/doc/api/tls.md @@ -753,8 +753,8 @@ added: v0.8.4 Verifies the certificate `cert` is issued to host `host`. -Returns {Error} object, populating it with the reason, host and cert on failure. -On success, returns {undefined}. +Returns {Error} object, populating it with the reason, host, and cert on +failure. On success, returns {undefined}. *Note*: This function can be overwritten by providing alternative function as part of the `options.checkServerIdentity` option passed to `tls.connect()`.