From 63d591b359a69e3b51c37d964d6482fb384a2eb2 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Mon, 16 Nov 2015 14:17:46 -0600
Subject: [PATCH 1/2] fix(icons): remove private attribute to prevent
 transpilation error

Related: #547
---
 ionic/components/icon/icon.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index dd7d8acc49..8cc778946b 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -60,9 +60,6 @@ export class Icon {
     this.update();
   }
 
-  /**
-   * @private
-   */
   get isActive() {
     return (this._isActive === undefined || this._isActive === true || this._isActive === 'true');
   }

From df3a59dc813cef074f0bfedebb9e7e572e3a9482 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Mon, 16 Nov 2015 14:59:36 -0600
Subject: [PATCH 2/2] docs: fix syntax highlight on API section

Closes #533
---
 ionic/components/nav/nav.ts   | 2 +-
 ionic/components/tabs/tabs.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index 4116bfbb87..75a2ccf527 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -41,7 +41,7 @@ import {ViewController} from './view-controller';
  *
  * Additionally, specifying the `swipe-back-enabled` property will allow you to
  * swipe to go back:
- * ```ts
+ * ```html
  * <ion-nav swipe-back-enabled="false" [root]="rootPage"></ion-nav>
  * ```
  *
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index 3e35ed7b46..14c4d3ed4e 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -26,7 +26,7 @@ import {Icon} from '../icon/icon';
  * To override the platform specific TabBar placement, use the
  * `tabbar-placement` property:
  *
- * ```ts
+ * ```html
  * <ion-tabs tabbar-placement="top">
  *   <ion-tab [root]="tabRoot"></ion-tab>
  * </ion-tabs>
@@ -34,7 +34,7 @@ import {Icon} from '../icon/icon';
  *
  * To change the location of the icons in the TabBar, use the `tabbar-icons`
  * property:
- * ```ts
+ * ```html
  * <ion-tabs tabbar-icons="bottom">
  *   <ion-tab [root]="tabRoot"></ion-tab>
  * </ion-tabs>