From 673a9b1dc16fe687d2903f9b64cf1017d44d0856 Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Tue, 2 Dec 2014 17:11:55 -0800 Subject: [PATCH] docs: replace all instances of node.js with io.js because trademark. --- CONTRIBUTING.md | 12 +++---- ChangeLog | 6 ++-- LICENSE | 6 ++-- README.md | 6 ++-- benchmark/README.md | 4 +-- configure | 4 +-- deps/mdb_v8/mdb_v8.c | 2 +- deps/mdb_v8/mdb_v8_cfg.c | 6 ++-- deps/npm/LICENSE | 4 +-- deps/npm/README.md | 6 ++-- deps/npm/doc/cli/npm.md | 2 +- deps/npm/doc/misc/npm-config.md | 2 +- deps/npm/doc/misc/npm-faq.md | 4 +-- deps/npm/html/doc/README.html | 6 ++-- deps/npm/html/doc/cli/npm.html | 2 +- deps/npm/html/doc/misc/npm-config.html | 2 +- deps/npm/html/doc/misc/npm-faq.html | 4 +-- deps/npm/html/index.html | 2 +- deps/npm/html/partial/doc/README.html | 6 ++-- deps/npm/html/partial/doc/cli/npm.html | 2 +- .../npm/html/partial/doc/misc/npm-config.html | 2 +- deps/npm/html/partial/doc/misc/npm-faq.html | 4 +-- deps/npm/node_modules/ansi/README.md | 4 +-- deps/npm/node_modules/ansi/package.json | 2 +- .../dezalgo/node_modules/asap/asap.js | 4 +-- .../dezalgo/node_modules/asap/package.json | 2 +- deps/npm/node_modules/inherits/README.md | 10 +++--- .../node_modules/inherits/inherits_browser.js | 2 +- deps/npm/node_modules/inherits/package.json | 4 +-- deps/npm/node_modules/mkdirp/README.markdown | 2 +- deps/npm/node_modules/node-gyp/README.md | 6 ++-- deps/npm/node_modules/node-gyp/package.json | 2 +- deps/npm/node_modules/opener/README.md | 2 +- .../node_modules/string_decoder/README.md | 2 +- .../node_modules/readable-stream/package.json | 2 +- deps/npm/node_modules/request/CHANGELOG.md | 8 ++--- .../request/disabled.appveyor.yml | 4 +-- .../request/node_modules/bl/README.md | 2 +- .../form-data/node_modules/async/README.md | 10 +++--- .../form-data/node_modules/async/lib/async.js | 2 +- .../form-data/node_modules/mime/README.md | 2 +- .../form-data/node_modules/mime/mime.js | 2 +- .../form-data/node_modules/mime/package.json | 2 +- .../request/node_modules/hawk/README.md | 2 +- .../hawk/node_modules/hoek/README.md | 4 +-- .../node_modules/http-signature/README.md | 2 +- .../node_modules/assert-plus/README.md | 2 +- .../node_modules/http-signature/package.json | 2 +- .../node_modules/mime-types/.npmignore | 2 +- .../request/node_modules/mime-types/README.md | 2 +- .../node_modules/mime-types/SOURCES.md | 2 +- .../node_modules/mime-types/component.json | 2 +- .../node_modules/mime-types/lib/index.js | 2 +- .../request/node_modules/node-uuid/README.md | 14 ++++---- .../node-uuid/benchmark/README.md | 2 +- .../node-uuid/benchmark/benchmark.js | 2 +- .../node_modules/node-uuid/package.json | 2 +- .../node_modules/node-uuid/test/test.js | 2 +- .../request/node_modules/node-uuid/uuid.js | 4 +-- .../node_modules/tough-cookie/README.md | 4 +-- .../node_modules/punycode/README.md | 6 ++-- .../node_modules/punycode/punycode.js | 2 +- .../node_modules/tough-cookie/package.json | 4 +-- .../node_modules/string_decoder/README.md | 2 +- .../node_modules/readable-stream/package.json | 2 +- deps/npm/node_modules/tar/README.md | 2 +- deps/npm/test/tap/search.js | 2 +- deps/uv/ChangeLog | 8 ++--- deps/uv/README.md | 4 +-- deps/uv/docs/src/index.rst | 4 +-- deps/v8/ChangeLog | 2 +- deps/v8/test/mjsunit/asm/embenchen/box2d.js | 4 +-- deps/v8/test/mjsunit/asm/embenchen/copy.js | 4 +-- .../test/mjsunit/asm/embenchen/corrections.js | 4 +-- .../v8/test/mjsunit/asm/embenchen/fannkuch.js | 4 +-- deps/v8/test/mjsunit/asm/embenchen/fasta.js | 4 +-- .../mjsunit/asm/embenchen/lua_binarytrees.js | 4 +-- deps/v8/test/mjsunit/asm/embenchen/memops.js | 4 +-- deps/v8/test/mjsunit/asm/embenchen/primes.js | 4 +-- deps/v8/test/mjsunit/asm/embenchen/zlib.js | 4 +-- doc/api/buffer.markdown | 6 ++-- doc/api/child_process.markdown | 4 +-- doc/api/cluster.markdown | 4 +-- doc/api/crypto.markdown | 2 +- doc/api/documentation.markdown | 4 +-- doc/api/http.markdown | 2 +- doc/api/process.markdown | 10 +++--- doc/api/punycode.markdown | 4 +-- doc/api/readline.markdown | 2 +- doc/api/timers.markdown | 2 +- doc/api/tls.markdown | 10 +++--- doc/api/tracing.markdown | 6 ++-- doc/changelog-foot.html | 4 +-- doc/changelog-head.html | 6 ++-- doc/node.1 | 4 +-- doc/template.html | 10 +++--- lib/_debugger.js | 6 ++-- lib/_http_outgoing.js | 2 +- lib/_tls_legacy.js | 2 +- lib/cluster.js | 2 +- lib/crypto.js | 2 +- lib/punycode.js | 2 +- lib/tls.js | 2 +- lib/tracing.js | 2 +- node.gyp | 2 +- src/node.cc | 10 +++--- src/node.js | 4 +-- src/node_crypto_bio.cc | 2 +- src/node_provider.d | 2 +- src/node_version.h | 2 +- src/res/node.rc | 4 +-- src/res/node_perfctr_provider.man | 4 +-- src/v8ustack.d | 4 +-- test/debugger/test-debugger-client.js | 2 +- test/debugger/test-debugger-repl.js | 2 +- test/disabled/test-http-tls.js | 8 ++--- test/disabled/test-net-tls-pummel.js | 4 +-- test/disabled/test-net-tls.js | 8 ++--- test/fixtures/keys/agent1.cnf | 2 +- test/fixtures/keys/agent2.cnf | 2 +- test/fixtures/keys/agent3.cnf | 2 +- test/fixtures/keys/agent4.cnf | 2 +- test/fixtures/keys/ca1.cnf | 2 +- test/fixtures/keys/ca2-database.txt | 2 +- test/fixtures/keys/ca2.cnf | 2 +- test/fixtures/keys/ec.cnf | 2 +- test/message/error_exit.out | 4 +-- test/message/eval_messages.out | 24 ++++++------- test/message/nexttick_throw.out | 6 ++-- test/message/stdin_messages.out | 24 ++++++------- .../undefined_reference_in_new_context.out | 2 +- test/message/vm_display_runtime_error.out | 4 +-- test/message/vm_display_syntax_error.out | 4 +-- .../message/vm_dont_display_runtime_error.out | 4 +-- test/message/vm_dont_display_syntax_error.out | 4 +-- test/simple/test-buffer-ascii.js | 2 +- test/simple/test-buffer.js | 2 +- test/simple/test-child-process-fork.js | 2 +- test/simple/test-crypto-authenticated.js | 6 ++-- test/simple/test-crypto-binary-default.js | 2 +- test/simple/test-crypto.js | 2 +- test/simple/test-http-multi-line-headers.js | 2 +- test/simple/test-http-server-multiheaders2.js | 2 +- test/simple/test-readline-interface.js | 2 +- test/simple/test-zlib-dictionary.js | 2 +- tools/doc/package.json | 2 +- tools/genv8constants.py | 2 +- tools/icu/README.md | 2 +- tools/icu/icu_small.json | 2 +- tools/icu/iculslocs.cc | 4 +-- tools/msvs/genfiles/node_perfctr_provider.rc | 6 ++-- tools/msvs/msi/product.wxs | 34 +++++++++---------- tools/msvs/nodevars.bat | 8 ++--- tools/pkgsrc/description | 2 +- tools/rpm/node.spec | 12 +++---- vcbuild.bat | 6 ++-- 156 files changed, 325 insertions(+), 325 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c3a86b00f30f3..48bf18e47054a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # CONTRIBUTING -The node.js project welcomes new contributors. This document will guide you +The io.js project welcomes new contributors. This document will guide you through the process. @@ -19,7 +19,7 @@ Now decide if you want your feature or bug fix to go into the master branch or the stable branch. As a rule of thumb, bug fixes go into the stable branch while new features go into the master branch. -The stable branch is effectively frozen; patches that change the node.js +The stable branch is effectively frozen; patches that change the io.js API/ABI or affect the run-time behavior of applications get rejected. The rules for the master branch are less strict; consult the @@ -29,13 +29,13 @@ In a nutshell, modules are at varying levels of API stability. Bug fixes are always welcome but API or behavioral changes to modules at stability level 3 and up are off-limits. -Node.js has several bundled dependencies in the deps/ and the tools/ +io.js has several bundled dependencies in the deps/ and the tools/ directories that are not part of the project proper. Any changes to files in those directories or its subdirectories should be sent to their respective projects. Do not send your patch to us, we cannot accept it. In case of doubt, open an issue in the [issue tracker][], post your question -to the [node.js mailing list][] or contact one of the [project maintainers][] +to the [io.js mailing list][] or contact one of the [project maintainers][] on [IRC][]. Especially do so if you plan to work on something big. Nothing is more @@ -149,6 +149,6 @@ not send out notifications when you add commits. [stability index page]: https://github.com/joyent/node/blob/master/doc/api/documentation.markdown [issue tracker]: https://github.com/joyent/node/issues -[node.js mailing list]: http://groups.google.com/group/nodejs -[IRC]: http://webchat.freenode.net/?channels=node.js +[io.js mailing list]: http://groups.google.com/group/nodejs +[IRC]: http://webchat.freenode.net/?channels=io.js [project maintainers]: https://github.com/joyent/node/wiki/Project-Organization diff --git a/ChangeLog b/ChangeLog index ef860651fc8f91..6e185641ffae82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2565,7 +2565,7 @@ * slab_allocator: fix leak of Persistent handles (Shigeki Ohtsu) -* windows/msi: add node.js prompt to startmenu (Jeroen Janssen) +* windows/msi: add io.js prompt to startmenu (Jeroen Janssen) * windows/msi: fix adding node to PATH (Jeroen Janssen) @@ -4720,7 +4720,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs) * Better logic for testing if an argument is a port -* Improve error reporting (single line "node.js:176:9" errors) +* Improve error reporting (single line "io.js:176:9" errors) * Bugfix: Some http responses being truncated (appeared in 0.1.94) @@ -5437,7 +5437,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs) 2009.08.21, Version 0.1.5, b0fd3e281cb5f7cd8d3a26bd2b89e1b59998e5ed - * Bugfix: Buggy connections could crash node.js. Now check + * Bugfix: Buggy connections could crash io.js. Now check connection before sending data every time (Kevin van Zonneveld) * Bugfix: stdin fd (0) being ignored by node.File. (Abe Fettig) diff --git a/LICENSE b/LICENSE index 75027399dfb1b1..a73448f810328b 100644 --- a/LICENSE +++ b/LICENSE @@ -539,8 +539,8 @@ maintained libraries. The externally maintained libraries used by Node are: -------- - "Node.js" and "node" trademark Joyent, Inc. npm is not officially - part of the Node.js project, and is neither owned by nor + "io.js" and "node" trademark Joyent, Inc. npm is not officially + part of the io.js project, and is neither owned by nor officially affiliated with Joyent, Inc. Packages published in the npm registry (other than the Software and @@ -584,7 +584,7 @@ maintained libraries. The externally maintained libraries used by Node are: THE SOFTWARE. """ -- test/gc/node_modules/weak. Node-weak is a node.js addon that provides garbage +- test/gc/node_modules/weak. Node-weak is a io.js addon that provides garbage collector notifications. Node-weak's license follows: """ Copyright (c) 2011, Ben Noordhuis diff --git a/README.md b/README.md index b157ddd3f2acc9..5e22fefc1a64e4 100644 --- a/README.md +++ b/README.md @@ -117,12 +117,12 @@ Resources for Newcomers --- - [The Wiki](https://github.com/joyent/node/wiki) - [nodejs.org](http://nodejs.org/) - - [how to install node.js and npm (node package manager)](http://www.joyent.com/blog/installing-node-and-npm/) + - [how to install io.js and npm (node package manager)](http://www.joyent.com/blog/installing-node-and-npm/) - [list of modules](https://github.com/joyent/node/wiki/modules) - [searching the npm registry](http://npmjs.org/) - [list of companies and projects using node](https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node) - - [node.js mailing list](http://groups.google.com/group/nodejs) - - irc chatroom, [#node.js on freenode.net](http://webchat.freenode.net?channels=node.js&uio=d4) + - [io.js mailing list](http://groups.google.com/group/nodejs) + - irc chatroom, [#io.js on freenode.net](http://webchat.freenode.net?channels=io.js&uio=d4) - [community](https://github.com/joyent/node/wiki/Community) - [contributing](https://github.com/joyent/node/wiki/Contributing) - [big list of all the helpful wiki pages](https://github.com/joyent/node/wiki/_pages) diff --git a/benchmark/README.md b/benchmark/README.md index 695f0eac7fab78..be1af5b513736e 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -1,7 +1,7 @@ -# Node.js core benchmark tests +# io.js core benchmark tests This folder contains benchmark tests to measure the performance for certain -Node.js APIs. +io.js APIs. ## How to run tests diff --git a/configure b/configure index b9e5473816cadc..ce621b2f3f12ad 100755 --- a/configure +++ b/configure @@ -326,7 +326,7 @@ def cc_macros(): stdout=subprocess.PIPE, stderr=subprocess.PIPE) except OSError: - print '''Node.js configure error: No acceptable C compiler found! + print '''io.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed @@ -391,7 +391,7 @@ def is_arm_hard_float_abi(): not '__VFP_FP__' in cc_macros()): return False else: - print '''Node.js configure error: Your version of GCC does not report + print '''io.js configure error: Your version of GCC does not report the Floating-Point ABI to compile for your hardware Please manually specify which floating-point ABI to use with the diff --git a/deps/mdb_v8/mdb_v8.c b/deps/mdb_v8/mdb_v8.c index 5653431b8c377f..d5a4eb6332f8ec 100644 --- a/deps/mdb_v8/mdb_v8.c +++ b/deps/mdb_v8/mdb_v8.c @@ -1651,7 +1651,7 @@ jsstr_print_external(uintptr_t addr, uint_t flags, char **bufp, size_t *lenp) } if (flags & JSSTR_VERBOSE) - mdb_printf("assuming Node.js string\n"); + mdb_printf("assuming io.js string\n"); if (read_heap_ptr(&ptr1, addr, V8_OFF_EXTERNALSTRING_RESOURCE) != 0) { (void) bsnprintf(bufp, lenp, diff --git a/deps/mdb_v8/mdb_v8_cfg.c b/deps/mdb_v8/mdb_v8_cfg.c index 219b84f4fd9afe..4fff9c87583313 100644 --- a/deps/mdb_v8/mdb_v8_cfg.c +++ b/deps/mdb_v8/mdb_v8_cfg.c @@ -23,7 +23,7 @@ * mdb_v8_cfg.c: canned configurations for previous V8 versions. * * The functions and data defined here enable this dmod to support debugging - * Node.js binaries that predated V8's built-in postmortem debugging support. + * io.js binaries that predated V8's built-in postmortem debugging support. */ #include "v8cfg.h" @@ -96,7 +96,7 @@ v8cfg_canned_readsym(v8_cfg_t *cfgp, const char *name, intptr_t *valp) } /* - * Canned configuration for the V8 bundled with Node.js v0.4.8 and later. + * Canned configuration for the V8 bundled with io.js v0.4.8 and later. */ static v8_cfg_symbol_t v8_symbols_node_04[] = { { "v8dbg_type_AccessCheckInfo__ACCESS_CHECK_INFO_TYPE", 0x91 }, @@ -389,7 +389,7 @@ static v8_cfg_symbol_t v8_symbols_node_04[] = { }; /* - * Canned configuration for the V8 bundled with Node.js v0.6.5. + * Canned configuration for the V8 bundled with io.js v0.6.5. */ static v8_cfg_symbol_t v8_symbols_node_06[] = { { "v8dbg_type_AccessCheckInfo__ACCESS_CHECK_INFO_TYPE", 0x93 }, diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index b6e3548d19ccc9..ddef4329f3996a 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -221,13 +221,13 @@ The following additional terms shall apply to use of the npm software, the npm website, the npm repository and any other services or products offered by npm, Inc.: -"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js +"io.js" trademark Joyent, Inc. npm is not officially part of the io.js project, and is neither owned by nor affiliated with Joyent, Inc. "npm" and "The npm Registry" are owned by npm, Inc. All rights reserved. Modules published on the npm registry are not officially endorsed by npm, Inc. -or the Node.js project. +or the io.js project. Data published to the npm registry is not part of npm itself, and is the sole property of the publisher. While every effort is made to ensure accountability, diff --git a/deps/npm/README.md b/deps/npm/README.md index ecb3f29e291bc9..3c4f289db2dfda 100644 --- a/deps/npm/README.md +++ b/deps/npm/README.md @@ -186,10 +186,10 @@ you should [read this](https://www.npmjs.org/doc/developers.html) "npm" and "The npm Registry" are owned by npm, Inc. All rights reserved. See the included LICENSE file for more details. -"Node.js" and "node" are trademarks owned by Joyent, Inc. +"io.js" and "node" are trademarks owned by Joyent, Inc. Modules published on the npm registry are not officially endorsed by -npm, Inc. or the Node.js project. +npm, Inc. or the io.js project. Data published to the npm registry is not part of npm itself, and is the sole property of the publisher. While every effort is made to @@ -234,7 +234,7 @@ When you find issues, please report them: Be sure to include *all* of the output from the npm command that didn't work as expected. The `npm-debug.log` file is also helpful to provide. -You can also look for isaacs in #node.js on irc://irc.freenode.net. He +You can also look for isaacs in #io.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email. ## SEE ALSO diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index ad16d419e8b8a8..3710f21f5ad560 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -145,7 +145,7 @@ When you find issues, please report them: Be sure to include *all* of the output from the npm command that didn't work as expected. The `npm-debug.log` file is also helpful to provide. -You can also look for isaacs in #node.js on irc://irc.freenode.net. He +You can also look for isaacs in #io.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email. ## AUTHOR diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 6e7d995dd8e5d9..3df6d9f8ae85fe 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -261,7 +261,7 @@ The command to run for `npm edit` or `npm config edit`. If set to true, then npm will stubbornly refuse to install (or even consider installing) any package that claims to not be compatible with -the current Node.js version. +the current io.js version. ### force diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md index 72891271f95be9..330179ee9577d8 100644 --- a/deps/npm/doc/misc/npm-faq.md +++ b/deps/npm/doc/misc/npm-faq.md @@ -178,7 +178,7 @@ an argument to `git checkout`. The default is `master`. ## What is a `module`? -A module is anything that can be loaded with `require()` in a Node.js +A module is anything that can be loaded with `require()` in a io.js program. The following things are all examples of things that can be loaded as modules: @@ -207,7 +207,7 @@ we might say that "The variable `req` refers to the `request` module". The `package.json` file defines the package. (See "What is a package?" above.) -The `node_modules` folder is the place Node.js looks for modules. +The `node_modules` folder is the place io.js looks for modules. (See "What is a module?" above.) For example, if you create a file at `node_modules/foo.js` and then diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 96bc06401a00c8..1feaf60946b553 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -130,9 +130,9 @@

More Docs

"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved. See the included LICENSE file for more details.

-

"Node.js" and "node" are trademarks owned by Joyent, Inc.

+

"io.js" and "node" are trademarks owned by Joyent, Inc.

Modules published on the npm registry are not officially endorsed by -npm, Inc. or the Node.js project.

+npm, Inc. or the io.js project.

Data published to the npm registry is not part of npm itself, and is the sole property of the publisher. While every effort is made to ensure accountability, there is absolutely no guarantee, warrantee, or @@ -165,7 +165,7 @@

BUGS

Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

-

You can also look for isaacs in #node.js on irc://irc.freenode.net. He +

You can also look for isaacs in #io.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email.

SEE ALSO

Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

-

You can also look for isaacs in #node.js on irc://irc.freenode.net. He +

You can also look for isaacs in #io.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email.

AUTHOR

Isaac Z. Schlueter :: diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 249d5934c9eb76..1f1559a62bf754 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -223,7 +223,7 @@

engine-strict

If set to true, then npm will stubbornly refuse to install (or even consider installing) any package that claims to not be compatible with -the current Node.js version.

+the current io.js version.

force

If set to true, then npm will stubbornly refuse to install (or even consider installing) any package that claims to not be compatible with -the current Node.js version.

+the current io.js version.

force