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

docs: replace all instances of node.js with io.js because trademark. #32

Closed
wants to merge 1 commit 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
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.


Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

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

this can change

[issue tracker]: https://github.com/joyent/node/issues
Copy link
Member

Choose a reason for hiding this comment

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

and this

[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
Copy link
Member

Choose a reason for hiding this comment

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

and absolutely this

6 changes: 3 additions & 3 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

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

Well this looks wrong :)

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
Expand Down Expand Up @@ -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 <info@bnoordhuis.nl>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

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

wut?

- 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)
Copy link
Member

Choose a reason for hiding this comment

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

this should change

- [big list of all the helpful wiki pages](https://github.com/joyent/node/wiki/_pages)
4 changes: 2 additions & 2 deletions benchmark/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/mdb_v8/mdb_v8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions deps/mdb_v8/mdb_v8_cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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 },
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/misc/npm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions deps/npm/doc/misc/npm-faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/html/doc/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ <h2 id="more-docs">More Docs</h2>
<h2 id="legal-stuff">Legal Stuff</h2>
<p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
All rights reserved. See the included LICENSE file for more details.</p>
<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
<p>&quot;io.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
<p>Modules published on the npm registry are not officially endorsed by
npm, Inc. or the Node.js project.</p>
npm, Inc. or the io.js project.</p>
<p>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
Expand Down Expand Up @@ -165,7 +165,7 @@ <h2 id="bugs">BUGS</h2>
</ul>
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
<p>You can also look for isaacs in #node.js on irc://irc.freenode.net. He
<p>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.</p>
<h2 id="see-also">SEE ALSO</h2>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ <h2 id="bugs">BUGS</h2>
</ul>
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
<p>You can also look for isaacs in #node.js on irc://irc.freenode.net. He
<p>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.</p>
<h2 id="author">AUTHOR</h2>
<p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/doc/misc/npm-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ <h3 id="engine-strict">engine-strict</h3>
</ul>
<p>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.</p>
the current io.js version.</p>
<h3 id="force">force</h3>
<ul>
<li>Default: false</li>
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/html/doc/misc/npm-faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h2 id="how-do-i-update-npm-">How do I update npm?</h2>
</code></pre><p>The <code>commit-ish</code> can be any tag, sha, or branch which can be supplied as
an argument to <code>git checkout</code>. The default is <code>master</code>.</p>
<h2 id="what-is-a-module-">What is a <code>module</code>?</h2>
<p>A module is anything that can be loaded with <code>require()</code> in a Node.js
<p>A module is anything that can be loaded with <code>require()</code> in a io.js
program. The following things are all examples of things that can be
loaded as modules:</p>
<ul>
Expand All @@ -154,7 +154,7 @@ <h2 id="what-is-a-module-">What is a <code>module</code>?</h2>
<h2 id="so-why-is-it-the-node_modules-folder-but-package-json-file-why-not-node_packages-or-module-json-">So, why is it the &quot;<code>node_modules</code>&quot; folder, but &quot;<code>package.json</code>&quot; file? Why not <code>node_packages</code> or <code>module.json</code>?</h2>
<p>The <code>package.json</code> file defines the package. (See &quot;What is a
package?&quot; above.)</p>
<p>The <code>node_modules</code> folder is the place Node.js looks for modules.
<p>The <code>node_modules</code> folder is the place io.js looks for modules.
(See &quot;What is a module?&quot; above.)</p>
<p>For example, if you create a file at <code>node_modules/foo.js</code> and then
had a program that did <code>var f = require(&#39;foo.js&#39;)</code> then it would load
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h1>npm</h1>

<h2>Easy Zero Line Install</h2>

<p><a href="http://nodejs.org/#download">Install Node.js</a> <br>
<p><a href="http://nodejs.org/#download">Install io.js</a> <br>
(npm comes with it.)</p>

<p>Because a one-line install is one too many.</p>
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/html/partial/doc/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ <h2 id="more-docs">More Docs</h2>
<h2 id="legal-stuff">Legal Stuff</h2>
<p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
All rights reserved. See the included LICENSE file for more details.</p>
<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
<p>&quot;io.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
<p>Modules published on the npm registry are not officially endorsed by
npm, Inc. or the Node.js project.</p>
npm, Inc. or the io.js project.</p>
<p>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
Expand Down Expand Up @@ -154,7 +154,7 @@ <h2 id="bugs">BUGS</h2>
</ul>
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
<p>You can also look for isaacs in #node.js on irc://irc.freenode.net. He
<p>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.</p>
<h2 id="see-also">SEE ALSO</h2>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/partial/doc/cli/npm.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h2 id="bugs">BUGS</h2>
</ul>
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
<p>You can also look for isaacs in #node.js on irc://irc.freenode.net. He
<p>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.</p>
<h2 id="author">AUTHOR</h2>
<p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/partial/doc/misc/npm-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ <h3 id="engine-strict">engine-strict</h3>
</ul>
<p>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.</p>
the current io.js version.</p>
<h3 id="force">force</h3>
<ul>
<li>Default: false</li>
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/html/partial/doc/misc/npm-faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ <h2 id="how-do-i-update-npm-">How do I update npm?</h2>
</code></pre><p>The <code>commit-ish</code> can be any tag, sha, or branch which can be supplied as
an argument to <code>git checkout</code>. The default is <code>master</code>.</p>
<h2 id="what-is-a-module-">What is a <code>module</code>?</h2>
<p>A module is anything that can be loaded with <code>require()</code> in a Node.js
<p>A module is anything that can be loaded with <code>require()</code> in a io.js
program. The following things are all examples of things that can be
loaded as modules:</p>
<ul>
Expand All @@ -143,7 +143,7 @@ <h2 id="what-is-a-module-">What is a <code>module</code>?</h2>
<h2 id="so-why-is-it-the-node_modules-folder-but-package-json-file-why-not-node_packages-or-module-json-">So, why is it the &quot;<code>node_modules</code>&quot; folder, but &quot;<code>package.json</code>&quot; file? Why not <code>node_packages</code> or <code>module.json</code>?</h2>
<p>The <code>package.json</code> file defines the package. (See &quot;What is a
package?&quot; above.)</p>
<p>The <code>node_modules</code> folder is the place Node.js looks for modules.
<p>The <code>node_modules</code> folder is the place io.js looks for modules.
(See &quot;What is a module?&quot; above.)</p>
<p>For example, if you create a file at <code>node_modules/foo.js</code> and then
had a program that did <code>var f = require(&#39;foo.js&#39;)</code> then it would load
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/node_modules/ansi/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deps/npm/node_modules/ansi/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading