Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct typos #11189

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmark/compare.R
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ statistics = ddply(dat, "name", function(subdat) {

p.value = NA;
confidence = 'NA';
# Check if there is enough data to calulate the calculate the p-value
# Check if there is enough data to calculate the calculate the p-value
if (length(old.rate) > 1 && length(new.rate) > 1) {
# Perform a statistics test to see of there actually is a difference in
# performance.
Expand Down
2 changes: 1 addition & 1 deletion benchmark/compare.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const BenchmarkProgress = require('./_benchmark_progress.js');
// Parse arguments
//
const cli = CLI(`usage: ./node compare.js [options] [--] <category> ...
Run each benchmark in the <category> directory many times using two diffrent
Run each benchmark in the <category> directory many times using two different
node versions. More than one <category> directory can be specified.
The output is formatted as csv, which can be processed using for
example 'compare.R'.
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ def warn(msg):
prefix = '\033[1m\033[93mWARNING\033[0m' if os.isatty(1) else 'WARNING'
print('%s: %s' % (prefix, msg))

# track if warnings occured
# track if warnings occurred
warn.warned = False

def b(value):
Expand Down
2 changes: 1 addition & 1 deletion doc/api_assets/dnt_helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function _dntEnabled(dnt, userAgent) {
var fxMatch = ua.match(/Firefox\/(\d+)/);
var ieRegEx = /MSIE|Trident/i;
var isIE = ieRegEx.test(ua);
// Matches from Windows up to the first occurance of ; un-greedily
// Matches from Windows up to the first occurrence of ; un-greedily
// http://www.regexr.com/3c2el
var platform = ua.match(/Windows.+?(?=;)/g);

Expand Down
2 changes: 1 addition & 1 deletion doc/changelogs/CHANGELOG_ARCHIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3025,7 +3025,7 @@ https://github.com/nodejs/node/commit/311d7dee19034ff1c6bc9098c36973b8d687eaba
* After V8 heap is compact, don't use a timer every 2 seconds.

* Improve nextTick implementation.
* Add primative support for Upgrading HTTP connections.
* Add primitive support for Upgrading HTTP connections.
(See commit log for docs 760bba5)

* Add timeout and maxBuffer options to child_process.exec
Expand Down
2 changes: 1 addition & 1 deletion doc/changelogs/CHANGELOG_V5.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ This is a security release. All Node.js users should consult the security releas
### Notable changes

**http**:
* Enclose IPv6 Host header in square brackets. This will enable proper separation of the host adress from any port reference (Mihai Potra) [#5314](https://github.com/nodejs/node/pull/5314)
* Enclose IPv6 Host header in square brackets. This will enable proper separation of the host address from any port reference (Mihai Potra) [#5314](https://github.com/nodejs/node/pull/5314)
Copy link
Contributor

@mscdex mscdex Feb 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should be fine I think since it was actually spelled correctly in the relevant commit message.


**path**:
* Make win32.isAbsolute more consistent (Brian White) [#6028](https://github.com/nodejs/node/pull/6028)
Expand Down
2 changes: 1 addition & 1 deletion src/debug-agent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void Agent::WorkerRun() {
CHECK_EQ(&child_loop_, env.event_loop());
uv_run(&child_loop_, UV_RUN_DEFAULT);

// Clean-up peristent
// Clean-up persistent
api_.Reset();
}
isolate->Dispose();
Expand Down
2 changes: 1 addition & 1 deletion src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3464,7 +3464,7 @@ void LoadEnvironment(Environment* env) {
// (FatalException(), break on uncaught exception in debugger)
//
// This is not strictly necessary since it's almost impossible
// to attach the debugger fast enought to break on exception
// to attach the debugger fast enough to break on exception
// thrown during process startup.
try_catch.SetVerbose(true);

Expand Down
2 changes: 1 addition & 1 deletion src/node_crypto.cc
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) {
(void) &clear_error_on_return; // Silence compiler warning.

// Auto DH is not supported in openssl 1.0.1, so dhparam needs
// to be specifed explicitly
// to be specified explicitly
if (args.Length() != 1)
return env->ThrowTypeError("DH argument is mandatory");

Expand Down
12 changes: 6 additions & 6 deletions src/string_search.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ inline const void* MemrchrFill(const void* haystack, uint8_t needle,
}


// Finds the first occurence of *two-byte* character pattern[0] in the string
// Finds the first occurrence of *two-byte* character pattern[0] in the string
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this file comes from deps/v8/src/string-search.h with the typo ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's ok.

// `subject`. Does not check that the whole pattern matches.
template <typename Char>
inline size_t FindFirstCharacter(Vector<const Char> pattern,
Expand Down Expand Up @@ -284,7 +284,7 @@ inline size_t FindFirstCharacter(Vector<const Char> pattern,
}


// Finds the first occurance of the byte pattern[0] in string `subject`.
// Finds the first occurrence of the byte pattern[0] in string `subject`.
// Does not verify that the whole pattern matches.
template <>
inline size_t FindFirstCharacter(Vector<const uint8_t> pattern,
Expand Down Expand Up @@ -373,7 +373,7 @@ size_t StringSearch<Char>::BoyerMooreSearch(
// Only preprocess at most kBMMaxShift last characters of pattern.
size_t start = search->start_;

int* bad_char_occurence = search->bad_char_table();
int* bad_char_occurrence = search->bad_char_table();
int* good_suffix_shift = search->good_suffix_shift_table();

Char last_char = pattern[pattern_length - 1];
Expand All @@ -383,7 +383,7 @@ size_t StringSearch<Char>::BoyerMooreSearch(
size_t j = pattern_length - 1;
int c;
while (last_char != (c = subject[index + j])) {
int shift = j - CharOccurrence(bad_char_occurence, c);
int shift = j - CharOccurrence(bad_char_occurrence, c);
index += shift;
if (index > subject_length - pattern_length) {
return subject.length();
Expand All @@ -399,11 +399,11 @@ size_t StringSearch<Char>::BoyerMooreSearch(
// we have matched more than our tables allow us to be smart about.
// Fall back on BMH shift.
index += pattern_length - 1 -
CharOccurrence(bad_char_occurence,
CharOccurrence(bad_char_occurrence,
static_cast<Char>(last_char));
} else {
int gs_shift = good_suffix_shift[j + 1];
int bc_occ = CharOccurrence(bad_char_occurence, c);
int bc_occ = CharOccurrence(bad_char_occurrence, c);
int shift = j - bc_occ;
if (gs_shift > shift) {
shift = gs_shift;
Expand Down
2 changes: 1 addition & 1 deletion src/tls_wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void TLSWrap::InitSSL() {

SSL_set_bio(ssl_, enc_in_, enc_out_);

// NOTE: This could be overriden in SetVerifyMode
// NOTE: This could be overridden in SetVerifyMode
SSL_set_verify(ssl_, SSL_VERIFY_NONE, crypto::VerifyCallback);

#ifdef SSL_MODE_RELEASE_BUFFERS
Expand Down
2 changes: 1 addition & 1 deletion test/internet/test-dgram-broadcast-multi-process.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ if (process.argv[2] === 'child') {
listenSocket.on('close', function() {
//HACK: Wait to exit the process to ensure that the parent
//process has had time to receive all messages via process.send()
//This may be indicitave of some other issue.
//This may be indicative of some other issue.
setTimeout(function() {
process.exit();
}, 1000);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-fork-dgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if (process.argv[2] === 'child') {
const timer = setInterval(function() {
/*
* Both the parent and the child got at least one message,
* test passed, clean up everyting.
* test passed, clean up everything.
*/
if (parentGotMessage && childGotMessage) {
clearInterval(timer);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-cluster-message.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if (cluster.isWorker) {
if (data.code === 'received message') {
check('worker', data.echo === 'message from master');
} else {
throw new Error('wrong TCP message recived: ' + data);
throw new Error('wrong TCP message received: ' + data);
}
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-cluster-setup-master-multiple.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const cluster = require('cluster');
assert(cluster.isMaster);

// The cluster.settings object is cloned even though the current implementation
// makes that unecessary. This is to make the test less fragile if the
// makes that unnecessary. This is to make the test less fragile if the
// implementation ever changes such that cluster.settings is mutated instead of
// replaced.
function cheapClone(obj) {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-binary-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ function testCipher2(key) {


function testCipher3(key, iv) {
// Test encyrption and decryption with explicit key and iv
// Test encryption and decryption with explicit key and iv
const plaintext =
'32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
Expand All @@ -496,7 +496,7 @@ function testCipher3(key, iv) {


function testCipher4(key, iv) {
// Test encyrption and decryption with explicit key and iv
// Test encryption and decryption with explicit key and iv
const plaintext =
'32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-cipheriv-decipheriv.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (!common.hasCrypto) {
const crypto = require('crypto');

function testCipher1(key, iv) {
// Test encyrption and decryption with explicit key and iv
// Test encryption and decryption with explicit key and iv
const plaintext =
'32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
Expand Down Expand Up @@ -41,7 +41,7 @@ function testCipher1(key, iv) {


function testCipher2(key, iv) {
// Test encyrption and decryption with explicit key and iv
// Test encryption and decryption with explicit key and iv
const plaintext =
'32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-event-emitter-add-listeners.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const EventEmitter = require('events');

{
const ee = new EventEmitter();
const events_new_listener_emited = [];
const listeners_new_listener_emited = [];
const events_new_listener_emitted = [];
const listeners_new_listener_emitted = [];

// Sanity check
assert.strictEqual(ee.addListener, ee.on);
Expand All @@ -16,8 +16,8 @@ const EventEmitter = require('events');
if (event === 'newListener')
return;

events_new_listener_emited.push(event);
listeners_new_listener_emited.push(listener);
events_new_listener_emitted.push(event);
listeners_new_listener_emitted.push(listener);
});

const hello = common.mustCall(function(a, b) {
Expand All @@ -33,8 +33,8 @@ const EventEmitter = require('events');

ee.on('hello', hello);
ee.once('foo', common.fail);
assert.deepStrictEqual(['hello', 'foo'], events_new_listener_emited);
assert.deepStrictEqual([hello, common.fail], listeners_new_listener_emited);
assert.deepStrictEqual(['hello', 'foo'], events_new_listener_emitted);
assert.deepStrictEqual([hello, common.fail], listeners_new_listener_emitted);

ee.emit('hello', 'a', 'b');
}
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-fs-access.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ createFileWithPerms(readWriteFile, 0o666);
*
* There's not really any point in resetting the process' user id to 0 after
* changing it to 'nobody', since in the case that the test runs without
* superuser priviledge, it is not possible to change its process user id to
* superuser privilege, it is not possible to change its process user id to
* superuser.
*
* It can prevent the test from removing files created before the change of user
* id, but that's fine. In this case, it is the responsability of the
* id, but that's fine. In this case, it is the responsibility of the
* continuous integration platform to take care of that.
*/
let hasWriteAccessForReadonlyFile = false;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-process-no-deprecation.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
// Flags: --no-warnings

// The --no-warnings flag only supresses writing the warning to stderr, not the
// The --no-warnings flag only suppresses writing the warning to stderr, not the
// emission of the corresponding event. This test file can be run without it.

const common = require('../common');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream-readable-needReadable.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const slowProducer = new Readable({

slowProducer.on('readable', common.mustCall(() => {
if (slowProducer.read(8) === null) {
// The buffer doesn't have enough data, and the stream is not ened,
// The buffer doesn't have enough data, and the stream is not need,
// we need to notify the reader when data arrives.
assert.strictEqual(slowProducer._readableState.needReadable, true);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const server = net.createServer(function onClient(client) {
clients[1].end();
});

// Use a delay that is higher than the lowest timer resolution accross all
// Use a delay that is higher than the lowest timer resolution across all
// supported platforms, so that the two timers don't fire at the same time.
clients[1].setTimeout(50);
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-check-server-identity.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ const tests = [
error: 'Host: a.b.a.com. is not in the cert\'s altnames: ' +
'DNS:*b.a.com'
},
// Mutliple DNS names
// Multiple DNS names
{
host: 'a.b.a.com', cert: {
subjectaltname: 'DNS:*b.a.com, DNS:a.b.a.com',
Expand Down