From 858855050d6b3e5329353a627648e8cc8d43d300 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 3 Feb 2016 18:04:13 -0500
Subject: [PATCH] docs(demos): rename nav-push-pop to navigation and use it on
 the nav as well

references #5311
---
 demos/{nav-push-pop => navigation}/app.html    |  0
 demos/{nav-push-pop => navigation}/index.ts    |  0
 demos/{nav-push-pop => navigation}/main.html   |  0
 demos/{nav-push-pop => navigation}/page-2.html |  0
 ionic/components/nav/nav-push.ts               | 10 +++++-----
 ionic/components/nav/nav.ts                    |  1 +
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename demos/{nav-push-pop => navigation}/app.html (100%)
 rename demos/{nav-push-pop => navigation}/index.ts (100%)
 rename demos/{nav-push-pop => navigation}/main.html (100%)
 rename demos/{nav-push-pop => navigation}/page-2.html (100%)

diff --git a/demos/nav-push-pop/app.html b/demos/navigation/app.html
similarity index 100%
rename from demos/nav-push-pop/app.html
rename to demos/navigation/app.html
diff --git a/demos/nav-push-pop/index.ts b/demos/navigation/index.ts
similarity index 100%
rename from demos/nav-push-pop/index.ts
rename to demos/navigation/index.ts
diff --git a/demos/nav-push-pop/main.html b/demos/navigation/main.html
similarity index 100%
rename from demos/nav-push-pop/main.html
rename to demos/navigation/main.html
diff --git a/demos/nav-push-pop/page-2.html b/demos/navigation/page-2.html
similarity index 100%
rename from demos/nav-push-pop/page-2.html
rename to demos/navigation/page-2.html
diff --git a/ionic/components/nav/nav-push.ts b/ionic/components/nav/nav-push.ts
index 527e14046c..8a18e821e3 100644
--- a/ionic/components/nav/nav-push.ts
+++ b/ionic/components/nav/nav-push.ts
@@ -38,7 +38,7 @@ import {NavRegistry} from './nav-registry';
  * ```html
  * <button [navPush]="[pushPage, params]"></button>
  * ```
- * @demo /docs/v2/demos/nav-push-pop/
+ * @demo /docs/v2/demos/navigation/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  * @see {@link ../NavPop NavPop API Docs}
  */
@@ -52,9 +52,9 @@ import {NavRegistry} from './nav-registry';
 export class NavPush {
   @Input() navPush;
   @Input() navParams;
-  
+
   constructor(
-    @Optional() private _nav: NavController, 
+    @Optional() private _nav: NavController,
     private registry: NavRegistry
    ) {
     if (!_nav) {
@@ -74,7 +74,7 @@ export class NavPush {
       }
       destination = this.navPush[0];
       params = this.navPush[1] || this.navParams;
-      
+
     } else {
       destination = this.navPush;
       params = this.navParams;
@@ -103,7 +103,7 @@ export class NavPush {
  * This will go back one page in the navigation stack
  *
  * Similar to {@link /docs/v2/api/components/nav/NavPush/ `NavPush` }
- * @demo /docs/v2/demos/nav-push-pop/
+ * @demo /docs/v2/demos/navigation/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  * @see {@link ../NavPush NavPush API Docs}
  */
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index 8f8f11828a..0d9f3727e8 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -98,6 +98,7 @@ import {ViewController} from './view-controller';
  *   </pre>
  * </div>
  *
+ * @demo /docs/v2/demos/navigation/ 
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  */
 @Component({