summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2015-06-12 10:54:37 +0300
committerJames M Snell <jasnell@gmail.com>2015-08-03 20:44:40 -0700
commit5ccb429ee8556ac0cbc81dddc2d5a2a4f5d75b58 (patch)
tree12ad48745f874938ce393059da486ba11354ceff
parent16f547600a81552b7c9515cda8f2b1f38f98dad5 (diff)
downloadnode-5ccb429ee8556ac0cbc81dddc2d5a2a4f5d75b58.tar.gz
doc, comments: Grammar and spelling fixes
Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: https://github.com/joyent/node/pull/25591
-rw-r--r--doc/api/buffer.markdown2
-rw-r--r--doc/api/cluster.markdown2
-rw-r--r--doc/api/crypto.markdown2
-rw-r--r--doc/api/dns.markdown4
-rw-r--r--doc/api/net.markdown14
-rw-r--r--lib/_http_client.js4
-rw-r--r--lib/url.js4
-rw-r--r--src/node.cc2
-rw-r--r--src/node_object_wrap.h2
9 files changed, 18 insertions, 18 deletions
diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index 2bdbb0d40..0b90be68d 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -43,7 +43,7 @@ Creating a typed array from a `Buffer` works with the following caveats:
2. The buffer's memory is interpreted as an array, not a byte array. That is,
`new Uint32Array(new Buffer([1,2,3,4]))` creates a 4-element `Uint32Array`
- with elements `[1,2,3,4]`, not an `Uint32Array` with a single element
+ with elements `[1,2,3,4]`, not a `Uint32Array` with a single element
`[0x1020304]` or `[0x4030201]`.
NOTE: Node.js v0.8 simply retained a reference to the buffer in `array.buffer`
diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown
index f65e11c35..129ebf2ab 100644
--- a/doc/api/cluster.markdown
+++ b/doc/api/cluster.markdown
@@ -599,7 +599,7 @@ It is not emitted in the worker.
### Event: 'disconnect'
-Similar to the `cluster.on('disconnect')` event, but specfic to this worker.
+Similar to the `cluster.on('disconnect')` event, but specific to this worker.
cluster.fork().on('disconnect', function() {
// Worker has disconnected
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 25c2f7521..73d9255ea 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -529,7 +529,7 @@ Example (obtaining a shared secret):
## crypto.createECDH(curve_name)
-Creates a Elliptic Curve (EC) Diffie-Hellman key exchange object using a
+Creates an Elliptic Curve (EC) Diffie-Hellman key exchange object using a
predefined curve specified by `curve_name` string.
## Class: ECDH
diff --git a/doc/api/dns.markdown b/doc/api/dns.markdown
index fe42c0f68..e866f01ee 100644
--- a/doc/api/dns.markdown
+++ b/doc/api/dns.markdown
@@ -81,7 +81,7 @@ See [supported `getaddrinfo` flags](#dns_supported_getaddrinfo_flags) below for
more information on supported flags.
The callback has arguments `(err, address, family)`. The `address` argument
-is a string representation of a IP v4 or v6 address. The `family` argument
+is a string representation of an IP v4 or v6 address. The `family` argument
is either the integer 4 or 6 and denotes the family of `address` (not
necessarily the value initially passed to `lookup`).
@@ -155,7 +155,7 @@ attribute (e.g. `[{'priority': 10, 'exchange': 'mx.example.com'},...]`).
## dns.resolveTxt(hostname, callback)
The same as `dns.resolve()`, but only for text queries (`TXT` records).
-`addresses` is an 2-d array of the text records available for `hostname` (e.g.,
+`addresses` is a 2-d array of the text records available for `hostname` (e.g.,
`[ ['v=spf1 ip4:0.0.0.0 ', '~all' ] ]`). Each sub-array contains TXT chunks of
one record. Depending on the use case, the could be either joined together or
treated separately.
diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index f1fdf99d0..d00721b21 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -90,7 +90,7 @@ Common options are:
a FIN packet when the other end of the socket sends a FIN packet.
Defaults to `false`. See ['end'][] event for more information.
-The `connectListener` parameter will be added as an listener for the
+The `connectListener` parameter will be added as a listener for the
['connect'][] event.
Here is an example of a client of echo server as described previously:
@@ -119,7 +119,7 @@ changed to
Creates a TCP connection to `port` on `host`. If `host` is omitted,
`'localhost'` will be assumed.
-The `connectListener` parameter will be added as an listener for the
+The `connectListener` parameter will be added as a listener for the
['connect'][] event.
Is a factory method which returns a new ['net.Socket'](#net_class_net_socket).
@@ -128,7 +128,7 @@ Is a factory method which returns a new ['net.Socket'](#net_class_net_socket).
## net.createConnection(path[, connectListener])
Creates unix socket connection to `path`.
-The `connectListener` parameter will be added as an listener for the
+The `connectListener` parameter will be added as a listener for the
['connect'][] event.
A factory method which returns a new ['net.Socket'](#net_class_net_socket).
@@ -150,7 +150,7 @@ parameter is 511 (not 512).
This function is asynchronous. When the server has been bound,
['listening'][] event will be emitted. The last parameter `callback`
-will be added as an listener for the ['listening'][] event.
+will be added as a listener for the ['listening'][] event.
One issue some users run into is getting `EADDRINUSE` errors. This means that
another server is already running on the requested port. One way of handling this
@@ -178,7 +178,7 @@ Start a local socket server listening for connections on the given `path`.
This function is asynchronous. When the server has been bound,
['listening'][] event will be emitted. The last parameter `callback`
-will be added as an listener for the ['listening'][] event.
+will be added as a listener for the ['listening'][] event.
On UNIX, the local domain is usually known as the UNIX domain. The path is a
filesystem path name. It is subject to the same naming conventions and
@@ -212,7 +212,7 @@ Listening on a file descriptor is not supported on Windows.
This function is asynchronous. When the server has been bound,
['listening'][] event will be emitted.
-the last parameter `callback` will be added as an listener for the
+the last parameter `callback` will be added as a listener for the
['listening'][] event.
### server.listen(options[, callback])
@@ -374,7 +374,7 @@ This function is asynchronous. When the ['connect'][] event is emitted the
socket is established. If there is a problem connecting, the `'connect'` event
will not be emitted, the `'error'` event will be emitted with the exception.
-The `connectListener` parameter will be added as an listener for the
+The `connectListener` parameter will be added as a listener for the
['connect'][] event.
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 538586e54..ae8e4f4e6 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -371,7 +371,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
var req = socket._httpMessage;
- // propogate "domain" setting...
+ // propagate "domain" setting...
if (req.domain && !res.domain) {
debug('setting "res.domain"');
res.domain = req.domain;
@@ -474,7 +474,7 @@ function tickOnSocket(req, socket) {
socket.parser = parser;
socket._httpMessage = req;
- // Setup "drain" propogation.
+ // Setup "drain" propagation.
httpSocketSetup(socket);
// Propagate headers limit from request object to parser
diff --git a/lib/url.js b/lib/url.js
index ac712318b..4b9ab82f9 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -600,7 +600,7 @@ Url.prototype.resolveObject = function(relative) {
if (psychotic) {
result.hostname = result.host = srcPath.shift();
//occationaly the auth can get stuck only in host
- //this especialy happens in cases like
+ //this especially happens in cases like
//url.resolveObject('mailto:local1@domain1', 'local2@domain2')
var authInHost = result.host && result.host.indexOf('@') > 0 ?
result.host.split('@') : false;
@@ -682,7 +682,7 @@ Url.prototype.resolveObject = function(relative) {
result.hostname = result.host = isAbsolute ? '' :
srcPath.length ? srcPath.shift() : '';
//occationaly the auth can get stuck only in host
- //this especialy happens in cases like
+ //this especially happens in cases like
//url.resolveObject('mailto:local1@domain1', 'local2@domain2')
var authInHost = result.host && result.host.indexOf('@') > 0 ?
result.host.split('@') : false;
diff --git a/src/node.cc b/src/node.cc
index e669706f1..1ad02e993 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2070,7 +2070,7 @@ static void OnFatalError(const char* location, const char* message) {
NO_RETURN void FatalError(const char* location, const char* message) {
OnFatalError(location, message);
- // to supress compiler warning
+ // to suppress compiler warning
abort();
}
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
index b604e6709..ad6c73e4e 100644
--- a/src/node_object_wrap.h
+++ b/src/node_object_wrap.h
@@ -101,7 +101,7 @@ class ObjectWrap {
* attached to detached state it will be freed. Be careful not to access
* the object after making this call as it might be gone!
* (A "weak reference" means an object that only has a
- * persistant handle.)
+ * persistent handle.)
*
* DO NOT CALL THIS FROM DESTRUCTOR
*/