angular · Foxandxss · Jan 26, 2017 · Jan 26, 2017
diff --git a/public/docs/_examples/upgrade-module/e2e-spec.ts b/public/docs/_examples/upgrade-module/e2e-spec.ts
@@ -9,7 +9,7 @@ describe('Upgrade Tests', function () {
     setProtractorToHybridMode();
   });
 
-  describe('NG1 Auto-bootstrap', function() {
+  describe('AngularJS Auto-bootstrap', function() {
 
     beforeAll(function () {
       browser.get('/index-ng-app.html');
@@ -21,7 +21,7 @@ describe('Upgrade Tests', function () {
 
   });
 
-  describe('NG1 JavaScript Bootstrap', function() {
+  describe('AngularJS JavaScript Bootstrap', function() {
 
     beforeAll(function () {
       browser.get('/index-bootstrap.html');
@@ -33,10 +33,10 @@ describe('Upgrade Tests', function () {
 
   });
 
-  describe('NG1-2 Hybrid Bootstrap', function() {
+  describe('AngularJS-Angular Hybrid Bootstrap', function() {
 
     beforeAll(function () {
-      browser.get('/index-1-2-hybrid-bootstrap.html');
+      browser.get('/index-ajs-a-hybrid-bootstrap.html');
     });
 
     it('bootstraps as expected', function () {
@@ -113,7 +113,7 @@ describe('Upgrade Tests', function () {
   describe('Downgraded component with content projection', function() {
 
     beforeAll(function () {
-      browser.get('/index-1-to-2-projection.html');
+      browser.get('/index-ajs-to-a-projection.html');
     });
 
     it('can be transcluded into', function () {
@@ -126,7 +126,7 @@ describe('Upgrade Tests', function () {
   describe('Upgraded component with transclusion', function() {
 
     beforeAll(function () {
-      browser.get('/index-2-to-1-transclusion.html');
+      browser.get('/index-a-to-ajs-transclusion.html');
     });
 
     it('can be projected into', function () {
@@ -136,10 +136,10 @@ describe('Upgrade Tests', function () {
   });
 
 
-  describe('Upgrading NG1 Providers', function() {
+  describe('Upgrading AngularJS Providers', function() {
 
     beforeAll(function () {
-      browser.get('/index-1-to-2-providers.html');
+      browser.get('/index-ajs-to-a-providers.html');
     });
 
     it('works', function () {
@@ -149,10 +149,10 @@ describe('Upgrade Tests', function () {
   });
 
 
-  describe('Downgrading NG2 Providers', function() {
+  describe('Downgrading Angular Providers', function() {
 
     beforeAll(function () {
-      browser.get('/index-2-to-1-providers.html');
+      browser.get('/index-a-to-ajs-providers.html');
     });
 
     it('works', function () {

diff --git a/...ule/ts/app/2-to-1-providers/app.module.ts → ...e/ts/app/a-to-ajs-providers/app.module.ts b/...ule/ts/app/2-to-1-providers/app.module.ts → ...e/ts/app/a-to-ajs-providers/app.module.ts
diff --git a/...2-to-1-providers/hero-detail.component.ts → ...to-ajs-providers/hero-detail.component.ts b/...2-to-1-providers/hero-detail.component.ts → ...to-ajs-providers/hero-detail.component.ts
diff --git a/...-module/ts/app/2-to-1-providers/heroes.ts → ...odule/ts/app/a-to-ajs-providers/heroes.ts b/...-module/ts/app/2-to-1-providers/heroes.ts → ...odule/ts/app/a-to-ajs-providers/heroes.ts
diff --git a/.../ts/app/2-to-1-transclusion/app.module.ts → ...s/app/a-to-ajs-transclusion/app.module.ts b/.../ts/app/2-to-1-transclusion/app.module.ts → ...s/app/a-to-ajs-transclusion/app.module.ts
diff --git a/...-to-1-transclusion/container.component.ts → ...o-ajs-transclusion/container.component.ts b/...-to-1-transclusion/container.component.ts → ...o-ajs-transclusion/container.component.ts
diff --git a/...o-1-transclusion/hero-detail.component.ts → ...ajs-transclusion/hero-detail.component.ts b/...o-1-transclusion/hero-detail.component.ts → ...ajs-transclusion/hero-detail.component.ts
diff --git a/...ts/app/1-2-hybrid-bootstrap/app.module.ts → .../app/ajs-a-hybrid-bootstrap/app.module.ts b/...ts/app/1-2-hybrid-bootstrap/app.module.ts → .../app/ajs-a-hybrid-bootstrap/app.module.ts
diff --git a/...e-module/ts/app/1-bootstrap/app.module.ts → ...module/ts/app/ajs-bootstrap/app.module.ts b/...e-module/ts/app/1-bootstrap/app.module.ts → ...module/ts/app/ajs-bootstrap/app.module.ts
diff --git a/...rade-module/ts/app/1-ng-app/app.module.ts → ...de-module/ts/app/ajs-ng-app/app.module.ts b/...rade-module/ts/app/1-ng-app/app.module.ts → ...de-module/ts/app/ajs-ng-app/app.module.ts
diff --git a/...le/ts/app/1-to-2-projection/app.module.ts → .../ts/app/ajs-to-a-projection/app.module.ts b/...le/ts/app/1-to-2-projection/app.module.ts → .../ts/app/ajs-to-a-projection/app.module.ts
diff --git a/...-to-2-projection/hero-detail.component.ts → ...-to-a-projection/hero-detail.component.ts b/...-to-2-projection/hero-detail.component.ts → ...-to-a-projection/hero-detail.component.ts
diff --git a/.../app/1-to-2-projection/main.controller.ts → ...pp/ajs-to-a-projection/main.controller.ts b/.../app/1-to-2-projection/main.controller.ts → ...pp/ajs-to-a-projection/main.controller.ts
diff --git a/...ule/ts/app/1-to-2-providers/app.module.ts → ...e/ts/app/ajs-to-a-providers/app.module.ts b/...ule/ts/app/1-to-2-providers/app.module.ts → ...e/ts/app/ajs-to-a-providers/app.module.ts
diff --git a/...1-to-2-providers/hero-detail.component.ts → ...s-to-a-providers/hero-detail.component.ts b/...1-to-2-providers/hero-detail.component.ts → ...s-to-a-providers/hero-detail.component.ts
diff --git a/...ts/app/1-to-2-providers/heroes.service.ts → .../app/ajs-to-a-providers/heroes.service.ts b/...ts/app/1-to-2-providers/heroes.service.ts → .../app/ajs-to-a-providers/heroes.service.ts
diff --git a/...ade-module/ts/index-1-to-2-providers.html → ...e-module/ts/index-a-to-ajs-providers.html b/...ade-module/ts/index-1-to-2-providers.html → ...e-module/ts/index-a-to-ajs-providers.html
@@ -16,7 +16,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app/1-to-2-providers/app.module')
+      System.import('app/a-to-ajs-providers/app.module')
             .then(null, console.error.bind(console));
     </script>
   </head>

diff --git a/...-module/ts/index-2-to-1-transclusion.html → ...odule/ts/index-a-to-ajs-transclusion.html b/...-module/ts/index-2-to-1-transclusion.html → ...odule/ts/index-a-to-ajs-transclusion.html
@@ -16,7 +16,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app/2-to-1-transclusion/app.module')
+      System.import('app/a-to-ajs-transclusion/app.module')
             .then(null, console.error.bind(console));
     </script>
   </head>

diff --git a/...module/ts/index-1-2-hybrid-bootstrap.html → ...dule/ts/index-ajs-a-hybrid-bootstrap.html b/...module/ts/index-1-2-hybrid-bootstrap.html → ...dule/ts/index-ajs-a-hybrid-bootstrap.html
@@ -16,7 +16,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-    System.import('app/1-2-hybrid-bootstrap/app.module')
+    System.import('app/ajs-a-hybrid-bootstrap/app.module')
           .then(null, console.error.bind(console));
     </script>
   </head>

diff --git a/...de-module/ts/index-1-to-2-projection.html → ...-module/ts/index-ajs-to-a-projection.html b/...de-module/ts/index-1-to-2-projection.html → ...-module/ts/index-ajs-to-a-projection.html
@@ -16,7 +16,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app/1-to-2-projection/app.module')
+      System.import('app/ajs-to-a-projection/app.module')
             .then(null, console.error.bind(console));
     </script>
   </head>

diff --git a/...ade-module/ts/index-2-to-1-providers.html → ...e-module/ts/index-ajs-to-a-providers.html b/...ade-module/ts/index-2-to-1-providers.html → ...e-module/ts/index-ajs-to-a-providers.html
@@ -16,7 +16,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app/2-to-1-providers/app.module')
+      System.import('app/ajs-to-a-providers/app.module')
             .then(null, console.error.bind(console));
     </script>
   </head>

diff --git a/public/docs/_examples/upgrade-module/ts/index-bootstrap.html b/public/docs/_examples/upgrade-module/ts/index-bootstrap.html
@@ -3,7 +3,7 @@
 <html>
   <head>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
-    <script src="app/1-bootstrap/app.module.js"></script>
+    <script src="app/ajs-bootstrap/app.module.js"></script>
   </head>
 
   <body>

diff --git a/public/docs/_examples/upgrade-module/ts/index-ng-app.html b/public/docs/_examples/upgrade-module/ts/index-ng-app.html
@@ -3,7 +3,7 @@
 <html>
   <head>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
-    <script src="app/1-ng-app/app.module.js"></script>
+    <script src="app/ajs-ng-app/app.module.js"></script>
   </head>
 
   <body ng-app="heroApp" ng-strict-di>

diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/README.md b/public/docs/_examples/upgrade-phonecat-1-typescript/README.md
@@ -3,13 +3,13 @@ structure.
 
 The following changes from vanilla Phonecat are applied:
 
-* The TypeScript config file shown in the guide is `tsconfig.ng1.json` instead
+* The TypeScript config file shown in the guide is `tsconfig.ajs.json` instead
   of the default, because we don't want to enable `noImplicitAny` for migration.
-* Karma config for unit tests is in karma.conf.ng1.js because the boilerplate
+* Karma config for unit tests is in karma.conf.ajs.js because the boilerplate
   Karma config is not compatible with the way AngularJS tests need to be run.
   The shell script run-unit-tests.sh can be used to run the unit tests.
 * Instead of using Bower, AngularJS and its dependencies are fetched from a CDN
-  in index.html and karma.conf.ng1.js.
+  in index.html and karma.conf.ajs.js.
 * E2E tests have been moved to the parent directory, where `gulp run-e2e-tests` can
   discover and run them along with all the other examples.
 * Most of the phone JSON and image data removed in the interest of keeping

diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/.gitignore b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/.gitignore
@@ -0,0 +1 @@
+!karma.conf.ajs.js
diff --git a/...honecat-1-typescript/ts/karma.conf.ng1.js → ...honecat-1-typescript/ts/karma.conf.ajs.js b/...honecat-1-typescript/ts/karma.conf.ng1.js → ...honecat-1-typescript/ts/karma.conf.ajs.js
diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/run-unit-tests.sh b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/run-unit-tests.sh
@@ -1,7 +1,7 @@
 ## The boilerplate Karma configuration won't work with AngularJS tests since
 ## a specific loading configuration is needed for them.
-## We keep one in karma.conf.ng1.js. This scripts runs the ng1 tests with
+## We keep one in karma.conf.ajs.js. This scripts runs the AngularJS tests with
 ## that config.
 
 PATH=$(npm bin):$PATH
-tsc && karma start karma.conf.ng1.js
+tsc && karma start karma.conf.ajs.js
diff --git a/...honecat-1-typescript/ts/tsconfig.ng1.json → ...honecat-1-typescript/ts/tsconfig.ajs.json b/...honecat-1-typescript/ts/tsconfig.ng1.json → ...honecat-1-typescript/ts/tsconfig.ajs.json
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md b/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md
@@ -3,15 +3,15 @@ structure.
 
 The following changes from vanilla Phonecat are applied:
 
-* Karma config for unit tests is in karma.conf.ng1.js because the boilerplate
+* Karma config for unit tests is in karma.conf.ajs.js because the boilerplate
   Karma config is not compatible with the way AngularJS tests need to be run.
   The shell script run-unit-tests.sh can be used to run the unit tests.
-* There's a `package.ng1.json`, which is not used to run anything but only to
+* There's a `package.ajs.json`, which is not used to run anything but only to
   show an example of changing the PhoneCat http-server root path.
 * Also for the Karma shim, there is a `karma-test-shim.1.js` file which isn't
   used but is shown in the test appendix.
 * Instead of using Bower, AngularJS and its dependencies are fetched from a CDN
-  in index.html and karma.conf.ng1.js.
+  in index.html and karma.conf.ajs.js.
 * E2E tests have been moved to the parent directory, where `run-e2e-tests` can
   discover and run them along with all the other examples.
 * Most of the phone JSON and image data removed in the interest of keeping

diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/.gitignore b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/.gitignore
@@ -6,3 +6,4 @@ aot/**/*.ts
 dist
 !app/tsconfig.json
 !rollup-config.js
+!karma.conf.ajs.js
diff --git a/...honecat-2-hybrid/ts/app/app.module.ng1.ts → ...honecat-2-hybrid/ts/app/app.module.ajs.ts b/...honecat-2-hybrid/ts/app/app.module.ng1.ts → ...honecat-2-hybrid/ts/app/app.module.ajs.ts
diff --git a/...hone-detail/phone-detail.component.ng1.ts → ...hone-detail/phone-detail.component.ajs.ts b/...hone-detail/phone-detail.component.ng1.ts → ...hone-detail/phone-detail.component.ajs.ts
diff --git a/...pp/phone-list/phone-list.component.ng1.ts → ...pp/phone-list/phone-list.component.ajs.ts b/...pp/phone-list/phone-list.component.ng1.ts → ...pp/phone-list/phone-list.component.ajs.ts
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html
@@ -17,26 +17,26 @@
     <script src="https://code.angularjs.org/1.5.5/angular-resource.js"></script>
     <script src="https://code.angularjs.org/1.5.5/angular-route.js"></script>
 
-    <script src="app.module.ng1.js"></script>
+    <script src="app.module.ajs.js"></script>
     <script src="app.config.js"></script>
     <script src="app.animations.js"></script>
     <script src="core/core.module.js"></script>
     <script src="core/phone/phone.module.js"></script>
     <script src="phone-list/phone-list.module.js"></script>
     <script src="phone-detail/phone-detail.module.js"></script>
 
-    <!-- #docregion ng2 -->
+    <!-- #docregion angular -->
     <script src="/node_modules/core-js/client/shim.min.js"></script>
     <script src="/node_modules/zone.js/dist/zone.js"></script>
     <script src="/node_modules/systemjs/dist/system.src.js"></script>
-    <!-- #enddocregion ng2 -->
+    <!-- #enddocregion angular -->
     <script src="/systemjs.config.1.js"></script>
-    <!-- #docregion ng2
+    <!-- #docregion angular
     <script src="/systemjs.config.js"></script>
     <script>
       System.import('/app');
     </script>
-    <!-- #enddocregion ng2 -->
+    <!-- #enddocregion angular -->
     <script>
       System.import('/app');
     </script>

diff --git a/...de-phonecat-2-hybrid/ts/karma.conf.ng1.js → ...de-phonecat-2-hybrid/ts/karma.conf.ajs.js b/...de-phonecat-2-hybrid/ts/karma.conf.ng1.js → ...de-phonecat-2-hybrid/ts/karma.conf.ajs.js
diff --git a/...ade-phonecat-2-hybrid/ts/package.ng1.json → ...ade-phonecat-2-hybrid/ts/package.ajs.json b/...ade-phonecat-2-hybrid/ts/package.ng1.json → ...ade-phonecat-2-hybrid/ts/package.ajs.json
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/run-unit-tests.sh b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/run-unit-tests.sh
@@ -1,7 +1,7 @@
 ## The boilerplate Karma configuration won't work with AngularJS tests since
 ## a specific loading configuration is needed for them.
-## We keep one in karma.conf.ng1.js. This scripts runs the ng1 tests with
+## We keep one in karma.conf.ajs.js. This scripts runs the AngularJS tests with
 ## that config.
 
 PATH=$(npm bin):$PATH
-tsc && karma start karma.conf.ng1.js
+tsc && karma start karma.conf.ajs.js
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/karma.conf.ng1.js b/public/docs/_examples/upgrade-phonecat-3-final/ts/karma.conf.ng1.js
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/run-unit-tests.sh b/public/docs/_examples/upgrade-phonecat-3-final/ts/run-unit-tests.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     <html>
       <head>
         <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
-        <script src="app/1-bootstrap/app.module.js"></script>
+        <script src="app/ajs-bootstrap/app.module.js"></script>
       </head>
       <body>
@@ Expand Down @@