From 3b602527d12475c7398cbfe19531cf6748010c60 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sun, 23 Aug 2015 16:40:28 -0400 Subject: [PATCH] node: additional cleanup for node rename Fixes: https://github.com/nodejs/node/issues/2361 PR-URL: https://github.com/nodejs/node/pull/2367 Reviewed-By: James M Snell Reviewed-By: Rod Vagg --- doc/api/synopsis.markdown | 2 +- doc/api/timers.markdown | 2 +- doc/api/tls.markdown | 2 +- doc/api/tty.markdown | 6 +++--- doc/node.1 | 2 +- doc/releases.md | 6 +++--- tools/rpm/node.spec | 2 +- tools/v8-prof/linux-tick-processor | 4 ++-- tools/v8-prof/windows-tick-processor.bat | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/api/synopsis.markdown b/doc/api/synopsis.markdown index 352b543cd23446..a69273f78de8ac 100644 --- a/doc/api/synopsis.markdown +++ b/doc/api/synopsis.markdown @@ -2,7 +2,7 @@ -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'); diff --git a/doc/api/timers.markdown b/doc/api/timers.markdown index 9a6978204a5010..fd788cd58d61af 100644 --- a/doc/api/timers.markdown +++ b/doc/api/timers.markdown @@ -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. diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown index 0ebfe4bf54ccf7..e610151eb04529 100644 --- a/doc/api/tls.markdown +++ b/doc/api/tls.markdown @@ -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 . diff --git a/doc/api/tty.markdown b/doc/api/tty.markdown index 9158f6706f2f09..928d814d985551 100644 --- a/doc/api/tty.markdown +++ b/doc/api/tty.markdown @@ -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)" @@ -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 diff --git a/doc/node.1 b/doc/node.1 index b7513f2a05fc11..f135a83dfa789d 100644 --- a/doc/node.1 +++ b/doc/node.1 @@ -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 diff --git a/doc/releases.md b/doc/releases.md index 040b5b42cdb1ec..40f738eecaf70a 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -13,7 +13,7 @@ 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 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 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). @@ -21,7 +21,7 @@ The [Node.js build team](https://github.com/nodejs/build) is able to provide thi ### 2. Access -The _dist_ user on nodejs.org controls the assets available in (note that is an alias for ). +The _dist_ user on nodejs.org controls the assets available in (note that is an alias for ). 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). @@ -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 . 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 . 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. diff --git a/tools/rpm/node.spec b/tools/rpm/node.spec index d4b1faaad5bcec..39b98ec5541c53 100644 --- a/tools/rpm/node.spec +++ b/tools/rpm/node.spec @@ -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++ diff --git a/tools/v8-prof/linux-tick-processor b/tools/v8-prof/linux-tick-processor index 858405c947fe5e..ba72b3a2b3ba21 100755 --- a/tools/v8-prof/linux-tick-processor +++ b/tools/v8-prof/linux-tick-processor @@ -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" $@ diff --git a/tools/v8-prof/windows-tick-processor.bat b/tools/v8-prof/windows-tick-processor.bat index 83e6dde6b76b05..8b5d791efd9a09 100755 --- a/tools/v8-prof/windows-tick-processor.bat +++ b/tools/v8-prof/windows-tick-processor.bat @@ -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^