diff --git a/aio/content/guide/npm-packages.md b/aio/content/guide/npm-packages.md index fddb4805b9..a4e287fb3d 100644 --- a/aio/content/guide/npm-packages.md +++ b/aio/content/guide/npm-packages.md @@ -2,7 +2,7 @@ The [**Angular CLI**](https://cli.angular.io/), Angular applications, and Angular itself depend upon features and functionality provided by libraries that are available as [**npm**](https://docs.npmjs.com/) packages. -You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a node.js application. +You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a Node.js® application. The [**yarn client**](https://yarnpkg.com/en/) is a popular alternative for downloading and installing npm packages. The Angular CLI uses `yarn` by default to install npm packages when you create a new project. @@ -14,19 +14,19 @@ Node.js and npm are essential to Angular development. [Get them now](https://docs.npmjs.com/getting-started/installing-node "Installing Node.js and updating npm") if they're not already installed on your machine. -**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher** +**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher** by running the commands `node -v` and `npm -v` in a terminal/console window. Older versions produce errors. Consider using [nvm](https://github.com/creationix/nvm) for managing multiple -versions of node and npm. You may need [nvm](https://github.com/creationix/nvm) if -you already have projects running on your machine that use other versions of node and npm. +versions of Node.js and npm. You may need [nvm](https://github.com/creationix/nvm) if +you already have projects running on your machine that use other versions of Node.js and npm. ## _package.json_ -Both `npm` and `yarn` install packages identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file. +Both `node` and `yarn` install packages are identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file. The CLI `ng new` command creates a default `package.json` file for your project. This `package.json` specifies _a starter set of packages_ that work well together and @@ -129,7 +129,7 @@ You don't deploy them with the production application although there is no harm For example, see the [Angular language service extension for VS Code](https://marketplace.visualstudio.com/items?itemName=Angular.ng-template) -**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and node. +**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and Node.js. **[codelyzer](https://www.npmjs.com/package/codelyzer)**: A linter for Angular apps whose rules conform to the Angular [style guide](guide/styleguide). @@ -145,7 +145,7 @@ For example, see the [Angular language service extension for VS Code](https://ma Built on top of [WebDriverJS](https://github.com/SeleniumHQ/selenium/wiki/WebDriverJs). -**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for node. +**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for Node.js. **[tslint](https://www.npmjs.com/package/tslint)**: a static analysis tool that checks TypeScript code for readability, maintainability, and functionality errors. diff --git a/aio/content/guide/quickstart.md b/aio/content/guide/quickstart.md index d3fb4f3070..b806e7d5d4 100644 --- a/aio/content/guide/quickstart.md +++ b/aio/content/guide/quickstart.md @@ -32,7 +32,7 @@ if they are not already on your machine. -**Verify that you are running at least node `6.9.x` and npm `3.x.x`** +**Verify that you are running at least Node.js version `8.x`or greater and npm version `5.x` or greater** by running `node -v` and `npm -v` in a terminal/console window. Older versions produce errors, but newer versions are fine. diff --git a/aio/content/guide/setup.md b/aio/content/guide/setup.md index e980fcdcf5..9888252baf 100644 --- a/aio/content/guide/setup.md +++ b/aio/content/guide/setup.md @@ -10,7 +10,7 @@ Setting up a new project on your machine is quick and easy with the **QuickStart maintained [on github](https://github.com/angular/quickstart "Install the github QuickStart repo"). -Make sure you have [node and npm installed](guide/setup#install-prerequisites "What if you don't have node and npm?"). +Make sure you have [Node.js® and npm installed](guide/setup#install-prerequisites "What if you don't have Node.js and npm?"). {@a clone} @@ -301,23 +301,22 @@ If you're new to Angular, we recommend you follow the [tutorial](tutorial "Tour -## Appendix: node and npm +## Appendix: NodeJS and NPM -Node.js and npm are essential to modern web development with Angular and other platforms. -Node powers client development and build tools. -The _npm_ package manager, itself a _node_ application, installs JavaScript libraries. +[Node.js](https://nodejs.org/en/) and the [npm](https://www.npmjs.com/) package manager are essential to modern web development with Angular and other platforms. +NodeJS powers client development and build tools. +The _npm_ package manager, which is itself a _NodeJS_ application, installs JavaScript libraries. Get them now if they're not already installed on your machine. -**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher** +**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher** by running the commands `node -v` and `npm -v` in a terminal/console window. Older versions produce errors. -We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of node and npm. -You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that -use other versions of node and npm. +We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of Node.js and npm. +You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that use other versions of Node.js and npm. {@a why-locally} diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md index 4a5d94e9e9..32a0d87449 100644 --- a/aio/content/guide/typescript-configuration.md +++ b/aio/content/guide/typescript-configuration.md @@ -131,7 +131,7 @@ QuickStart identifies two *typings*, or `d.ts`, files: * [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework. -* [node](https://www.npmjs.com/package/@types/node) for code that references objects in the *nodejs* environment; +* [node](https://www.npmjs.com/package/@types/node) for code that references objects in the *Node.js®* environment; you can view an example in the [webpack](guide/webpack) page. QuickStart doesn't require these typings but many of the samples do. diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md index 746299e07c..bd4a4ecb84 100644 --- a/aio/content/guide/universal.md +++ b/aio/content/guide/universal.md @@ -16,7 +16,7 @@ Meanwhile, the browser downloads the full client version and switches to it auto
[Download the finished sample code](generated/zips/universal/universal.zip), -which runs in a [node express](https://expressjs.com/) server. +which runs in a [Node.js® Express](https://expressjs.com/) server.
@@ -123,7 +123,7 @@ You'll add more files to support building and serving with Universal. In this example, the Angular CLI compiles and bundles the Universal version of the app with the [AOT (Ahead-of-Time) compiler](guide/aot-compiler). -A node/express web server turns client requests into the HTML pages rendered by Universal. +A Node.js® Express web server turns client requests into the HTML pages rendered by Universal. You will create: diff --git a/aio/content/guide/visual-studio-2015.md b/aio/content/guide/visual-studio-2015.md index ab6b594a8a..1e7bc3aa50 100644 --- a/aio/content/guide/visual-studio-2015.md +++ b/aio/content/guide/visual-studio-2015.md @@ -53,7 +53,7 @@ if they are not already on your machine. -**Verify that you are running node version `4.6.x` or greater, and npm `3.x.x` or greater** +**Verify that you are running NodeJS version `8.x` or greater, and npm `5.x` or greater** by running `node -v` and `npm -v` in a terminal window. Older versions produce errors. diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json index 96d6424dd3..1b473f48d2 100644 --- a/aio/content/marketing/contributors.json +++ b/aio/content/marketing/contributors.json @@ -226,7 +226,7 @@ "picture": "wardbell.jpg", "website": "https://github.com/wardbell", "twitter": "wardbell", - "bio": "Ward is an all-around developer with JavaScript, node, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.", + "bio": "Ward is an all-around developer with JavaScript, Node.js®, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.", "group": "Angular" }, diff --git a/aio/content/marketing/features.html b/aio/content/marketing/features.html index da2e883098..e62dfd8e09 100755 --- a/aio/content/marketing/features.html +++ b/aio/content/marketing/features.html @@ -45,7 +45,7 @@
Universal
-

Serve the first view of your application on node.js, .NET, PHP, and other servers for near-instant rendering in just HTML and CSS. Also paves the way for sites that optimize for SEO.

+

Serve the first view of your application on Node.js®, .NET, PHP, and other servers for near-instant rendering in just HTML and CSS. Also paves the way for sites that optimize for SEO.

diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json index 56cc02d063..9b9c40f719 100644 --- a/aio/content/marketing/resources.json +++ b/aio/content/marketing/resources.json @@ -202,7 +202,7 @@ "url": "https://github.com/angular/universal" }, "c1": { - "desc": "Lightweight development only node server", + "desc": "Lightweight development only Node.js® server", "logo": "", "rev": true, "title": "Lite-server",