style(branding): branding consistency fixup (#2805)

EladBezalel · andrewseguin · commit 408c58d569b6 · 2017-01-26T15:35:39.000-08:00
fixes #2803
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
-# Contributing to Angular 2 Material
+# Contributing to Angular Material
 
-We would love for you to contribute to Angular 2 Material and help make it ever better!
+We would love for you to contribute to Angular Material and help make it ever better!
 As a contributor, here are the guidelines we would like you to follow:
 
  - [Code of Conduct](#coc)
@@ -19,7 +19,7 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 
 If you have questions about how to *use* Angular Material, please direct them to the 
 [Google Group][material-group] discussion list or [StackOverflow][stackoverflow]. 
-Please note that Angular 2 Material is still in very early development, and the team's capacity 
+Please note that Angular Material is still in very early development, and the team's capacity 
 to answer usage questions is limited. Community chat is also available on [Gitter][gitter].
 
 ## <a name="issue"></a> Found an Issue?
@@ -33,7 +33,7 @@ You can help the team even more and [submit a Pull Request](#submit-pr) with a f
 ## <a name="feature"></a> Want a Feature?
 You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
 Repository][github]. If you would like to *implement* a new feature, please submit an issue with
-a proposal for your work first, to be sure that we can use it. Angular 2 Material is in very early 
+a proposal for your work first, to be sure that we can use it. Angular Material is in very early 
 stages and we are not ready to accept major contributions ahead of the full release.
 Please consider what kind of change it is:
 
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-# Material Design for Angular 2
+# Material Design for Angular
 [![npm version](https://badge.fury.io/js/%40angular%2Fmaterial.svg)](https://www.npmjs.com/package/%40angular%2Fmaterial)
 [![Build Status](https://travis-ci.org/angular/material2.svg?branch=master)](https://travis-ci.org/angular/material2)
 [![Gitter](https://badges.gitter.im/angular/material2.svg)](https://gitter.im/angular/material2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-This is the home for the Angular team's Material Design components built on top of Angular 2.
+This is the home for the Angular team's Material Design components built on top of Angular.
 
 #### Quick links
 [Google group](https://groups.google.com/forum/#!forum/angular-material2),
@@ -23,10 +23,10 @@ Playing with the latest changes from [master](https://github.com/angular/materia
 ### Getting started
 
 See our [Getting Started Guide][getting-started]
-if you're building your first project with Angular Material 2.
+if you're building your first project with Angular Material.
 
 ### Project status
-Angular Material 2 is currently in beta and under active development.
+Angular Material is currently in beta and under active development.
 During beta, new features will be added regularly and APIs will evolve based on user feedback.
 
 Check out our [directory of design documents](https://github.com/angular/material2/wiki/Design-doc-directory)
@@ -141,7 +141,7 @@ High level items planned for January 2017:
 be missing some behaviors or polish.
 
 ## The goal of Angular Material
-Our goal is to build a set of high-quality UI components built with Angular 2 and TypeScript,
+Our goal is to build a set of high-quality UI components built with Angular and TypeScript,
 following the Material Design spec. These
 components will serve as an example of how to write Angular code following best practices.
 
diff --git a/e2e/index.e2e.ts b/e2e/index.e2e.ts
@@ -4,7 +4,7 @@ describe('hello, protractor', function () {
   describe('index', function () {
     browser.get('/');
     it('should have a title', function () {
-      expect(browser.getTitle()).toBe('Material2');
+      expect(browser.getTitle()).toBe('Angular Material');
     });
   });
 });
diff --git a/guides/getting-started.md b/guides/getting-started.md
@@ -1,4 +1,4 @@
-Get started with Angular Material 2 using the Angular CLI.
+Get started with Angular Material using the Angular CLI.
 
 ## Install the CLI
  
@@ -85,6 +85,6 @@ load the Material Design font in your `index.html`.
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 ```
 
-## Sample Angular Material 2 projects
-- [Material 2 Sample App](https://github.com/jelbourn/material2-app)
+## Sample Angular Material projects
+- [Material Sample App](https://github.com/jelbourn/material2-app)
 - [Angular Connect 2016 Demo](https://github.com/kara/leashed-in)
diff --git a/guides/theming.md b/guides/theming.md
@@ -13,7 +13,7 @@ a theme consists of:
 * A foreground palette: colors for text and icons.
 * A background palette: colors used for element backgrounds.
 
-In Angular Material 2, all theme styles are generated _statically_ at build-time so that your
+In Angular Material, all theme styles are generated _statically_ at build-time so that your
 app doesn't have to spend cycles generating theme styles on startup.
 
 [1]: https://material.google.com/style/color.html#color-color-palette
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "material2-srcs",
-  "description": "Material Design components for Angular 2",
+  "description": "Material Design components for Angular",
   "homepage": "https://github.com/angular/material2",
   "bugs": "https://github.com/angular/material2/issues",
   "repository": {
diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts
@@ -25,7 +25,7 @@ export class MdCheckboxDemoNestedChecklist {
       subtasks: [
         { name: 'Cook Dinner', completed: false },
         { name: 'Read the Material Design Spec', completed: false },
-        { name: 'Upgrade Application to Angular2', completed: false }
+        { name: 'Upgrade Application to Angular', completed: false }
       ]
     },
     {
diff --git a/src/demo-app/demo-app/demo-app.html b/src/demo-app/demo-app/demo-app.html
@@ -24,7 +24,7 @@
         <md-icon class="md-24" >menu</md-icon>
       </button>
       <div class="demo-toolbar">
-        <h1>Angular Material 2 Demos</h1>
+        <h1>Angular Material Demos</h1>
         <button md-button (click)="toggleFullscreen()" title="Toggle fullscreen">
           Fullscreen
         </button>
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
@@ -4,7 +4,7 @@ import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 @Component({
   selector: 'home',
   template: `
-    <p>Welcome to the development demos for Angular Material 2!</p>
+    <p>Welcome to the development demos for Angular Material!</p>
     <p>Open the sidenav to select a demo. </p>
   `
 })
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Material2</title>
+  <title>Angular Material</title>
   <base href="/">
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/src/e2e-app/index.html b/src/e2e-app/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Material2</title>
+  <title>Angular Material</title>
   <base href="/">
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
@@ -10,7 +10,7 @@ import {
 
 export const MATERIAL_COMPATIBILITY_MODE = new OpaqueToken('md-compatibility-mode');
 
-/** Selector that matches all elements that may have style collisions with material1. */
+/** Selector that matches all elements that may have style collisions with AngularJS Material. */
 export const MAT_ELEMENTS_SELECTOR = `
   [mat-button],
   [mat-dialog-actions],
@@ -67,7 +67,7 @@ export const MAT_ELEMENTS_SELECTOR = `
   mat-toolbar,
   matTooltip`;
 
-/** Selector that matches all elements that may have style collisions with material1. */
+/** Selector that matches all elements that may have style collisions with AngularJS Material. */
 export const MD_ELEMENTS_SELECTOR = `  
   [md-button],
   [md-dialog-actions],
diff --git a/src/lib/core/keyboard/keycodes.ts b/src/lib/core/keyboard/keycodes.ts
@@ -1,5 +1,5 @@
 
-// Due to a bug in the ChromeDriver, Angular 2 keyboard events are not triggered by `sendKeys`
+// Due to a bug in the ChromeDriver, Angular keyboard events are not triggered by `sendKeys`
 // during E2E tests when using dot notation such as `(keydown.rightArrow)`. To get around this,
 // we are temporarily using a single (keydown) handler.
 // See: https://github.com/angular/angular/issues/9419
diff --git a/src/lib/core/overlay/_overlay.scss b/src/lib/core/overlay/_overlay.scss
@@ -49,7 +49,7 @@
     pointer-events: auto;
 
     // TODO(jelbourn): figure out if there are actually spec'ed colors for both light and dark
-    // themes here. Currently using the values from Angular Material 1.
+    // themes here. Currently using the values from AngularJS Material.
     transition: opacity $swift-ease-out-duration $swift-ease-out-timing-function;
     opacity: 0;
 
diff --git a/src/lib/input/README.md b/src/lib/input/README.md
@@ -1,6 +1,6 @@
 # md-input-container
 
-Inputs are the basic input component of Material 2. The spec can be found
+Inputs are the basic input component of Material. The spec can be found
 [here](https://www.google.com/design/spec/components/text-fields.html). `md-input-container` acts as
 a wrapper for native `input` and `textarea` elements. The native element wrapped by the
 `md-input-container` must be marked with the `mdInput` directive.
diff --git a/src/lib/menu/menu-animations.ts b/src/lib/menu/menu-animations.ts
@@ -9,7 +9,7 @@ import{
 
 /**
  * Below are all the animations for the md-menu component.
- * Animation duration and timing values are based on Material 1.
+ * Animation duration and timing values are based on AngularJS Material.
  */
 
 
diff --git a/src/lib/package.json b/src/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/material",
   "version": "2.0.0-beta.1",
-  "description": "Angular 2 Material",
+  "description": "Angular Material",
   "main": "./bundles/material.umd.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
diff --git a/src/lib/select/select-animations.ts b/src/lib/select/select-animations.ts
@@ -11,7 +11,7 @@ import {
  * The following are all the animations for the md-select component, with each
  * const containing the metadata for one animation.
  *
- * The values below match the implementation of the Material 1 md-select animation.
+ * The values below match the implementation of the AngularJS Material md-select animation.
  */
 
 /**
diff --git a/src/lib/sidenav/README.md b/src/lib/sidenav/README.md
@@ -4,7 +4,7 @@ should be used instead.**
 
 # MdSidenav
 
-MdSidenav is the side navigation component for Material 2. It is composed of two components: `<md-sidenav-container>` and `<md-sidenav>`.
+MdSidenav is the side navigation component for Angular Material. It is composed of two components: `<md-sidenav-container>` and `<md-sidenav>`.
 
 ## Screenshots
 
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
@@ -45,7 +45,7 @@ if (process.env['TRAVIS']) {
     "chromedriverVersion": "2.26",
     'tunnel-identifier': process.env['TRAVIS_JOB_ID'],
     'build': process.env['TRAVIS_JOB_ID'],
-    'name': 'Material 2 E2E Tests',
+    'name': 'Material E2E Tests',
 
     // Enables concurrent testing in the Webdriver. Currently runs five e2e files in parallel.
     maxInstances: 5,
diff --git a/tools/dgeni/index.js b/tools/dgeni/index.js
@@ -18,12 +18,12 @@ const templateDir = path.resolve(__dirname, './templates');
 // Package definition for material2 api docs. This only *defines* the package- it does not yet
 // actually *run* anything.
 //
-// A dgeni package is very similar to an Angular 1 module. Modules contain:
+// A dgeni package is very similar to an AngularJS module. Modules contain:
 //  "services" (injectables)
 //  "processors" (injectables that conform to a specific interface)
 //  "templates": nunjucks templates that can be used to render content
 //
-// A dgeni package also has a `config` method, similar to an Angular 1 module.
+// A dgeni package also has a `config` method, similar to an AngularJS module.
 // A config block can inject any services/processors and configure them before
 // docs processing begins.
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "material2-srcs",`
`3`		`- "description": "Material Design components for Angular 2",`
	`3`	`+ "description": "Material Design components for Angular",`
`4`	`4`	`"homepage": "https://github.com/angular/material2",`
`5`	`5`	`"bugs": "https://github.com/angular/material2/issues",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class MdCheckboxDemoNestedChecklist {`
`25`	`25`	`subtasks: [`
`26`	`26`	`{ name: 'Cook Dinner', completed: false },`
`27`	`27`	`{ name: 'Read the Material Design Spec', completed: false },`
`28`		`- { name: 'Upgrade Application to Angular2', completed: false }`
	`28`	`+ { name: 'Upgrade Application to Angular', completed: false }`
`29`	`29`	`]`
`30`	`30`	`},`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import {Component, ViewEncapsulation, ElementRef} from '@angular/core';`
`4`	`4`	`@Component({`
`5`	`5`	`selector: 'home',`
`6`	`6`	template: `
`7`		`- <p>Welcome to the development demos for Angular Material 2!</p>`
	`7`	`+ <p>Welcome to the development demos for Angular Material!</p>`
`8`	`8`	`<p>Open the sidenav to select a demo. </p>`
`9`	`9`	`
`10`	`10`	`})`