Skip to content

Commit

Permalink
node: additional cleanup for node rename
Browse files Browse the repository at this point in the history
Fixes: #2361
PR-URL: #2367
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rod Vagg <[email protected]>
  • Loading branch information
cjihrig committed Aug 23, 2015
1 parent 4f50d3f commit 3b60252
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion doc/api/synopsis.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--type=misc-->

An example of a [web server](http.html) written with node.js which responds with
An example of a [web server](http.html) written with Node.js which responds with
'Hello World':

var http = require('http');
Expand Down
2 changes: 1 addition & 1 deletion doc/api/timers.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To schedule execution of a one-time `callback` after `delay` milliseconds. Retur
also pass arguments to the callback.

It is important to note that your callback will probably not be called in exactly
`delay` milliseconds - node.js makes no guarantees about the exact timing of when
`delay` milliseconds - Node.js makes no guarantees about the exact timing of when
the callback will fire, nor of the ordering things will fire in. The callback will
be called as close as possible to the time specified.

Expand Down
2 changes: 1 addition & 1 deletion doc/api/tls.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ dictionary with keys:
instead of the client preferences. For further details see `tls` module
documentation.

If no 'ca' details are given, then node.js will use the default
If no 'ca' details are given, then Node.js will use the default
publicly trusted list of CAs as given in
<http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.

Expand Down
6 changes: 3 additions & 3 deletions doc/api/tty.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
The `tty` module houses the `tty.ReadStream` and `tty.WriteStream` classes. In
most cases, you will not need to use this module directly.

When node.js detects that it is being run inside a TTY context, then `process.stdin`
When Node.js detects that it is being run inside a TTY context, then `process.stdin`
will be a `tty.ReadStream` instance and `process.stdout` will be
a `tty.WriteStream` instance. The preferred way to check if node.js is being run
a `tty.WriteStream` instance. The preferred way to check if Node.js is being run
in a TTY context is to check `process.stdout.isTTY`:

$ node -p -e "Boolean(process.stdout.isTTY)"
Expand All @@ -32,7 +32,7 @@ Deprecated. Use `tty.ReadStream#setRawMode()`

A `net.Socket` subclass that represents the readable portion of a tty. In normal
circumstances, `process.stdin` will be the only `tty.ReadStream` instance in any
node.js program (only when `isatty(0)` is true).
Node.js program (only when `isatty(0)` is true).

### rs.isRaw

Expand Down
2 changes: 1 addition & 1 deletion doc/node.1
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ If set to 1 then colors will not be used in the REPL.

.SH RESOURCES AND DOCUMENTATION

See the website for documentation http://nodejs.org/
See the website for documentation https://nodejs.org/

Mailing list: http://groups.google.com/group/nodejs

Expand Down
6 changes: 3 additions & 3 deletions doc/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ There are three relevant Jenkins jobs that should be used for a release flow:

**a.** **Test runs:** **[iojs+any-pr+multi](https://jenkins-iojs.nodesource.com/job/iojs+any-pr+multi/)** is used for a final full-test run to ensure that the current *HEAD* is stable.

**b.** **Nightly builds:** (optional) **[iojs+release](https://jenkins-iojs.nodesource.com/job/iojs+release/)** can be used to create a nightly release for the current *HEAD* if public test releases are required. Builds triggered with this job are published straight to <http://nodejs.org/download/nightly/> and are available for public download.
**b.** **Nightly builds:** (optional) **[iojs+release](https://jenkins-iojs.nodesource.com/job/iojs+release/)** can be used to create a nightly release for the current *HEAD* if public test releases are required. Builds triggered with this job are published straight to <https://nodejs.org/download/nightly/> and are available for public download.

**c.** **Release builds:** **[iojs+release](https://jenkins-iojs.nodesource.com/job/iojs+release/)** does all of the work to build all required release assets. Promotion of the release files is a manual step once they are ready (see below).

The [Node.js build team](https://github.com/nodejs/build) is able to provide this access to individuals authorized by the TC.

### 2. <nodejs.org> Access

The _dist_ user on nodejs.org controls the assets available in <http://nodejs.org/download/> (note that <http://nodejs.org/dist/> is an alias for <https://nodejs.org/download/release/>).
The _dist_ user on nodejs.org controls the assets available in <https://nodejs.org/download/> (note that <https://nodejs.org/dist/> is an alias for <https://nodejs.org/download/release/>).

The Jenkins release build slaves upload their artifacts to the web server as the _staging_ user, the _dist_ user has access to move these assets to public access (the _staging_ user does not, for security purposes).

Expand Down Expand Up @@ -56,7 +56,7 @@ Run a **[iojs+any-pr+multi](https://jenkins-iojs.nodesource.com/job/iojs+any-pr+

### 2. Produce a Nightly Build _(optional)_

If there is a reason to produce a test release for the purpose of having others try out installers or specifics of builds, produce a nightly build using **[iojs+release](https://jenkins-iojs.nodesource.com/job/iojs+release/)** and wait for it to drop in <http://nodejs.org/download/nightly/>. Follow the directions and enter a proper length commit sha, a date string and select "nightly" for "disttype".
If there is a reason to produce a test release for the purpose of having others try out installers or specifics of builds, produce a nightly build using **[iojs+release](https://jenkins-iojs.nodesource.com/job/iojs+release/)** and wait for it to drop in <https://nodejs.org/download/nightly/>. Follow the directions and enter a proper length commit sha, a date string and select "nightly" for "disttype".

This is particularly recommended if there has been recent work relating to the OS X or Windows installers as they are not tested in any way by CI.

Expand Down
2 changes: 1 addition & 1 deletion tools/rpm/node.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Release: 1
Summary: Node.js is a platform for building fast, scalable network applications.
Group: Development/Languages
License: MIT
URL: http://nodejs.org/
URL: https://nodejs.org/
Source0: http://nodejs.org/dist/v%{_version}/node-v%{_version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
Expand Down
4 changes: 2 additions & 2 deletions tools/v8-prof/linux-tick-processor
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ cat "$tools_path/polyfill.js" "$v8_tools/splaytree.js" "$v8_tools/codemap.js" \

NODE=${NODE:-node}

if [ ! -x "$NODE" ] && [ -x "$(dirname "$0")/../../iojs" ]; then
NODE="$(dirname "$0")/../../iojs"
if [ ! -x "$NODE" ] && [ -x "$(dirname "$0")/../../node" ]; then
NODE="$(dirname "$0")/../../node"
fi

"$NODE" "$TEMP_SCRIPT_FILE" $@
Expand Down
2 changes: 1 addition & 1 deletion tools/v8-prof/windows-tick-processor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SET temp_script=%TEMP%\node-tick-processor-input-script

IF NOT DEFINED NODE (SET NODE=node.exe)
%NODE% --version 2> NUL
if %ERRORLEVEL%==9009 (SET NODE=%~dp0\..\..\Release\iojs.exe)
if %ERRORLEVEL%==9009 (SET NODE=%~dp0\..\..\Release\node.exe)


type %tools_dir%polyfill.js %v8_tools%splaytree.js %v8_tools%codemap.js^
Expand Down

0 comments on commit 3b60252

Please sign in to comment.