diff --git a/src/components/nav/nav-controller.ts b/src/components/nav/nav-controller.ts
index 658055e657..8b309cd77f 100644
--- a/src/components/nav/nav-controller.ts
+++ b/src/components/nav/nav-controller.ts
@@ -14,8 +14,8 @@ import { ViewController } from './view-controller';
  * @description
  *
  * NavController is the base class for navigation controller components like
- * [`Nav`](../Nav/) and [`Tab`](../../Tabs/Tab/). You use navigation controllers
- * to navigate to [pages](#creating_pages) in your app. At a basic level, a
+ * [`Nav`](../Nav/) and [`Tab`](../../tabs/Tab/). You use navigation controllers
+ * to navigate to [pages](#view-creation) in your app. At a basic level, a
  * navigation controller is an array of pages representing a particular history
  * (of a Tab for example). This array can be manipulated to navigate throughout
  * an app by pushing and popping pages or inserting and removing them at
@@ -65,7 +65,7 @@ import { ViewController } from './view-controller';
  *
  * Instead, you can inject NavController and know that it is the correct
  * navigation controller for most situations (for more advanced situations, see
- * [Menu](../../Menu/Menu/) and [Tab](../../Tab/Tab/)).
+ * [Menu](../../menu/Menu/) and [Tab](../../tab/Tab/)).
  *
  * ```ts
  *  import { NavController } from 'ionic-angular';
@@ -121,7 +121,7 @@ import { ViewController } from './view-controller';
  *
  * ## Pushing a View
  * To push a new view on to the navigation stack, use the `push` method.
- * If the page has an [`<ion-navbar>`](../api/components/nav-bar/NavBar/),
+ * If the page has an [`<ion-navbar>`](../../navbar/Navbar/),
  * a back button will automatically be added to the pushed view.
  *
  * Data can also be passed to a view by passing an object to the `push` method.
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index ff53ed58f9..58dfc8b752 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -25,20 +25,21 @@ import { ViewController } from '../nav/view-controller';
  * Tabs make it easy to navigate between different pages or functional
  * aspects of an app. The Tabs component, written as `<ion-tabs>`, is
  * a container of individual [Tab](../Tab/) components. Each individual `ion-tab`
- * is a declarative component for a [NavController](../NavController/)
-
+ * is a declarative component for a [NavController](../../nav/NavController/)
+ *
  * For more information on using nav controllers like Tab or [Nav](../../nav/Nav/),
- * take a look at the [NavController API Docs](../NavController/).
+ * take a look at the [NavController API Docs](../../nav/NavController/).
  *
  * ### Placement
  *
  * The position of the tabs relative to the content varies based on
  * the mode. The tabs are placed at the bottom of the screen
- * for iOS and Android, and at the top for Windows by default. The position can be configured using the `tabsPlacement` attribute
- * on the `<ion-tabs>` component, or in an app's [config](../../config/Config/).
+ * for iOS and Android, and at the top for Windows by default. The position can
+ * be configured using the `tabsPlacement` attribute on the `<ion-tabs>` component,
+ * or in an app's [config](../../config/Config/).
  * See the [Input Properties](#input-properties) below for the available
  * values of `tabsPlacement`.
-
+ *
  * ### Layout
  *
  * The layout for all of the tabs can be defined using the `tabsLayout`
@@ -181,7 +182,7 @@ export class Tabs extends Ion {
    */
   subPages: boolean;
 
-  /** @internal */ 
+  /** @internal */
   _color: string;
 
   /**
@@ -194,7 +195,7 @@ export class Tabs extends Ion {
 
   set color(value: string) {
     this._updateColor(value);
-  }  
+  }
 
   /**
    * @input {number} The default selected tab index when first loaded. If a selected index isn't provided then it will use `0`, the first tab.
@@ -418,7 +419,7 @@ export class Tabs extends Ion {
     if (color !== null && color !== '') {
       this._renderer.setElementClass(this._elementRef.nativeElement, `tabs-${color}`, isAdd);
     }
-  }  
+  }
 
   /**
    * @private