From 396f891f33003c290d3d10de712f8be80c3209d9 Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Tue, 14 Mar 2017 14:50:31 -0500
Subject: [PATCH] chore(docs): updating dgeni typescript package

---
 package.json                                  |   4 +-
 scripts/docs/dgeni-config.js                  |  12 +-
 scripts/docs/processors/hide-private-api.js   |   9 +-
 .../docs/processors/parse-returns-object.js   |   2 +-
 .../docs/processors/remove-private-members.js |   4 +-
 scripts/docs/tag-defs/tag-defs.js             |   1 +
 scripts/docs/templates/common.template.html   |   6 +-
 scripts/docs/typescript-package/index.js      |  74 ---
 .../typescript-package/mocks/mockPackage.js   |  11 -
 .../ignoreExportsMatching.ts                  |   4 -
 .../mocks/readTypeScriptModules/interfaces.ts |   5 -
 .../orderingOfMembers.ts                      |   6 -
 .../readTypeScriptModules/privateModule.ts    |   1 -
 .../readTypeScriptModules/publicModule.ts     |   3 -
 .../mocks/tsParser/importedSrc.ts             |   1 -
 .../mocks/tsParser/testSrc.ts                 |  34 --
 .../processors/readTypeScriptModules.js       | 461 ------------------
 .../processors/readTypeScriptModules.spec.js  | 136 ------
 .../convertPrivateClassesToInterfaces.js      |  31 --
 .../convertPrivateClassesToInterfaces.spec.js |  76 ---
 .../typescript-package/services/modules.js    |   3 -
 .../services/tsParser/createCompilerHost.js   |  80 ---
 .../tsParser/createCompilerHost.spec.js       |  80 ---
 .../services/tsParser/getContent.js           |  49 --
 .../services/tsParser/getDirectiveInfo.js     |  34 --
 .../services/tsParser/getExportDocType.js     |  54 --
 .../services/tsParser/getFileInfo.js          |  20 -
 .../services/tsParser/index.js                |  74 ---
 .../services/tsParser/index.spec.js           |  21 -
 src/animations/animation.ts                   |  48 +-
 .../action-sheet/action-sheet-component.ts    |   2 +-
 src/components/action-sheet/action-sheet.ts   |   4 +-
 src/components/alert/alert-component.ts       |   2 +-
 src/components/alert/alert.ts                 |   4 +-
 src/components/app/app-root.ts                |   4 +-
 src/components/app/app.ts                     |  22 +-
 src/components/backdrop/backdrop.ts           |   2 +-
 src/components/button/button.ts               |  26 +-
 src/components/card/card-content.ts           |   2 +-
 src/components/card/card-header.ts            |   2 +-
 src/components/card/card-title.ts             |   2 +-
 src/components/card/card.ts                   |   2 +-
 src/components/checkbox/checkbox.ts           |  34 +-
 src/components/content/content.ts             |  30 +-
 src/components/datetime/datetime.ts           |  40 +-
 src/components/fab/fab-container.ts           |  20 +-
 src/components/fab/fab-list.ts                |   2 +-
 src/components/fab/fab.ts                     |   2 +-
 src/components/icon/icon.ts                   |  18 +-
 src/components/img/img.ts                     |  16 +-
 .../infinite-scroll-content.ts                |   4 +-
 .../infinite-scroll/infinite-scroll.ts        |   6 +-
 src/components/input/input.ts                 |  70 +--
 src/components/input/native-input.ts          |   2 +-
 src/components/input/next-input.ts            |   2 +-
 src/components/ion.ts                         |  28 +-
 src/components/item/item-content.ts           |   2 +-
 src/components/item/item-divider.ts           |   2 +-
 src/components/item/item-group.ts             |   2 +-
 src/components/item/item-options.ts           |   4 +-
 src/components/item/item-reorder-gesture.ts   |   4 +-
 src/components/item/item-reorder-util.ts      |   6 +-
 src/components/item/item-reorder.ts           |   8 +-
 src/components/item/item-sliding-gesture.ts   |   2 +-
 src/components/item/item-sliding.ts           |  18 +-
 src/components/item/item.ts                   |  22 +-
 src/components/item/reorder.ts                |   2 +-
 src/components/label/label.ts                 |   6 +-
 src/components/list/list-header.ts            |   2 +-
 src/components/list/list.ts                   |   4 +-
 src/components/loading/loading-component.ts   |   2 +-
 src/components/loading/loading.ts             |   4 +-
 src/components/menu/menu-close.ts             |   4 +-
 src/components/menu/menu-controller.ts        |  12 +-
 src/components/menu/menu-toggle.ts            |  10 +-
 src/components/menu/menu-types.ts             |   8 +-
 src/components/menu/menu.ts                   |  56 +--
 src/components/modal/modal-component.ts       |   6 +-
 src/components/modal/modal-impl.ts            |   4 +-
 src/components/modal/modal.ts                 |   2 +-
 src/components/nav/nav-pop-anchor.ts          |   2 +-
 src/components/nav/nav-pop.ts                 |   2 +-
 src/components/nav/nav-push-anchor.ts         |   2 +-
 src/components/nav/nav-push.ts                |   2 +-
 src/components/nav/nav.ts                     |   4 +-
 src/components/nav/overlay-portal.ts          |   2 +-
 src/components/navbar/navbar.ts               |  14 +-
 src/components/option/option.ts               |   2 +-
 src/components/picker/picker-column.ts        |   2 +-
 src/components/picker/picker-component.ts     |   2 +-
 src/components/picker/picker-controller.ts    |   2 +-
 src/components/picker/picker.ts               |   4 +-
 src/components/popover/popover-component.ts   |   2 +-
 src/components/popover/popover-impl.ts        |   4 +-
 src/components/popover/popover.ts             |   2 +-
 src/components/radio/radio-button.ts          |   2 +-
 src/components/radio/radio-group.ts           |  36 +-
 src/components/range/range-knob.ts            |   2 +-
 src/components/range/range.ts                 |  22 +-
 src/components/refresher/refresher-content.ts |   4 +-
 src/components/refresher/refresher.ts         |   4 +-
 src/components/scroll/scroll.ts               |  10 +-
 src/components/searchbar/searchbar.ts         |  30 +-
 src/components/segment/segment-button.ts      |   8 +-
 src/components/segment/segment.ts             |  16 +-
 src/components/select/select.ts               |  24 +-
 .../show-hide-when/show-hide-when.ts          |   2 +-
 src/components/slides/slide.ts                |   2 +-
 src/components/slides/slides.ts               | 180 +++----
 src/components/spinner/spinner.ts             |   4 +-
 src/components/split-pane/split-pane.ts       |  28 +-
 src/components/tabs/tab-button.ts             |   2 +-
 src/components/tabs/tab-highlight.ts          |   2 +-
 src/components/tabs/tab.ts                    |  36 +-
 src/components/tabs/tabs.ts                   |   4 +-
 src/components/toast/toast-component.ts       |   2 +-
 src/components/toast/toast.ts                 |   6 +-
 src/components/toggle/toggle-gesture.ts       |   2 +-
 src/components/toggle/toggle.ts               |  30 +-
 src/components/toolbar/toolbar-base.ts        |   6 +-
 src/components/toolbar/toolbar-item.ts        |   2 +-
 src/components/toolbar/toolbar-title.ts       |   2 +-
 src/components/toolbar/toolbar.ts             |   2 +-
 src/components/typography/typography.ts       |   2 +-
 .../virtual-scroll/virtual-footer.ts          |   2 +-
 .../virtual-scroll/virtual-header.ts          |   2 +-
 src/components/virtual-scroll/virtual-item.ts |   2 +-
 .../virtual-scroll/virtual-scroll.ts          |  12 +-
 src/config/config.ts                          |  18 +-
 src/gestures/drag-gesture.ts                  |   4 +-
 src/gestures/gesture-config.ts                |   2 +-
 src/gestures/gesture-controller.ts            |  32 +-
 src/gestures/gesture.ts                       |   2 +-
 src/gestures/pointer-events.ts                |   2 +-
 src/gestures/slide-edge-gesture.ts            |   2 +-
 src/gestures/slide-gesture.ts                 |   4 +-
 src/gestures/ui-event-manager.ts              |   2 +-
 src/index.ts                                  |   2 +-
 src/navigation/nav-controller-base.ts         |   2 +-
 src/navigation/nav-controller.ts              |  12 +-
 src/navigation/nav-params.ts                  |   2 +-
 src/navigation/nav-util.ts                    |   6 +-
 src/navigation/swipe-back.ts                  |   2 +-
 src/navigation/url-serializer.ts              |   4 +-
 src/navigation/view-controller.ts             |  64 +--
 src/platform/dom-controller.ts                |   6 +-
 src/platform/keyboard.ts                      |   2 +-
 src/platform/platform.ts                      |  90 ++--
 src/platform/query-params.ts                  |   2 +-
 src/tap-click/ripple.ts                       |   2 +-
 src/tap-click/tap-click.ts                    |   6 +-
 src/transitions/page-transition.ts            |   2 +-
 src/transitions/transition-controller.ts      |   2 +-
 src/transitions/transition.ts                 |   2 +-
 src/util/click-block.ts                       |   2 +-
 src/util/events.ts                            |   4 +-
 src/util/form.ts                              |   6 +-
 src/util/module-loader.ts                     |   8 +-
 src/util/scroll-view.ts                       |   4 +-
 src/util/util.ts                              |  52 +-
 160 files changed, 760 insertions(+), 2014 deletions(-)
 delete mode 100755 scripts/docs/typescript-package/index.js
 delete mode 100755 scripts/docs/typescript-package/mocks/mockPackage.js
 delete mode 100755 scripts/docs/typescript-package/mocks/readTypeScriptModules/ignoreExportsMatching.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/readTypeScriptModules/interfaces.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/readTypeScriptModules/orderingOfMembers.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/readTypeScriptModules/privateModule.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/readTypeScriptModules/publicModule.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/tsParser/importedSrc.ts
 delete mode 100755 scripts/docs/typescript-package/mocks/tsParser/testSrc.ts
 delete mode 100755 scripts/docs/typescript-package/processors/readTypeScriptModules.js
 delete mode 100755 scripts/docs/typescript-package/processors/readTypeScriptModules.spec.js
 delete mode 100755 scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.js
 delete mode 100755 scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.spec.js
 delete mode 100755 scripts/docs/typescript-package/services/modules.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/createCompilerHost.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/createCompilerHost.spec.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/getContent.js
 delete mode 100644 scripts/docs/typescript-package/services/tsParser/getDirectiveInfo.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/getExportDocType.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/getFileInfo.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/index.js
 delete mode 100755 scripts/docs/typescript-package/services/tsParser/index.spec.js

diff --git a/package.json b/package.json
index 29cc0fb389..432dc2af6d 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,8 @@
     "core-js": "2.4.1",
     "cpr": "2.0.0",
     "del": "2.2.2",
-    "dgeni": "0.4.2",
-    "dgeni-packages": "0.16.0",
+    "dgeni": "^0.4.7",
+    "dgeni-packages": "^0.16.10",
     "event-stream": "3.3.4",
     "file-loader": "0.9.0",
     "fs-extra": "^2.0.0",
diff --git a/scripts/docs/dgeni-config.js b/scripts/docs/dgeni-config.js
index d129b907a0..99bc597a37 100644
--- a/scripts/docs/dgeni-config.js
+++ b/scripts/docs/dgeni-config.js
@@ -1,8 +1,8 @@
 var Package = require('dgeni').Package;
 var jsdocPackage = require('dgeni-packages/jsdoc');
 var nunjucksPackage = require('dgeni-packages/nunjucks');
-var typescriptPackage = require('./typescript-package');
-var linksPackage = require('./links-package');
+var typescriptPackage = require('dgeni-packages/typescript');
+var linksPackage = require('dgeni-packages/links');
 var gitPackage = require('dgeni-packages/git');
 var path = require('path');
 var semver = require('semver');
@@ -19,8 +19,8 @@ module.exports = function(currentVersion, initialVersionBuild) {
 
 .processor(require('./processors/latest-version'))
 .processor(require('./processors/index-page'))
-.processor(require('./processors/jekyll'))
 .processor(require('./processors/remove-private-members'))
+.processor(require('./processors/jekyll'))
 .processor(require('./processors/hide-private-api'))
 .processor(require('./processors/collect-inputs-outputs'))
 .processor(require('./processors/parse-returns-object'))
@@ -103,8 +103,10 @@ module.exports = function(currentVersion, initialVersionBuild) {
       docPath += doc.name + '/index.md';
       var path = config.v2DocsDir + '/' + (versionData.current.folder || '') +
                      '/api/' +  docPath;
-                     path = path.replace('/home/ubuntu/ionic/src', '')
-                    return path;
+      path = path.replace('/home/ubuntu/ionic/src', '')
+              .replace(__dirname.replace('ionic/scripts/docs', ''),'')
+              .replace('/ionic/src','');
+      return path;
     }
   }];
 })
diff --git a/scripts/docs/processors/hide-private-api.js b/scripts/docs/processors/hide-private-api.js
index 15e2b6eb27..b14eee016c 100644
--- a/scripts/docs/processors/hide-private-api.js
+++ b/scripts/docs/processors/hide-private-api.js
@@ -2,17 +2,18 @@ module.exports = function removePrivateApi() {
   return {
     name: 'remove-private-api',
     description: 'Prevent the private apis from being rendered',
+    $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
     $process: function(docs) {
       var publicDocs = [];
-       docs.forEach(function(doc){
-        if(!doc.private){
+      docs.forEach(function(doc){
+        if (!doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden'))){
           publicDocs.push(doc);
           return doc
         }
       })
-     docs = publicDocs;
-     return docs;
+      docs = publicDocs;
+      return docs;
     }
   }
 };
diff --git a/scripts/docs/processors/parse-returns-object.js b/scripts/docs/processors/parse-returns-object.js
index 4660d76b9f..fa999a0bf6 100644
--- a/scripts/docs/processors/parse-returns-object.js
+++ b/scripts/docs/processors/parse-returns-object.js
@@ -1,4 +1,4 @@
-module.exports = function removePrivateApi() {
+module.exports = function parseReturnsObject() {
 
   /*
    * This processor assumes the format:
diff --git a/scripts/docs/processors/remove-private-members.js b/scripts/docs/processors/remove-private-members.js
index 98ab63f504..f7fa1ab592 100644
--- a/scripts/docs/processors/remove-private-members.js
+++ b/scripts/docs/processors/remove-private-members.js
@@ -8,12 +8,12 @@ module.exports = function removePrivateMembers() {
       docs.forEach(function(doc) {
         if (doc.members) {
           doc.members = doc.members.filter(function(member) {
-            return !member.tags.tagsByName.get('private') && !member.tags.tagsByName.get('internal');
+            return !member.tags.tagsByName.get('hidden') && !member.tags.tagsByName.get('internal');
           });
         }
         if (doc.statics) {
           doc.statics = doc.statics.filter(function(staticMethod) {
-            return !staticMethod.tags.tagsByName.get('private') && !staticMethod.tags.tagsByName.get('internal')
+            return !staticMethod.tags.tagsByName.get('hidden') && !staticMethod.tags.tagsByName.get('internal')
           });
         }
       });
diff --git a/scripts/docs/tag-defs/tag-defs.js b/scripts/docs/tag-defs/tag-defs.js
index eb11fa6c0a..4be6b99e67 100644
--- a/scripts/docs/tag-defs/tag-defs.js
+++ b/scripts/docs/tag-defs/tag-defs.js
@@ -2,5 +2,6 @@ module.exports = [
   {'name': 'advanced'},
   {'name': 'demo'},
   {'name': 'usage'},
+  {'name': 'hidden'},
   {'name': 'internal'}
 ];
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index 9afcfa8a7f..c2bd0ce95e 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -204,8 +204,8 @@ angular_controller: APIDemoCtrl <@ endif @>
 <$ doc.name | dashCase $>
 <@ else @>
 <$ doc.name $>
-<@- if doc.directiveInfo @>
-<h3><code><$ doc.directiveInfo.properties[0].values $></code></h3>
+<@- if doc.decorators[0].argumentInfo[0].selector @>
+<h3><code><$ doc.decorators[0].argumentInfo[0].selector $></code></h3>
 <@ endif -@>
 <@ endif @>
 
@@ -225,7 +225,7 @@ Delegate: <$ doc.delegate $>
 
 </h1>
 
-<a class="improve-v2-docs" href="http://github.com/driftyco/ionic/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a class="improve-v2-docs" href="http://github.com/driftyco/ionic/edit/master/<$ doc.fileInfo.projectRelativePath $>#L<$ doc.location.start.line $>">
 Improve this doc
 </a>
 
diff --git a/scripts/docs/typescript-package/index.js b/scripts/docs/typescript-package/index.js
deleted file mode 100755
index 876c080855..0000000000
--- a/scripts/docs/typescript-package/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var basePackage = require('dgeni-packages/base');
-var Package = require('dgeni').Package;
-var path = require('canonical-path');
-
-// Define the dgeni package for generating the docs
-module.exports = new Package('typescript-parsing', [basePackage])
-
-// Register the services and file readers
-.factory(require('./services/modules'))
-.factory(require('./services/tsParser'))
-.factory(require('./services/tsParser/createCompilerHost'))
-.factory(require('./services/tsParser/getFileInfo'))
-.factory(require('./services/tsParser/getExportDocType'))
-.factory(require('./services/tsParser/getContent'))
-.factory(require('./services/tsParser/getDirectiveInfo'))
-
-.factory(require('./services/convertPrivateClassesToInterfaces'))
-
-.factory('EXPORT_DOC_TYPES', function() {
-  return [
-    'class',
-    'interface',
-    'function',
-    'var',
-    'const',
-    'let',
-    'enum',
-    'type-alias'
-  ];
-})
-
-
-// Register the processors
-.processor(require('./processors/readTypeScriptModules'))
-
-
-// Configure the log service
-.config(function(log) {
-  log.level = 'warn';
-})
-
-
-// Configure ids and paths
-.config(function(computeIdsProcessor, computePathsProcessor, EXPORT_DOC_TYPES) {
-
-  computeIdsProcessor.idTemplates.push({
-    docTypes: ['member'],
-    idTemplate: '${classDoc.id}.${name}',
-    getAliases: function(doc) {
-      return doc.classDoc.aliases.map(function(alias) { return alias + '.' + doc.name; });
-    }
-  });
-
-  computePathsProcessor.pathTemplates.push({
-    docTypes: ['member'],
-    pathTemplate: '${classDoc.path}#${name}',
-    getOutputPath: function() {} // These docs are not written to their own file, instead they are part of their class doc
-  });
-
-  var MODULES_DOCS_PATH = 'partials/modules';
-
-  computePathsProcessor.pathTemplates.push({
-    docTypes: ['module'],
-    pathTemplate: '/${id}',
-    outputPathTemplate: MODULES_DOCS_PATH + '/${id}/index.html'
-  });
-
-  computePathsProcessor.pathTemplates.push({
-    docTypes: EXPORT_DOC_TYPES,
-    pathTemplate: '${moduleDoc.path}/${name}',
-    outputPathTemplate: MODULES_DOCS_PATH + '/${path}/index.html'
-  });
-
-});
diff --git a/scripts/docs/typescript-package/mocks/mockPackage.js b/scripts/docs/typescript-package/mocks/mockPackage.js
deleted file mode 100755
index 834d53c959..0000000000
--- a/scripts/docs/typescript-package/mocks/mockPackage.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var Package = require('dgeni').Package;
-
-module.exports = function mockPackage() {
-
-  return new Package('mockPackage', [require('../')])
-
-  // provide a mock log service
-  .factory('log', function() { return require('dgeni/lib/mocks/log')(false); })
-  .factory('templateEngine', function() { return {}; });
-
-};
diff --git a/scripts/docs/typescript-package/mocks/readTypeScriptModules/ignoreExportsMatching.ts b/scripts/docs/typescript-package/mocks/readTypeScriptModules/ignoreExportsMatching.ts
deleted file mode 100755
index 476d4cc44b..0000000000
--- a/scripts/docs/typescript-package/mocks/readTypeScriptModules/ignoreExportsMatching.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export var __esModule = true;
-export class OKToExport {}
-export function _thisIsPrivate() {}
-export var thisIsOK = '!';
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/readTypeScriptModules/interfaces.ts b/scripts/docs/typescript-package/mocks/readTypeScriptModules/interfaces.ts
deleted file mode 100755
index a2d4be4fec..0000000000
--- a/scripts/docs/typescript-package/mocks/readTypeScriptModules/interfaces.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface MyInterface {
-  optionalProperty? : string
-  <T, U extends Findable<T>>(param: T) : U
-  new (param: number) : MyInterface
-}
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/readTypeScriptModules/orderingOfMembers.ts b/scripts/docs/typescript-package/mocks/readTypeScriptModules/orderingOfMembers.ts
deleted file mode 100755
index 2020ec7fa4..0000000000
--- a/scripts/docs/typescript-package/mocks/readTypeScriptModules/orderingOfMembers.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class Test {
-  firstItem;
-  constructor() { this.doStuff(); }
-  otherMethod() {}
-  doStuff() {}
-}
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/readTypeScriptModules/privateModule.ts b/scripts/docs/typescript-package/mocks/readTypeScriptModules/privateModule.ts
deleted file mode 100755
index d4c6ef610a..0000000000
--- a/scripts/docs/typescript-package/mocks/readTypeScriptModules/privateModule.ts
+++ /dev/null
@@ -1 +0,0 @@
-export var x = 10;
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/readTypeScriptModules/publicModule.ts b/scripts/docs/typescript-package/mocks/readTypeScriptModules/publicModule.ts
deleted file mode 100755
index bbb7cc82c3..0000000000
--- a/scripts/docs/typescript-package/mocks/readTypeScriptModules/publicModule.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { x as y } from './privateModule';
-
-export abstract class AbstractClass {}
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/tsParser/importedSrc.ts b/scripts/docs/typescript-package/mocks/tsParser/importedSrc.ts
deleted file mode 100755
index 74a115e5fe..0000000000
--- a/scripts/docs/typescript-package/mocks/tsParser/importedSrc.ts
+++ /dev/null
@@ -1 +0,0 @@
-export var x = 100;
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/mocks/tsParser/testSrc.ts b/scripts/docs/typescript-package/mocks/tsParser/testSrc.ts
deleted file mode 100755
index 7b6d3f18dd..0000000000
--- a/scripts/docs/typescript-package/mocks/tsParser/testSrc.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @module
- * @description
- * This is the module description
- */
-
-export * from 'importedSrc';
-
-/**
- * This is some random other comment
- */
-
-/**
- * This is MyClass
- */
-export class MyClass {
-  message: String;
-
-  /**
-   * Create a new MyClass
-   * @param {String} name The name to say hello to
-   */
-  constructor(name) { this.message = 'hello ' + name; }
-
-  /**
-   * Return a greeting message
-   */
-  greet() { return this.message; }
-}
-
-/**
- * An exported function
- */
-export var myFn = (val: number) => return val * 2;
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/processors/readTypeScriptModules.js b/scripts/docs/typescript-package/processors/readTypeScriptModules.js
deleted file mode 100755
index 8d10ce2158..0000000000
--- a/scripts/docs/typescript-package/processors/readTypeScriptModules.js
+++ /dev/null
@@ -1,461 +0,0 @@
-var glob = require('glob');
-var path = require('canonical-path');
-var _ = require('lodash');
-var ts = require('typescript');
-
-module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
-                                                getDirectiveInfo,
-                                                getExportDocType, getContent,
-                                                createDocMessage, log) {
-
-  return {
-    $runAfter: ['files-read'],
-    $runBefore: ['parsing-tags'],
-
-    $validate: {
-      sourceFiles: {presence: true},
-      basePath: {presence: true},
-      hidePrivateMembers: {inclusion: [true, false]},
-      sortClassMembers: {inclusion: [true, false]},
-      ignoreExportsMatching: {}
-    },
-
-    // A collection of globs that identify those modules for which we should create docs
-    sourceFiles: [],
-    // The base path from which to load the source files
-    basePath: '.',
-    // We can ignore members of classes that are private
-    hidePrivateMembers: true,
-    // We leave class members sorted in order of declaration
-    sortClassMembers: false,
-    // We can provide a collection of strings or regexes to ignore exports whose export names match
-    ignoreExportsMatching: ['___esModule'],
-
-    $process: function(docs) {
-
-      // Convert ignoreExportsMatching to an array of regexes
-      var ignoreExportsMatching = convertToRegexCollection(this.ignoreExportsMatching);
-
-      var hidePrivateMembers = this.hidePrivateMembers;
-      var sortClassMembers = this.sortClassMembers;
-
-      var basePath = path.resolve(this.basePath);
-      var filesPaths = expandSourceFiles(this.sourceFiles, basePath);
-      var parseInfo = tsParser.parse(filesPaths, this.basePath);
-      var moduleSymbols = parseInfo.moduleSymbols;
-
-      // Iterate through each of the modules that were parsed and generate a module doc
-      // as well as docs for each module's exports.
-      moduleSymbols.forEach(function(moduleSymbol) {
-
-        var moduleDoc = createModuleDoc(moduleSymbol, basePath);
-
-        // Add this module doc to the module lookup collection and the docs collection
-        modules[moduleDoc.id] = moduleDoc;
-        docs.push(moduleDoc);
-
-        // Iterate through this module's exports and generate a doc for each
-        moduleSymbol.exportArray.forEach(function(exportSymbol) {
-
-          // Ignore exports starting with an underscore
-          if (anyMatches(ignoreExportsMatching, exportSymbol.name)) return;
-
-          // If the symbol is an Alias then for most things we want the original resolved symbol
-          var resolvedExport = exportSymbol.resolvedSymbol || exportSymbol;
-
-          // If the resolved symbol contains no declarations then it is invalid
-          // (probably an abstract class)
-          // For the moment we are just going to ignore such exports
-          // TODO: find a way of generating docs for them
-          if (!resolvedExport.declarations) return;
-
-          var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker);
-
-          // Ignore exports marked as "@private" in jsDoc content
-          var jsDocContainsPrivate = (exportDoc.content || '').split('\n').some(function(commentRow) {
-            return commentRow.search(/@private|@access private/) >= 0;
-          });
-          if (jsDocContainsPrivate) return;
-
-          log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id);
-
-          // Add this export doc to its module doc
-          moduleDoc.exports.push(exportDoc);
-          docs.push(exportDoc);
-
-          exportDoc.members = [];
-          exportDoc.statics = [];
-
-          // Generate docs for each of the export's members
-          if (resolvedExport.flags & ts.SymbolFlags.HasMembers) {
-
-            for(var memberName in resolvedExport.members) {
-              // FIXME(alexeagle): why do generic type params appear in members?
-              if (memberName === 'T') {
-                continue;
-              }
-              log.silly('>>>>>> member: ' + memberName + ' from ' + exportDoc.id + ' in ' + moduleDoc.id);
-              var memberSymbol = resolvedExport.members[memberName];
-              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
-
-              // We special case the constructor and sort the other members alphabetically
-              if (memberSymbol.flags & ts.SymbolFlags.Constructor) {
-                exportDoc.constructorDoc = memberDoc;
-                docs.push(memberDoc);
-              } else if (!hidePrivateMembers || memberSymbol.name.charAt(0) !== '_') {
-                docs.push(memberDoc);
-                exportDoc.members.push(memberDoc);
-              } else if (memberSymbol.name === '__call' && memberSymbol.flags & ts.SymbolFlags.Signature) {
-                docs.push(memberDoc);
-                exportDoc.callMember = memberDoc;
-              } else if (memberSymbol.name === '__new' && memberSymbol.flags & ts.SymbolFlags.Signature) {
-                docs.push(memberDoc);
-                exportDoc.newMember = memberDoc;
-              }
-            }
-          }
-
-          if (exportDoc.docType === 'enum') {
-            for(var memberName in resolvedExport.exports) {
-              log.silly('>>>>>> member: ' + memberName + ' from ' + exportDoc.id + ' in ' + moduleDoc.id);
-              var memberSymbol = resolvedExport.exports[memberName];
-              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
-              docs.push(memberDoc);
-              exportDoc.members.push(memberDoc);
-            }
-          } else if (resolvedExport.flags & ts.SymbolFlags.HasExports) {
-            for (var exported in resolvedExport.exports) {
-              if (exported === 'prototype') continue;
-              if (hidePrivateMembers && exported.charAt(0) === '_') continue;
-              var memberSymbol = resolvedExport.exports[exported];
-              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
-              memberDoc.isStatic = true;
-              docs.push(memberDoc);
-              exportDoc.statics.push(memberDoc);
-            }
-          }
-
-          if (sortClassMembers) {
-            exportDoc.members.sort(function(a, b) {
-              if (a.name > b.name) return 1;
-              if (a.name < b.name) return -1;
-              return 0;
-            });
-            exportDoc.statics.sort(function(a, b) {
-              if (a.name > b.name) return 1;
-              if (a.name < b.name) return -1;
-              return 0;
-            });
-          }
-        });
-      });
-    }
-  };
-
-
-  function createModuleDoc(moduleSymbol, basePath) {
-    var id = moduleSymbol.name.replace(/^"|"$/g, '');
-    var name = id.split('/').pop();
-    var moduleDoc = {
-      docType: 'module',
-      name: name,
-      id: id,
-      aliases: [id, name],
-      moduleTree: moduleSymbol,
-      content: getContent(moduleSymbol),
-      exports: [],
-      fileInfo: getFileInfo(moduleSymbol, basePath),
-      location: getLocation(moduleSymbol)
-    };
-    return moduleDoc;
-  }
-
-  function createExportDoc(name, exportSymbol, moduleDoc, basePath, typeChecker) {
-    var typeParamString = '';
-    var heritageString = '';
-    var typeDefinition = '';
-
-    exportSymbol.declarations.forEach(function(decl) {
-      var sourceFile = ts.getSourceFileOfNode(decl);
-
-      if (decl.typeParameters) {
-        typeParamString = '<' + getText(sourceFile, decl.typeParameters) + '>';
-      }
-
-      if (decl.symbol.flags & ts.SymbolFlags.TypeAlias) {
-        typeDefinition = getText(sourceFile, decl.type);
-      }
-
-      if (decl.heritageClauses) {
-        decl.heritageClauses.forEach(function(heritage) {
-
-          if (heritage.token == ts.SyntaxKind.ExtendsKeyword) {
-            heritageString += " extends";
-            heritage.types.forEach(function(typ, idx) {
-              heritageString += (idx > 0 ? ',' : '') + typ.getFullText();
-            });
-          }
-
-          if (heritage.token == ts.SyntaxKind.ImplementsKeyword) {
-            heritageString += " implements";
-            heritage.types.forEach(function(typ, idx) {
-              heritageString += (idx > 0 ? ', ' : '') + typ.getFullText();
-            });
-          }
-        });
-      }
-    });
-
-    //Make sure duplicate aliases aren't created, so "Ambiguous link" warnings are prevented
-    var aliasNames = [name, moduleDoc.id + '/' + name];
-    if (typeParamString) {
-      aliasNames.push(name + typeParamString);
-      aliasNames.push(moduleDoc.id + '/' + name + typeParamString);
-    }
-
-    var exportDoc = {
-      docType: getExportDocType(exportSymbol),
-      exportSymbol: exportSymbol,
-      name: name,
-      id: moduleDoc.id + '/' + name,
-      typeParams: typeParamString,
-      heritage: heritageString,
-      decorators: getDecorators(exportSymbol),
-      aliases: aliasNames,
-      moduleDoc: moduleDoc,
-      content: getContent(exportSymbol),
-      fileInfo: getFileInfo(exportSymbol, basePath),
-      location: getLocation(exportSymbol),
-      directiveInfo: getDirectiveInfo(exportSymbol)
-    };
-
-    if (exportDoc.docType === 'var' || exportDoc.docType === 'const' || exportDoc.docType === 'let') {
-      exportDoc.symbolTypeName = exportSymbol.valueDeclaration.type &&
-                                 exportSymbol.valueDeclaration.type.typeName &&
-                                 exportSymbol.valueDeclaration.type.typeName.text;
-    }
-
-    if (exportDoc.docType === 'type-alias') {
-      exportDoc.returnType = getReturnType(typeChecker, exportSymbol);
-    }
-
-    if(exportSymbol.flags & ts.SymbolFlags.Function) {
-      exportDoc.parameters = getParameters(typeChecker, exportSymbol);
-    }
-    if(exportSymbol.flags & ts.SymbolFlags.Value) {
-      exportDoc.returnType = getReturnType(typeChecker, exportSymbol);
-    }
-    if (exportSymbol.flags & ts.SymbolFlags.TypeAlias) {
-      exportDoc.typeDefinition = typeDefinition;
-    }
-
-    // Compute the original module name from the relative file path
-    exportDoc.originalModule = exportDoc.fileInfo.relativePath
-        .replace(new RegExp('\.' + exportDoc.fileInfo.extension + '$'), '');
-
-    return exportDoc;
-  }
-
-  function createMemberDoc(memberSymbol, classDoc, basePath, typeChecker) {
-    var memberDoc = {
-      docType: 'member',
-      classDoc: classDoc,
-      name: memberSymbol.name,
-      decorators: getDecorators(memberSymbol),
-      content: getContent(memberSymbol),
-      fileInfo: getFileInfo(memberSymbol, basePath),
-      location: getLocation(memberSymbol)
-    };
-
-    memberDoc.typeParameters = getTypeParameters(typeChecker, memberSymbol);
-
-    if(memberSymbol.flags & (ts.SymbolFlags.Signature) ) {
-      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
-      memberDoc.returnType = getReturnType(typeChecker, memberSymbol);
-      switch(memberDoc.name) {
-        case '__call':
-          memberDoc.name = '';
-          break;
-        case '__new':
-          memberDoc.name = 'new';
-          break;
-      }
-    }
-
-    if (memberSymbol.flags & ts.SymbolFlags.Method) {
-      // NOTE: we use the property name `parameters` here so we don't conflict
-      // with the `params` property that will be updated by dgeni reading the
-      // `@param` tags from the docs
-      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
-    }
-
-    if (memberSymbol.flags & ts.SymbolFlags.Constructor) {
-      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
-      memberDoc.name = 'constructor';
-    }
-
-    if(memberSymbol.flags & ts.SymbolFlags.Value) {
-      memberDoc.returnType = getReturnType(typeChecker, memberSymbol);
-    }
-
-    if(memberSymbol.flags & ts.SymbolFlags.Optional) {
-      memberDoc.optional = true;
-    }
-
-    return memberDoc;
-  }
-
-
-  function getDecorators(symbol) {
-
-    var declaration = symbol.valueDeclaration || symbol.declarations[0];
-    var sourceFile = ts.getSourceFileOfNode(declaration);
-
-    var decorators = declaration.decorators && declaration.decorators.map(function(decorator) {
-      decorator = decorator.expression;
-      return {
-        name: decorator.expression ? decorator.expression.text : decorator.text,
-        arguments: decorator.arguments && decorator.arguments.map(function(argument) {
-          return getText(sourceFile, argument).trim();
-        }),
-        argumentInfo: decorator.arguments && decorator.arguments.map(function(argument) {
-          return parseArgument(argument);
-        }),
-        expression: decorator
-      };
-    });
-    return decorators;
-  }
-
-  function parseProperties(properties) {
-    var result = {};
-    _.forEach(properties, function(property) {
-      result[property.name.text] = parseArgument(property.initializer);
-    });
-    return result;
-  }
-
-  function parseArgument(argument) {
-    if (argument.text) return argument.text;
-    if (argument.properties) return parseProperties(argument.properties);
-    if (argument.elements) return argument.elements.map(function(element) { return element.text; });
-    var sourceFile = ts.getSourceFileOfNode(argument);
-    var text = getText(sourceFile, argument).trim();
-    return text;
-  }
-
-  function getParameters(typeChecker, symbol) {
-    var declaration = symbol.valueDeclaration || symbol.declarations[0];
-    var sourceFile = ts.getSourceFileOfNode(declaration);
-    if (!declaration.parameters) {
-      var location = getLocation(symbol);
-      throw new Error('missing declaration parameters for "' + symbol.name +
-        '" in ' + sourceFile.fileName +
-        ' at line ' + location.start.line);
-    }
-    return declaration.parameters.map(function(parameter) {
-      var paramText = '';
-      if (parameter.dotDotDotToken) {
-        paramText += '...';
-      }
-      paramText += getText(sourceFile, parameter.name);
-      if (parameter.questionToken || parameter.initializer) {
-        paramText += '?';
-      }
-      if (parameter.type) {
-        paramText += ':' + getType(sourceFile, parameter.type);
-      } else {
-        paramText += ': any';
-        if (parameter.dotDotDotToken) {
-          paramText += '[]';
-        }
-      }
-      return paramText.trim();
-    });
-  }
-
-  function getTypeParameters(typeChecker, symbol) {
-    var declaration = symbol.valueDeclaration || symbol.declarations[0];
-    var sourceFile = ts.getSourceFileOfNode(declaration);
-    if (!declaration.typeParameters) return;
-    var typeParams = declaration.typeParameters.map(function(type) {
-      return getText(sourceFile, type).trim();
-    });
-    return typeParams;
-  }
-
-  function getReturnType(typeChecker, symbol) {
-    var declaration = symbol.valueDeclaration || symbol.declarations[0];
-    var sourceFile = ts.getSourceFileOfNode(declaration);
-    if (declaration.type) {
-      return getType(sourceFile, declaration.type).trim();
-    } else if (declaration.initializer) {
-      // The symbol does not have a "type" but it is being initialized
-      // so we can deduce the type of from the initializer (mostly).
-      if (declaration.initializer.expression) {
-        return declaration.initializer.expression.text.trim();
-      } else {
-        return getType(sourceFile, declaration.initializer).trim();
-      }
-    }
-  }
-
-
-  function expandSourceFiles(sourceFiles, basePath) {
-    var filePaths = [];
-    sourceFiles.forEach(function(sourcePattern) {
-      filePaths = filePaths.concat(glob.sync(sourcePattern, { cwd: basePath }));
-    });
-    return filePaths;
-  }
-
-
-  function getText(sourceFile, node) {
-    return sourceFile.text.substring(node.pos, node.end);
-  }
-
-
-  // Strip any local renamed imports from the front of types
-  function getType(sourceFile, type) {
-    var text = getText(sourceFile, type);
-    while (text.indexOf(".") >= 0) {
-      // Keep namespaced symbols in RxNext
-      if (text.match(/^\s*RxNext\./)) break;
-      // handle the case List<thing.stuff> -> List<stuff>
-      text = text.replace(/([^.<]*)\.([^>]*)/, "$2");
-    }
-    return text;
-  }
-
-  function getLocation(symbol) {
-    var node = symbol.valueDeclaration || symbol.declarations[0];
-    var sourceFile = ts.getSourceFileOfNode(node);
-    var location = {
-      start: ts.getLineAndCharacterOfPosition(sourceFile, node.pos),
-      end: ts.getLineAndCharacterOfPosition(sourceFile, node.end)
-    };
-    return location;
-  }
-
-};
-
-function convertToRegexCollection(items) {
-  if (!items) return [];
-
-  // Must be an array
-  if (!_.isArray(items)) {
-    items = [items];
-  }
-
-  // Convert string to exact matching regexes
-  return items.map(function(item) {
-    return _.isString(item) ? new RegExp('^' + item + '$') : item;
-  });
-}
-
-function anyMatches(regexes, item) {
-  for(var i=0; i<regexes.length; ++i) {
-    if ( item.match(regexes[i]) ) return true;
-  }
-  return false;
-}
diff --git a/scripts/docs/typescript-package/processors/readTypeScriptModules.spec.js b/scripts/docs/typescript-package/processors/readTypeScriptModules.spec.js
deleted file mode 100755
index 1224acc58d..0000000000
--- a/scripts/docs/typescript-package/processors/readTypeScriptModules.spec.js
+++ /dev/null
@@ -1,136 +0,0 @@
-var mockPackage = require('../mocks/mockPackage');
-var Dgeni = require('dgeni');
-var path = require('canonical-path');
-var _ = require('lodash');
-
-describe('readTypeScriptModules', function() {
-  var dgeni, injector, processor;
-
-  beforeEach(function() {
-    dgeni = new Dgeni([mockPackage()]);
-    injector = dgeni.configureInjector();
-    processor = injector.get('readTypeScriptModules');
-    processor.basePath = path.resolve(__dirname, '../mocks/readTypeScriptModules');
-  });
-
-  describe('exportDocs', function() {
-    it('should provide the original module if the export is re-exported', function() {
-      processor.sourceFiles = [ 'publicModule.ts' ];
-      var docs = [];
-      processor.$process(docs);
-
-      var exportedDoc = docs[1];
-      expect(exportedDoc.originalModule).toEqual('privateModule');
-    });
-
-    it('should include exported abstract classes', function() {
-      processor.sourceFiles = [ 'publicModule.ts' ];
-      var docs = [];
-      processor.$process(docs);
-
-      var exportedDoc = docs[2];
-      expect(exportedDoc.name).toEqual('AbstractClass');
-    });
-
-  });
-
-
-  describe('ignoreExportsMatching', function() {
-    it('should ignore exports that match items in the `ignoreExportsMatching` property', function() {
-      processor.sourceFiles = [ 'ignoreExportsMatching.ts'];
-      processor.ignoreExportsMatching = [/^_/];
-      var docs = [];
-      processor.$process(docs);
-
-      var moduleDoc = docs[0];
-      expect(moduleDoc.docType).toEqual('module');
-      expect(moduleDoc.exports).toEqual([
-        jasmine.objectContaining({ name: 'OKToExport' }),
-        jasmine.objectContaining({ name: 'thisIsOK' })
-      ]);
-    });
-
-    it('should only ignore `___esModule` exports by default', function() {
-      processor.sourceFiles = [ 'ignoreExportsMatching.ts'];
-      var docs = [];
-      processor.$process(docs);
-
-      var moduleDoc = docs[0];
-      expect(moduleDoc.docType).toEqual('module');
-      expect(getNames(moduleDoc.exports)).toEqual([
-        'OKToExport',
-        '_thisIsPrivate',
-        'thisIsOK'
-      ]);
-    });
-  });
-
-
-  describe('interfaces', function() {
-
-    it('should mark optional properties', function() {
-      processor.sourceFiles = [ 'interfaces.ts'];
-      var docs = [];
-      processor.$process(docs);
-
-      var moduleDoc = docs[0];
-      var exportedInterface = moduleDoc.exports[0];
-      var member = exportedInterface.members[0];
-      expect(member.name).toEqual('optionalProperty');
-      expect(member.optional).toEqual(true);
-    });
-
-
-    it('should handle "call" type interfaces', function() {
-      processor.sourceFiles = [ 'interfaces.ts'];
-      var docs = [];
-      processor.$process(docs);
-
-      var moduleDoc = docs[0];
-      var exportedInterface = moduleDoc.exports[0];
-
-      expect(exportedInterface.callMember).toBeDefined();
-      expect(exportedInterface.callMember.parameters).toEqual(['param: T']);
-      expect(exportedInterface.callMember.returnType).toEqual('U');
-      expect(exportedInterface.callMember.typeParameters).toEqual(['T', 'U extends Findable<T>']);
-      expect(exportedInterface.newMember).toBeDefined();
-      expect(exportedInterface.newMember.parameters).toEqual(['param: number']);
-      expect(exportedInterface.newMember.returnType).toEqual('MyInterface');
-    });
-  });
-
-
-  describe('ordering of members', function() {
-    it('should order class members in order of appearance (by default)', function() {
-      processor.sourceFiles = ['orderingOfMembers.ts'];
-      var docs = [];
-      processor.$process(docs);
-      var classDoc = _.find(docs, { docType: 'class' });
-      expect(classDoc.docType).toEqual('class');
-      expect(getNames(classDoc.members)).toEqual([
-        'firstItem',
-        'otherMethod',
-        'doStuff',
-      ]);
-    });
-
-
-    it('should not order class members if not sortClassMembers is false', function() {
-      processor.sourceFiles = ['orderingOfMembers.ts'];
-      processor.sortClassMembers = false;
-      var docs = [];
-      processor.$process(docs);
-      var classDoc = _.find(docs, { docType: 'class' });
-      expect(classDoc.docType).toEqual('class');
-      expect(getNames(classDoc.members)).toEqual([
-        'firstItem',
-        'otherMethod',
-        'doStuff'
-      ]);
-    });
-  });
-});
-
-function getNames(collection) {
-  return collection.map(function(item) { return item.name; });
-}
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.js b/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.js
deleted file mode 100755
index 69afdea89e..0000000000
--- a/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var _ = require('lodash');
-
-module.exports = function convertPrivateClassesToInterfaces() {
-  return function(exportDocs, addInjectableReference) {
-    _.forEach(exportDocs, function(exportDoc) {
-
-      // Search for classes with a constructor marked as `@internal`
-      if (exportDoc.docType === 'class' && exportDoc.constructorDoc && exportDoc.constructorDoc.internal) {
-
-        // Convert this class to an interface with no constructor
-        exportDoc.docType = 'interface';
-        exportDoc.constructorDoc = null;
-
-        if (exportDoc.heritage) {
-          // convert the heritage since interfaces use `extends` not `implements`
-          exportDoc.heritage = exportDoc.heritage.replace('implements', 'extends');
-        }
-
-        if (addInjectableReference) {
-          // Add the `declare var SomeClass extends InjectableReference` construct
-          exportDocs.push({
-            docType: 'var',
-            name: exportDoc.name,
-            id: exportDoc.id,
-            returnType: 'InjectableReference'
-          });
-        }
-      }
-    });
-  };
-};
diff --git a/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.spec.js b/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.spec.js
deleted file mode 100755
index bc4ed7411c..0000000000
--- a/scripts/docs/typescript-package/services/convertPrivateClassesToInterfaces.spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var mockPackage = require('../mocks/mockPackage');
-var Dgeni = require('dgeni');
-var _ = require('lodash');
-
-describe('readTypeScriptModules', function() {
-  var dgeni, injector, convertPrivateClassesToInterfaces;
-
-  beforeEach(function() {
-    dgeni = new Dgeni([mockPackage()]);
-    injector = dgeni.configureInjector();
-    convertPrivateClassesToInterfaces = injector.get('convertPrivateClassesToInterfaces');
-  });
-
-  it('should convert private class docs to interface docs', function() {
-    var docs = [
-      {
-        docType: 'class',
-        name: 'privateClass',
-        id: 'privateClass',
-        constructorDoc: { internal: true }
-      }
-    ];
-    convertPrivateClassesToInterfaces(docs, false);
-    expect(docs[0].docType).toEqual('interface');
-  });
-
-
-  it('should not touch non-private class docs', function() {
-    var docs = [
-      {
-        docType: 'class',
-        name: 'privateClass',
-        id: 'privateClass',
-        constructorDoc: { }
-      }
-    ];
-    convertPrivateClassesToInterfaces(docs, false);
-    expect(docs[0].docType).toEqual('class');
-  });
-
-
-  it('should convert the heritage since interfaces use `extends` not `implements`', function() {
-    var docs = [
-      {
-        docType: 'class',
-        name: 'privateClass',
-        id: 'privateClass',
-        constructorDoc: { internal: true },
-        heritage: 'implements parentInterface'
-      }
-    ];
-    convertPrivateClassesToInterfaces(docs, false);
-    expect(docs[0].heritage).toEqual('extends parentInterface');
-  });
-
-
-  it('should add new injectable reference types, if specified, to the passed in collection', function() {
-    var docs = [
-      {
-        docType: 'class',
-        name: 'privateClass',
-        id: 'privateClass',
-        constructorDoc: { internal: true },
-        heritage: 'implements parentInterface'
-      }
-    ];
-    convertPrivateClassesToInterfaces(docs, true);
-    expect(docs[1]).toEqual({
-      docType : 'var',
-      name : 'privateClass',
-      id : 'privateClass',
-      returnType : 'InjectableReference'
-    });
-  });
-
-});
diff --git a/scripts/docs/typescript-package/services/modules.js b/scripts/docs/typescript-package/services/modules.js
deleted file mode 100755
index 7601390220..0000000000
--- a/scripts/docs/typescript-package/services/modules.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = function modules() {
-  return {};
-};
diff --git a/scripts/docs/typescript-package/services/tsParser/createCompilerHost.js b/scripts/docs/typescript-package/services/tsParser/createCompilerHost.js
deleted file mode 100755
index c9d3d368b4..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/createCompilerHost.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var ts = require('typescript');
-var fs = require('fs');
-var path = require('canonical-path');
-
-// We need to provide our own version of CompilerHost because we want to set the
-// base directory and specify what extensions to consider when trying to load a source
-// file
-module.exports = function createCompilerHost(log) {
-
-  return function createCompilerHost(options, baseDir, extensions) {
-
-    return {
-      getSourceFile: function(fileName, languageVersion, onError) {
-        var text, resolvedPath, resolvedPathWithExt;
-
-        // Strip off the extension and resolve relative to the baseDir
-        baseFilePath = fileName.replace(/\.[^.]+$/, '');
-        resolvedPath = path.resolve(baseDir, baseFilePath);
-
-        // Iterate through each possible extension and return the first source file that is actually found
-        for(var i=0; i<extensions.length; i++) {
-
-          // Try reading the content from files using each of the given extensions
-          try {
-            resolvedPathWithExt = resolvedPath + extensions[i];
-            log.silly('getSourceFile:', resolvedPathWithExt);
-            text = fs.readFileSync(resolvedPathWithExt, { encoding: options.charset });
-            log.debug('found source file:', fileName, resolvedPathWithExt);
-            return ts.createSourceFile(baseFilePath + extensions[i], text, languageVersion);
-          }
-          catch(e) {
-            // Try again if the file simply did not exist, otherwise report the error as a warning
-            if(e.code !== 'ENOENT') {
-              if (onError) onError(e.message);
-              log.warn('Error reading ' + resolvedPathWithExt + ' : ' + e.message);
-            }
-          }
-        }
-      },
-      getDefaultLibFileName: function(options) {
-        return path.resolve(path.dirname(ts.sys.getExecutingFilePath()), ts.getDefaultLibFileName(options));
-      },
-      writeFile: function(fileName, data, writeByteOrderMark, onError) {
-        // no-op
-      },
-      getCurrentDirectory: function() {
-        return baseDir;
-      },
-      useCaseSensitiveFileNames: function() {
-        return ts.sys.useCaseSensitiveFileNames;
-      },
-      getCanonicalFileName: function(fileName) {
-        // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-        // otherwise use toLowerCase as a canonical form.
-        return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-      },
-      getNewLine: function() {
-        return ts.sys.newLine;
-      },
-      fileExists: function(fileName) {
-        var text, resolvedPath, resolvedPathWithExt;
-
-        // Strip off the extension and resolve relative to the baseDir
-        baseFilePath = fileName.replace(/\.[^.]+$/, '');
-        resolvedPath = path.resolve(baseDir, baseFilePath);
-
-        // Iterate through each possible extension and return the first source file that is actually found
-        for(var i=0; i<extensions.length; i++) {
-          // Try reading the content from files using each of the given extensions
-          resolvedPathWithExt = resolvedPath + extensions[i];
-          if (fs.existsSync(resolvedPathWithExt)) return true;
-        }
-        return false;
-      },
-      readFile: function(fileName) {
-        console.log('readFile - NOT IMPLEMENTED', fileName);
-      }
-    };
-  };
-};
diff --git a/scripts/docs/typescript-package/services/tsParser/createCompilerHost.spec.js b/scripts/docs/typescript-package/services/tsParser/createCompilerHost.spec.js
deleted file mode 100755
index 8c24c6c8b7..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/createCompilerHost.spec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var mockPackage = require('../../mocks/mockPackage');
-var Dgeni = require('dgeni');
-var path = require('canonical-path');
-var ts = require('typescript');
-
-describe('createCompilerHost', function() {
-  var dgeni, injector, options, host, baseDir, extensions;
-
-  beforeEach(function() {
-    dgeni = new Dgeni([mockPackage()]);
-    injector = dgeni.configureInjector();
-    var createCompilerHost = injector.get('createCompilerHost');
-
-    options = { charset: 'utf8' };
-    baseDir = path.resolve(__dirname, '../../mocks/tsParser');
-    extensions = ['.ts', '.js'];
-
-    host = createCompilerHost(options, baseDir, extensions);
-  });
-
-  describe('getSourceFile', function() {
-    it('should return a SourceFile object for a given path, with fileName relative to baseDir', function() {
-      var sourceFile = host.getSourceFile('testSrc.ts');
-      expect(sourceFile.fileName).toEqual('testSrc.ts');
-      expect(sourceFile.pos).toEqual(0);
-      expect(sourceFile.text).toEqual(jasmine.any(String));
-    });
-
-    it('should try each of the configured extensions and update the filename to the correct extension', function() {
-      var sourceFile = host.getSourceFile('testSrc.js');
-      expect(sourceFile.fileName).toEqual('testSrc.ts');
-
-      sourceFile = host.getSourceFile('../mockPackage.ts');
-      expect(sourceFile.fileName).toEqual('../mockPackage.js');
-    });
-  });
-
-
-  describe('getDefaultLibFileName', function() {
-    it('should return a path to the default library', function() {
-      expect(host.getDefaultLibFileName(options)).toContain('typescript/lib/lib.d.ts');
-    });
-  });
-
-
-  describe('writeFile', function() {
-    it('should do nothing', function() {
-      host.writeFile();
-    });
-  });
-
-
-  describe('getCurrentDirectory', function() {
-    it('should return the baseDir', function() {
-      expect(host.getCurrentDirectory()).toEqual(baseDir);
-    });
-  });
-
-
-  describe('useCaseSensitiveFileNames', function() {
-    it('should return true if the OS is case sensitive', function() {
-      expect(host.useCaseSensitiveFileNames()).toBe(ts.sys.useCaseSensitiveFileNames);
-    });
-  });
-
-
-  describe('getCanonicalFileName', function() {
-    it('should lower case the filename', function() {
-      var expectedFilePath = host.useCaseSensitiveFileNames() ? 'SomeFile.ts' : 'somefile.ts';
-      expect(host.getCanonicalFileName('SomeFile.ts')).toEqual(expectedFilePath);
-    });
-  });
-
-
-  describe('getNewLine', function() {
-    it('should return the newline character for the OS', function() {
-      expect(host.getNewLine()).toEqual(require('os').EOL);
-    });
-  });
-});
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/services/tsParser/getContent.js b/scripts/docs/typescript-package/services/tsParser/getContent.js
deleted file mode 100755
index c7cbb36fc2..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/getContent.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var ts = require('typescript');
-var LEADING_STAR = /^[^\S\r\n]*\*[^\S\n\r]?/gm;
-
-module.exports = function getContent() {
-  return function(symbol) {
-
-    var content = "";
-
-    if (!symbol.declarations) return content;
-
-    symbol.declarations.forEach(function(declaration) {
-
-      // If this is left side of dotted module declaration, there is no doc comment associated with this declaration
-      if (declaration.kind === ts.SyntaxKind.ModuleDeclaration && declaration.body.kind === ts.SyntaxKind.ModuleDeclaration) {
-          return content;
-      }
-
-      // If this is dotted module name, get the doc comments from the parent
-      while (declaration.kind === ts.SyntaxKind.ModuleDeclaration && declaration.parent.kind === ts.SyntaxKind.ModuleDeclaration) {
-          declaration = declaration.parent;
-      }
-
-      // If this is a variable declaration then we get the doc comments from the grand parent
-      if (declaration.kind === ts.SyntaxKind.VariableDeclaration) {
-        declaration = declaration.parent.parent;
-      }
-
-      // Get the source file of this declaration
-      var sourceFile = ts.getSourceFileOfNode(declaration);
-      var commentRanges = ts.getJsDocComments(declaration, sourceFile);
-
-      if (commentRanges) {
-        commentRanges.forEach(function(commentRange) {
-          content += sourceFile.text
-              .substring(commentRange.pos+ '/**'.length, commentRange.end - '*/'.length)
-              .replace(LEADING_STAR, '')
-              .trim();
-          if (commentRange.hasTrailingNewLine) {
-            content += '\n';
-          }
-        });
-      }
-
-      content += '\n';
-    });
-
-    return content;
-  };
-};
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/services/tsParser/getDirectiveInfo.js b/scripts/docs/typescript-package/services/tsParser/getDirectiveInfo.js
deleted file mode 100644
index ff536bea51..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/getDirectiveInfo.js
+++ /dev/null
@@ -1,34 +0,0 @@
-
-module.exports = function getDirectiveInfo() {
-
-  return function (symbol) {
-    var directiveInfo;
-    if (symbol.valueDeclaration) {
-      var decorators = symbol.valueDeclaration.decorators;
-      decorators && decorators.forEach(function(decorator){
-        try {
-          var expr = decorator.expression;
-          var type = expr.expression.text.match(/Component|Directive/);
-          if (type) {
-            // type is either Component or Directive
-            // properties are selector, inputs and outputs
-            directiveInfo = { type: type[0], properties: [] };
-
-            //Directive only takes one argument
-            expr.arguments[0].properties.forEach(function(prop){
-              var name = prop.name.text;
-              if (name === "selector") {
-                directiveInfo.properties.push({name: name, values: prop.initializer.text.split(",")});
-              }
-              if (name === "inputs" || name === "outputs") {
-                var values = prop.initializer.elements.map(function(e){ return e.text });
-                directiveInfo.properties.push({name: name, values: values });
-              }
-            });
-          }
-        } catch(e){}
-      });
-    }
-    return directiveInfo;
-  };
-};
diff --git a/scripts/docs/typescript-package/services/tsParser/getExportDocType.js b/scripts/docs/typescript-package/services/tsParser/getExportDocType.js
deleted file mode 100755
index 01805d7da3..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/getExportDocType.js
+++ /dev/null
@@ -1,54 +0,0 @@
-var ts = require('typescript');
-
-module.exports = function getExportDocType(log) {
-
-  return function(symbol) {
-    if(symbol.flags & ts.SymbolFlags.Function) {
-      return 'function';
-    }
-    if(symbol.flags & ts.SymbolFlags.Class) {
-      return 'class';
-    }
-    if(symbol.flags & ts.SymbolFlags.Interface) {
-      return 'interface';
-    }
-    if(symbol.flags & ts.SymbolFlags.ConstEnum) {
-      return 'enum';
-    }
-    if(symbol.flags & ts.SymbolFlags.RegularEnum) {
-      return 'enum';
-    }
-    if(symbol.flags & ts.SymbolFlags.Property) {
-      return 'module-property';
-    }
-    if(symbol.flags & ts.SymbolFlags.TypeAlias) {
-      return 'type-alias';
-    }
-    if(symbol.flags & ts.SymbolFlags.FunctionScopedVariable) {
-      return 'var';
-    }
-    if(symbol.flags & ts.SymbolFlags.BlockScopedVariable) {
-      return getBlockScopedVariableDocType(symbol);
-    }
-
-    log.warn('getExportDocType(): Unknown symbol type', {
-      symbolName: symbol.name,
-      symbolType: symbol.flags,
-      symbolTarget: symbol.target,
-      file: ts.getSourceFileOfNode(symbol.declarations[0]).fileName
-    });
-    return 'unknown';
-  };
-
-  function getBlockScopedVariableDocType(symbol) {
-
-    var node = symbol.valueDeclaration;
-    while(node) {
-      if ( node.flags & 0x2000 /* const */) {
-        return 'const';
-      }
-      node = node.parent;
-    }
-    return 'let';
-  }
-};
diff --git a/scripts/docs/typescript-package/services/tsParser/getFileInfo.js b/scripts/docs/typescript-package/services/tsParser/getFileInfo.js
deleted file mode 100755
index 3074a084ac..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/getFileInfo.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var path = require('canonical-path');
-var ts = require('typescript');
-
-module.exports = function getFileInfo(log) {
-
-  return function (symbol, basePath) {
-    var fileName = ts.getSourceFileOfNode(symbol.declarations[0]).fileName;
-
-    var file = path.resolve(basePath, fileName);
-    var fileInfo = {
-      filePath: file,
-      baseName: path.basename(file, path.extname(file)),
-      extension: path.extname(file).replace(/^\./, ''),
-      basePath: basePath,
-      relativePath: fileName,
-      projectRelativePath: fileName
-    };
-    return fileInfo;
-  };
-};
\ No newline at end of file
diff --git a/scripts/docs/typescript-package/services/tsParser/index.js b/scripts/docs/typescript-package/services/tsParser/index.js
deleted file mode 100755
index e5ed07dca8..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var ts = require('typescript');
-var path = require('canonical-path');
-
-module.exports = function tsParser(createCompilerHost, log) {
-
-  return {
-
-    // These are the extension that we should consider when trying to load a module
-    // During migration from Traceur, there is a mix of `.ts`, `.es6` and `.js` (atScript)
-    // files in the project and the TypeScript compiler only looks for `.ts` files when trying
-    // to load imports.
-    extensions: ['.ts', '.js'],
-
-    // The options for the TS compiler
-    options: {
-      allowNonTsExtensions: true,
-      charset: 'utf8'
-    },
-
-    parse: function(fileNames, baseDir) {
-
-      // "Compile" a program from the given module filenames, to get hold of a
-      // typeChecker that can be used to interrogate the modules, exports and so on.
-      var host = createCompilerHost(this.options, baseDir, this.extensions);
-      var program = ts.createProgram(fileNames, this.options, host);
-      var typeChecker = program.getTypeChecker();
-
-      // Create an array of module symbols for each file we were given
-      var moduleSymbols = [];
-      fileNames.forEach(function(fileName) {
-        var sourceFile = program.getSourceFile(fileName);
-
-        if (!sourceFile) {
-          throw new Error('Invalid source file: ' + fileName);
-        } else if (!sourceFile.symbol) {
-          // Some files contain only a comment and no actual module code
-          log.warn('No module code found in ' + fileName);
-        } else {
-          moduleSymbols.push(sourceFile.symbol);
-        }
-      });
-
-
-      moduleSymbols.forEach(function(tsModule) {
-
-        // The type checker has a nice helper function that returns an array of Symbols
-        // representing the exports for a given module
-        tsModule.exportArray = typeChecker.getExportsOfModule(tsModule);
-
-        // Although 'star' imports (e.g. `export * from 'some/module';) get resolved automatically
-        // by the compiler/binder, it seems that explicit imports (e.g. `export { SomeClass } from 'some/module'`)
-        // do not so we have to do a little work.
-        tsModule.exportArray.forEach(function(moduleExport) {
-          if (moduleExport.flags & ts.SymbolFlags.Alias) {
-            // To maintain the alias information (particularly the alias name)
-            // we just attach the original "resolved" symbol to the alias symbol
-            moduleExport.resolvedSymbol = typeChecker.getAliasedSymbol(moduleExport);
-          }
-        });
-      });
-
-      moduleSymbols.typeChecker = typeChecker;
-
-      return {
-        moduleSymbols: moduleSymbols,
-        typeChecker: typeChecker,
-        program: program,
-        host: host
-      };
-    }
-  };
-
-
-};
diff --git a/scripts/docs/typescript-package/services/tsParser/index.spec.js b/scripts/docs/typescript-package/services/tsParser/index.spec.js
deleted file mode 100755
index 190b104c49..0000000000
--- a/scripts/docs/typescript-package/services/tsParser/index.spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var mockPackage = require('../../mocks/mockPackage');
-var Dgeni = require('dgeni');
-var path = require('canonical-path');
-
-describe('tsParser', function() {
-  var dgeni, injector, parser;
-
-  beforeEach(function() {
-    dgeni = new Dgeni([mockPackage()]);
-    injector = dgeni.configureInjector();
-    parser = injector.get('tsParser');
-  });
-
-  it("should parse a TS file", function() {
-    var parseInfo = parser.parse(['testSrc.ts'], path.resolve(__dirname, '../../mocks/tsParser'));
-    var tsModules = parseInfo.moduleSymbols;
-    expect(tsModules.length).toEqual(1);
-    expect(tsModules[0].exportArray.length).toEqual(3);
-    expect(tsModules[0].exportArray.map(function(i) { return i.name; })).toEqual(['MyClass', 'myFn', 'x']);
-  });
-});
\ No newline at end of file
diff --git a/src/animations/animation.ts b/src/animations/animation.ts
index aabeb857be..244fb3656c 100644
--- a/src/animations/animation.ts
+++ b/src/animations/animation.ts
@@ -3,7 +3,7 @@ import { Platform } from '../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  */
 export class Animation {
   private _c: Animation[];
@@ -169,7 +169,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    */
 
@@ -364,7 +364,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -396,7 +396,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * NO RECURSION
    * ROOT ANIMATION
@@ -428,7 +428,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -461,7 +461,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -482,7 +482,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * NO RECURSION
    * ROOT ANIMATION
@@ -533,7 +533,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -566,7 +566,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    * RECURSION
    */
@@ -585,7 +585,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    * RECURSION
    */
@@ -614,7 +614,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    * NO RECURSION
    */
@@ -625,7 +625,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * NO RECURSION
    */
@@ -707,7 +707,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * NO RECURSION
    */
@@ -746,7 +746,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM READ
    * DOM WRITE
    * RECURSION
@@ -770,7 +770,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -823,7 +823,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM READ
    * RECURSION
    */
@@ -844,7 +844,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -865,7 +865,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   _setAfterStyles() {
@@ -939,7 +939,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * NO RECURSION
    */
@@ -983,7 +983,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -1063,7 +1063,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * RECURSION
    */
@@ -1114,7 +1114,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    * RECURSION
    */
@@ -1130,7 +1130,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO RECURSION
    */
   _didFinish(hasCompleted: boolean) {
@@ -1190,7 +1190,7 @@ export class Animation {
   }
 
   /**
-   * @private
+   * @hidden
    * NO DOM
    */
   _transEl(): HTMLElement {
diff --git a/src/components/action-sheet/action-sheet-component.ts b/src/components/action-sheet/action-sheet-component.ts
index 5f379bf0c4..d45526cfa0 100644
--- a/src/components/action-sheet/action-sheet-component.ts
+++ b/src/components/action-sheet/action-sheet-component.ts
@@ -10,7 +10,7 @@ import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-action-sheet',
diff --git a/src/components/action-sheet/action-sheet.ts b/src/components/action-sheet/action-sheet.ts
index a9e3b9f5fe..f9ef7e7c5f 100644
--- a/src/components/action-sheet/action-sheet.ts
+++ b/src/components/action-sheet/action-sheet.ts
@@ -9,7 +9,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class ActionSheet extends ViewController {
   private _app: App;
@@ -31,7 +31,7 @@ export class ActionSheet extends ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransitionName(direction: string) {
     let key = 'actionSheet' + (direction === 'back' ? 'Leave' : 'Enter');
diff --git a/src/components/alert/alert-component.ts b/src/components/alert/alert-component.ts
index ec79700cb7..1cdd6c9bba 100644
--- a/src/components/alert/alert-component.ts
+++ b/src/components/alert/alert-component.ts
@@ -12,7 +12,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-alert',
diff --git a/src/components/alert/alert.ts b/src/components/alert/alert.ts
index d084858031..eef73f492e 100644
--- a/src/components/alert/alert.ts
+++ b/src/components/alert/alert.ts
@@ -9,7 +9,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class Alert extends ViewController {
   private _app: App;
@@ -32,7 +32,7 @@ export class Alert extends ViewController {
   }
 
   /**
-  * @private
+  * @hidden
   */
   getTransitionName(direction: string) {
     let key = (direction === 'back' ? 'alertLeave' : 'alertEnter');
diff --git a/src/components/app/app-root.ts b/src/components/app/app-root.ts
index 1cc152f1e5..bf25cc6804 100644
--- a/src/components/app/app-root.ts
+++ b/src/components/app/app-root.ts
@@ -11,7 +11,7 @@ import * as Constants from './app-constants';
 export const AppRootToken = new OpaqueToken('USERROOT');
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-app',
@@ -91,7 +91,7 @@ export class IonicApp extends Ion implements OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _getPortal(portal?: number): OverlayPortal {
     if (portal === Constants.PORTAL_LOADING) {
diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index fc8cf93b0a..f8eb5b9910 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -32,12 +32,12 @@ export class App {
   private _disableScrollAssist: boolean;
 
   /**
-   * @private
+   * @hidden
    */
   _clickBlock: ClickBlock;
 
   /**
-   * @private
+   * @hidden
    */
   _appRoot: IonicApp;
 
@@ -116,14 +116,14 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementClass(className: string, isAdd: boolean) {
     this._appRoot.setElementClass(className, isAdd);
   }
 
   /**
-   * @private
+   * @hidden
    * Sets if the app is currently enabled or not, meaning if it's
    * available to accept new user commands. For example, this is set to `false`
    * while views transition, a modal slides up, an action-sheet
@@ -150,7 +150,7 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    * Toggles whether an application can be scrolled
    * @param {boolean} disableScroll when set to `false`, the application's
    * scrolling is enabled. When set to `true`, scrolling is disabled.
@@ -162,7 +162,7 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    * Boolean if the app is actively enabled or not.
    * @return {boolean}
    */
@@ -175,7 +175,7 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setScrolling() {
     this._scrollTime = Date.now() + ACTIVE_SCROLLING_TIME;
@@ -216,14 +216,14 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setRootNav(nav: any) {
     this._rootNav = nav;
   }
 
   /**
-   * @private
+   * @hidden
    */
   present(enteringView: ViewController, opts: NavOptions, appPortal?: number): Promise<any> {
     const portal = this._appRoot._getPortal(appPortal);
@@ -250,7 +250,7 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    */
   goBack(): Promise<any> {
     if (this._menuCtrl && this._menuCtrl.isOpen()) {
@@ -270,7 +270,7 @@ export class App {
   }
 
   /**
-   * @private
+   * @hidden
    */
   navPop(): Promise<any> {
     if (!this._rootNav || !this.isEnabled()) {
diff --git a/src/components/backdrop/backdrop.ts b/src/components/backdrop/backdrop.ts
index 1f8d5c7ea7..c9b67e9ea6 100644
--- a/src/components/backdrop/backdrop.ts
+++ b/src/components/backdrop/backdrop.ts
@@ -1,7 +1,7 @@
 import { Directive, ElementRef, Renderer } from '@angular/core';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-backdrop',
diff --git a/src/components/button/button.ts b/src/components/button/button.ts
index 4638c413cb..165a351d25 100644
--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -131,25 +131,25 @@ import { isTrueProperty } from '../../util/util';
   encapsulation: ViewEncapsulation.None,
 })
 export class Button extends Ion {
-  /** @private */
+  /** @hidden */
   _role: string = 'button'; // bar-button
 
-  /** @private */
+  /** @hidden */
   _size: string; // large/small/default
 
-  /** @private */
+  /** @hidden */
   _style: string = 'default'; // outline/clear/solid
 
-  /** @private */
+  /** @hidden */
   _shape: string; // round/fab
 
-  /** @private */
+  /** @hidden */
   _display: string; // block/full
 
-  /** @private */
+  /** @hidden */
   _decorator: string; // strong
 
-  /** @private */
+  /** @hidden */
   _init: boolean;
 
   /**
@@ -245,7 +245,7 @@ export class Button extends Ion {
     this._assignCss(true);
   }
 
-  /** @private */
+  /** @hidden */
   _attr(type: string, attrName: string, attrValue: boolean) {
     if (type === '_style') {
       this._updateColor(this._color, false);
@@ -297,14 +297,14 @@ export class Button extends Ion {
     }
   }
 
-  /** @private */
+  /** @hidden */
   ngAfterContentInit() {
     this._init = true;
     this._assignCss(true);
   }
 
   /**
-   * @private
+   * @hidden
    */
   setRole(val: string) {
     this._assignCss(false);
@@ -313,7 +313,7 @@ export class Button extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _assignCss(assignCssClass: boolean) {
     let role = this._role;
@@ -331,7 +331,7 @@ export class Button extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setClass(type: string, assignCssClass: boolean) {
     if (type && this._init) {
@@ -342,7 +342,7 @@ export class Button extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _updateColor(color: string, isAdd: boolean) {
     if (color && this._init) {
diff --git a/src/components/card/card-content.ts b/src/components/card/card-content.ts
index b29d815743..67aedf8568 100644
--- a/src/components/card/card-content.ts
+++ b/src/components/card/card-content.ts
@@ -4,7 +4,7 @@ import { Config } from '../../config/config';
 import { Ion } from '../ion';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-card-content'
diff --git a/src/components/card/card-header.ts b/src/components/card/card-header.ts
index 8894cf4ac6..8ae81eaca5 100644
--- a/src/components/card/card-header.ts
+++ b/src/components/card/card-header.ts
@@ -4,7 +4,7 @@ import { Config } from '../../config/config';
 import { Ion } from '../ion';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-card-header'
diff --git a/src/components/card/card-title.ts b/src/components/card/card-title.ts
index 1e9bf73349..0dd9319440 100644
--- a/src/components/card/card-title.ts
+++ b/src/components/card/card-title.ts
@@ -4,7 +4,7 @@ import { Config } from '../../config/config';
 import { Ion } from '../ion';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-card-title'
diff --git a/src/components/card/card.ts b/src/components/card/card.ts
index 366abe0169..641d8dd401 100644
--- a/src/components/card/card.ts
+++ b/src/components/card/card.ts
@@ -5,7 +5,7 @@ import { Ion } from '../ion';
 
 
 /**
-  * @private
+  * @hidden
   */
 @Directive({
   selector: 'ion-card'
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
index 5e704bf46b..c8344ae516 100644
--- a/src/components/checkbox/checkbox.ts
+++ b/src/components/checkbox/checkbox.ts
@@ -73,17 +73,17 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
   encapsulation: ViewEncapsulation.None,
 })
 export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, ControlValueAccessor, OnDestroy {
-  /** @private */
+  /** @hidden */
   _checked: boolean = false;
-  /** @private */
+  /** @hidden */
   _init: boolean;
-  /** @private */
+  /** @hidden */
   _disabled: boolean = false;
-  /** @private */
+  /** @hidden */
   _labelId: string;
-  /** @private */
+  /** @hidden */
   _fn: Function;
-  /** @private */
+  /** @hidden */
   id: string;
 
   /**
@@ -131,7 +131,7 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   @HostListener('click', ['$event'])
   _click(ev: UIEvent) {
@@ -155,7 +155,7 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setChecked(isChecked: boolean) {
     if (isChecked !== this._checked) {
@@ -168,14 +168,14 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     this._setChecked(isTrueProperty(val));
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
@@ -188,7 +188,7 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
 
@@ -206,7 +206,7 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(isChecked: boolean) {
     // used when this input does not have an ngModel or formControlName
@@ -217,33 +217,33 @@ export class Checkbox extends Ion implements IonicTapInput, AfterContentInit, Co
   }
 
   /**
-   * @private
+   * @hidden
    */
   initFocus() {
     this._elementRef.nativeElement.querySelector('button').focus();
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() { }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._init = true;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form.deregister(this);
diff --git a/src/components/content/content.ts b/src/components/content/content.ts
index 4fe7b09ea0..84dec0ae89 100644
--- a/src/components/content/content.ts
+++ b/src/components/content/content.ts
@@ -183,7 +183,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   private _imgRndBfr: number;
   private _imgVelMax: number;
 
-  /** @private */
+  /** @hidden */
   statusbarPadding: boolean;
 
   /**
@@ -372,7 +372,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     if (this._scrollEle) return;
@@ -410,7 +410,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._scLsn && this._scLsn();
@@ -422,14 +422,14 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getScrollElement(): HTMLElement {
     return this._scrollEle;
   }
 
   /**
-   * @private
+   * @hidden
    */
   onScrollElementTransitionEnd(callback: {(ev: TransitionEvent): void}) {
     this._plt.transitionEnd(this._scrollEle, callback);
@@ -471,7 +471,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   enableJsScroll() {
     this._scroll.enableJsScroll(this._cTop, this._cBottom);
@@ -492,21 +492,21 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   addImg(img: Img) {
     this._imgs.push(img);
   }
 
   /**
-   * @private
+   * @hidden
    */
   removeImg(img: Img) {
     removeArrayItem(this._imgs, img);
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   setScrollElementStyle(prop: string, val: any) {
@@ -559,7 +559,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    * Adds padding to the bottom of the scroll element when the keyboard is open
    * so content below the keyboard can be scrolled into view.
@@ -581,7 +581,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   clearScrollPaddingFocusOut() {
@@ -608,7 +608,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM READ
    */
   private _readDimensions() {
@@ -754,7 +754,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   private _writeDimensions() {
@@ -842,7 +842,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   imgsUpdate() {
     if (this._scroll.initialized && this._imgs.length && this.isImgsUpdatable()) {
@@ -851,7 +851,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
   }
 
   /**
-   * @private
+   * @hidden
    */
   isImgsUpdatable() {
     // an image is only "updatable" if the content isn't scrolling too fast
diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts
index 25c765a25e..a7a63b8487 100644
--- a/src/components/datetime/datetime.ts
+++ b/src/components/datetime/datetime.ts
@@ -280,7 +280,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   _locale: LocaleData = {};
 
   /**
-   * @private
+   * @hidden
    */
   id: string;
 
@@ -473,7 +473,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   open() {
     if (this._disabled) {
@@ -520,7 +520,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   generate(picker: Picker) {
     // if a picker format wasn't provided, then fallback
@@ -588,7 +588,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   validate(picker: Picker) {
     let i: number;
@@ -679,7 +679,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   divyColumns(picker: Picker) {
     let pickerColumns = picker.getColumns();
@@ -712,21 +712,21 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   setValue(newData: any) {
     updateDate(this._value, newData);
   }
 
   /**
-   * @private
+   * @hidden
    */
   getValue(): DateTimeData {
     return this._value;
   }
 
   /**
-   * @private
+   * @hidden
    */
   checkHasValue(inputValue: any) {
     if (this._item) {
@@ -735,7 +735,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   updateText() {
     // create the text of the formatted data
@@ -744,7 +744,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   calcMinMax(now?: Date) {
     const todaysYear = (now || new Date()).getFullYear();
@@ -807,7 +807,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     console.debug('datetime, writeValue', val);
@@ -817,7 +817,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     // first see if locale names were provided in the inputs
@@ -832,7 +832,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
@@ -850,12 +850,12 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(val: any) {
     // onChange used when there is not an formControlName
@@ -867,19 +867,19 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() { }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form.deregister(this);
@@ -887,7 +887,7 @@ export class DateTime extends Ion implements AfterContentInit, ControlValueAcces
 }
 
 /**
- * @private
+ * @hidden
  * Use to convert a string of comma separated numbers or
  * an array of numbers, and clean up any user input
  */
@@ -918,7 +918,7 @@ function convertToArrayOfNumbers(input: any, type: string): number[] {
 }
 
 /**
- * @private
+ * @hidden
  * Use to convert a string of comma separated strings or
  * an array of strings, and clean up any user input
  */
diff --git a/src/components/fab/fab-container.ts b/src/components/fab/fab-container.ts
index 0c254a67d1..08b0e1cffc 100644
--- a/src/components/fab/fab-container.ts
+++ b/src/components/fab/fab-container.ts
@@ -93,22 +93,22 @@ import { FabList } from './fab-list';
 export class FabContainer {
 
   /**
-   * @private
+   * @hidden
    */
   _events: UIEventManager;
 
   /**
-   * @private
+   * @hidden
    */
   _listsActive: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(FabButton) _mainButton: FabButton;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(FabList) _fabLists: QueryList<FabList>;
 
@@ -117,7 +117,7 @@ export class FabContainer {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     const mainButton = this._mainButton;
@@ -129,7 +129,7 @@ export class FabContainer {
   }
 
   /**
-   * @private
+   * @hidden
    */
   clickHandler(ev: any) {
     if (this.canActivateList(ev)) {
@@ -138,7 +138,7 @@ export class FabContainer {
   }
 
   /**
-   * @private
+   * @hidden
    */
   canActivateList(ev: any): boolean {
     if (this._fabLists.length > 0 && this._mainButton && ev.target) {
@@ -149,14 +149,14 @@ export class FabContainer {
   }
 
   /**
-   * @private
+   * @hidden
    */
   toggleList() {
     this.setActiveLists(!this._listsActive);
   }
 
   /**
-   * @private
+   * @hidden
    */
   setActiveLists(isActive: boolean) {
     if (isActive === this._listsActive) {
@@ -178,7 +178,7 @@ export class FabContainer {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._events.destroy();
diff --git a/src/components/fab/fab-list.ts b/src/components/fab/fab-list.ts
index 34516a0a0f..13cc712f60 100644
--- a/src/components/fab/fab-list.ts
+++ b/src/components/fab/fab-list.ts
@@ -58,7 +58,7 @@ export class FabList {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setVisible(val: boolean) {
     let visible = isTrueProperty(val);
diff --git a/src/components/fab/fab.ts b/src/components/fab/fab.ts
index 47af1d81ab..1cfd30833c 100755
--- a/src/components/fab/fab.ts
+++ b/src/components/fab/fab.ts
@@ -91,7 +91,7 @@ export class FabButton extends Ion {
 
 
   /**
-   * @private
+   * @hidden
    */
   setActiveClose(closeVisible: boolean) {
     this.setElementClass('fab-close-active', closeVisible);
diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts
index 6661dd2f45..13635e8f30 100644
--- a/src/components/icon/icon.ts
+++ b/src/components/icon/icon.ts
@@ -43,17 +43,17 @@ import { Ion } from '../ion';
   }
 })
 export class Icon extends Ion {
-  /** @private */
+  /** @hidden */
   _iconMode: string;
-  /** @private */
+  /** @hidden */
   _isActive: boolean = true;
-  /** @private */
+  /** @hidden */
   _name: string = '';
-  /** @private */
+  /** @hidden */
   _ios: string = '';
-  /** @private */
+  /** @hidden */
   _md: string = '';
-  /** @private */
+  /** @hidden */
   _css: string = '';
 
   /**
@@ -89,7 +89,7 @@ export class Icon extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     if (this._css) {
@@ -160,12 +160,12 @@ export class Icon extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @HostBinding('class.hide') _hidden: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   update() {
     let iconName: string;
diff --git a/src/components/img/img.ts b/src/components/img/img.ts
index c6eeb33259..4ff4f5e09f 100644
--- a/src/components/img/img.ts
+++ b/src/components/img/img.ts
@@ -123,9 +123,9 @@ export class Img implements OnDestroy {
   /** @internal */
   _unreg: Function;
 
-  /** @private */
+  /** @hidden */
   canRequest: boolean;
-  /** @private */
+  /** @hidden */
   canRender: boolean;
 
 
@@ -178,7 +178,7 @@ export class Img implements OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   reset() {
     if (this._requestingSrc) {
@@ -196,7 +196,7 @@ export class Img implements OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   update() {
     // only attempt an update if there is an active src
@@ -255,7 +255,7 @@ export class Img implements OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get top(): number {
     const bounds = this._getBounds();
@@ -263,7 +263,7 @@ export class Img implements OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get bottom(): number {
     const bounds = this._getBounds();
@@ -360,7 +360,7 @@ export class Img implements OnDestroy {
   @Input() alt: string = '';
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._img = this._elementRef.nativeElement.firstChild;
@@ -372,7 +372,7 @@ export class Img implements OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._unreg && this._unreg();
diff --git a/src/components/infinite-scroll/infinite-scroll-content.ts b/src/components/infinite-scroll/infinite-scroll-content.ts
index d917aae727..102814657d 100644
--- a/src/components/infinite-scroll/infinite-scroll-content.ts
+++ b/src/components/infinite-scroll/infinite-scroll-content.ts
@@ -5,7 +5,7 @@ import { InfiniteScroll } from './infinite-scroll';
 
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-infinite-scroll-content',
@@ -36,7 +36,7 @@ export class InfiniteScrollContent {
   constructor(public inf: InfiniteScroll, private _config: Config) {}
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     if (!this.loadingSpinner) {
diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts
index cf2008ab81..f746e4eed6 100644
--- a/src/components/infinite-scroll/infinite-scroll.ts
+++ b/src/components/infinite-scroll/infinite-scroll.ts
@@ -239,7 +239,7 @@ export class InfiniteScroll {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setListeners(shouldListen: boolean) {
     if (this._init) {
@@ -257,7 +257,7 @@ export class InfiniteScroll {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._init = true;
@@ -265,7 +265,7 @@ export class InfiniteScroll {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._setListeners(false);
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index d258727600..5992367865 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -115,7 +115,7 @@ export class TextInput extends Ion implements IonicFormInput {
   _usePadding: boolean;
   _value: any = '';
 
-  /** @private */
+  /** @hidden */
   inputControl: NgControl;
 
   constructor(
@@ -227,7 +227,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabled(val: boolean) {
     this._renderer.setElementAttribute(this._elementRef.nativeElement, 'disabled', val ? '' : null);
@@ -236,7 +236,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
@@ -286,7 +286,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setMin(val: any) {
     this._native && this._native.setMin(val);
@@ -304,7 +304,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setMax(val: any) {
     this._native && this._native.setMax(val);
@@ -322,14 +322,14 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setStep(val: any) {
     this._native && this._native.setStep(val);
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild('input', { read: NativeInput })
   set _nativeInput(nativeInput: NativeInput) {
@@ -339,7 +339,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild('textarea', { read: NativeInput })
   set _nativeTextarea(nativeInput: NativeInput) {
@@ -349,7 +349,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild(NextInput)
   set _nextInput(nextInput: NextInput) {
@@ -371,7 +371,7 @@ export class TextInput extends Ion implements IonicFormInput {
   @Output() focus: EventEmitter<Event> = new EventEmitter<Event>();
 
   /**
-   * @private
+   * @hidden
    */
   setNativeInput(nativeInput: NativeInput) {
     this._native = nativeInput;
@@ -446,7 +446,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   initFocus() {
     // begin the process of setting focus to the inner input element
@@ -523,7 +523,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setFocus() {
     // immediately set focus
@@ -540,7 +540,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   scrollHideFocus(ev: ScrollEvent, shouldHideFocus: boolean) {
     // do not continue if there's no nav, or it's transitioning
@@ -553,21 +553,21 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   inputBlurred(ev: UIEvent) {
     this.blur.emit(ev);
   }
 
   /**
-   * @private
+   * @hidden
    */
   inputFocused(ev: UIEvent) {
     this.focus.emit(ev);
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     this._value = val;
@@ -575,14 +575,14 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(val: any) {
     this.checkHasValue(val);
   }
 
   /**
-   * @private
+   * @hidden
    */
   onKeydown(val: any) {
     if (this._clearOnEdit) {
@@ -591,12 +591,12 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched(val: any) {}
 
   /**
-   * @private
+   * @hidden
    */
   hasFocus(): boolean {
     // check if an input has focus or not
@@ -604,7 +604,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   hasValue(): boolean {
     const inputValue = this._value;
@@ -612,7 +612,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   checkHasValue(inputValue: any) {
     if (this._item) {
@@ -622,7 +622,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   focusChange(inputHasFocus: boolean) {
     if (this._item) {
@@ -637,7 +637,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   pointerStart(ev: UIEvent) {
     // input cover touchstart
@@ -654,7 +654,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   pointerEnd(ev: UIEvent) {
     // input cover touchend/mouseup
@@ -684,7 +684,7 @@ export class TextInput extends Ion implements IonicFormInput {
     this._coord = null;
   }
   /**
-   * @private
+   * @hidden
    */
   setItemInputControlCss() {
     let item = this._item;
@@ -703,7 +703,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     const item = this._item;
@@ -722,14 +722,14 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentChecked() {
     this.setItemInputControlCss();
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form.deregister(this);
@@ -742,7 +742,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    */
   clearTextInput() {
     console.debug('Should clear input');
@@ -753,7 +753,7 @@ export class TextInput extends Ion implements IonicFormInput {
 
   /**
   * Check if we need to clear the text input if clearOnEdit is enabled
-  * @private
+  * @hidden
   */
   checkClearOnEdit(inputValue: string) {
     if (!this._clearOnEdit) {
@@ -771,7 +771,7 @@ export class TextInput extends Ion implements IonicFormInput {
   }
 
   /**
-   * @private
+   * @hidden
    * Angular2 Forms API method called by the view (formControlName) to register the
    * onChange event handler that updates the model (Control).
    * @param {Function} fn  the onChange event handler.
@@ -779,7 +779,7 @@ export class TextInput extends Ion implements IonicFormInput {
   registerOnChange(fn: any) { this.onChange = fn; }
 
   /**
-   * @private
+   * @hidden
    * Angular2 Forms API method called by the view (formControlName) to register
    * the onTouched event handler that marks model (Control) as touched.
    * @param {Function} fn  onTouched event handler.
@@ -788,7 +788,7 @@ export class TextInput extends Ion implements IonicFormInput {
 
 
   /**
-   * @private
+   * @hidden
    */
   focusNext() {
     this._form.tabFocus(this);
@@ -848,7 +848,7 @@ const TEXT_TYPE_REGEX = /password|email|number|search|tel|url|date|month|time|we
 
 
 /**
- * @private
+ * @hidden
  */
 export function getScrollData(inputOffsetTop: number, inputOffsetHeight: number, scrollViewDimensions: ContentDimensions, keyboardHeight: number, plaformHeight: number) {
   // compute input's Y values relative to the body
diff --git a/src/components/input/native-input.ts b/src/components/input/native-input.ts
index 31775a4ef1..3ef87a73ba 100644
--- a/src/components/input/native-input.ts
+++ b/src/components/input/native-input.ts
@@ -6,7 +6,7 @@ import { Platform } from '../../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: '.text-input'
diff --git a/src/components/input/next-input.ts b/src/components/input/next-input.ts
index 45b2f04e0f..3f0858fc9c 100644
--- a/src/components/input/next-input.ts
+++ b/src/components/input/next-input.ts
@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: '[next-input]'
diff --git a/src/components/ion.ts b/src/components/ion.ts
index fc305edc07..16ba4aa975 100644
--- a/src/components/ion.ts
+++ b/src/components/ion.ts
@@ -8,22 +8,22 @@ import { Config } from '../config/config';
  * sending/receiving app-level events.
  */
 export class Ion {
-  /** @private */
+  /** @hidden */
   _config: Config;
 
-  /** @private */
+  /** @hidden */
   _elementRef: ElementRef;
 
-  /** @private */
+  /** @hidden */
   _renderer: Renderer;
 
-  /** @private */
+  /** @hidden */
   _color: string;
 
-  /** @private */
+  /** @hidden */
   _mode: string;
 
-  /** @private */
+  /** @hidden */
   _componentName: string;
 
   constructor(config: Config, elementRef: ElementRef, renderer: Renderer, componentName?: string) {
@@ -38,22 +38,22 @@ export class Ion {
     }
   }
 
-  /** @private */
+  /** @hidden */
   setElementClass(className: string, isAdd: boolean) {
     this._renderer.setElementClass(this._elementRef.nativeElement, className, isAdd);
   }
 
-  /** @private */
+  /** @hidden */
   setElementAttribute(attributeName: string, attributeValue: any) {
     this._renderer.setElementAttribute(this._elementRef.nativeElement, attributeName, attributeValue);
   }
 
-  /** @private */
+  /** @hidden */
   setElementStyle(property: string, value: string) {
     this._renderer.setElementStyle(this._elementRef.nativeElement, property, value);
   }
 
-  /** @private */
+  /** @hidden */
   _setColor(newColor: string, componentName?: string) {
     if (componentName) {
       // This is needed for the item-radio
@@ -68,7 +68,7 @@ export class Ion {
     }
   }
 
-  /** @private */
+  /** @hidden */
   _setMode(newMode: string) {
     if (this._mode) {
       this.setElementClass(`${this._componentName}-${this._mode}`, false);
@@ -84,17 +84,17 @@ export class Ion {
     }
   }
 
-  /** @private */
+  /** @hidden */
   _setComponentName() {
     this.setElementClass(this._componentName, true);
   }
 
-  /** @private */
+  /** @hidden */
   getElementRef(): ElementRef {
     return this._elementRef;
   }
 
-  /** @private */
+  /** @hidden */
   getNativeElement(): any {
     return this._elementRef.nativeElement;
   }
diff --git a/src/components/item/item-content.ts b/src/components/item/item-content.ts
index 672482eb03..8a36007e48 100644
--- a/src/components/item/item-content.ts
+++ b/src/components/item/item-content.ts
@@ -1,7 +1,7 @@
 import { Directive } from '@angular/core';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-item,[ion-item]',
diff --git a/src/components/item/item-divider.ts b/src/components/item/item-divider.ts
index 9c568117da..3c7b5481ac 100644
--- a/src/components/item/item-divider.ts
+++ b/src/components/item/item-divider.ts
@@ -5,7 +5,7 @@ import { Form } from '../../util/form';
 import { Ion } from '../ion';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-item-divider',
diff --git a/src/components/item/item-group.ts b/src/components/item/item-group.ts
index 60ad3028f1..560a615e99 100644
--- a/src/components/item/item-group.ts
+++ b/src/components/item/item-group.ts
@@ -1,7 +1,7 @@
 import { Directive } from '@angular/core';
 
 /**
-  * @private
+  * @hidden
   */
 @Directive({
   selector: 'ion-item-group'
diff --git a/src/components/item/item-options.ts b/src/components/item/item-options.ts
index 784fe71b56..781a6bf60e 100644
--- a/src/components/item/item-options.ts
+++ b/src/components/item/item-options.ts
@@ -42,7 +42,7 @@ export class ItemOptions {
   constructor(private _elementRef: ElementRef, private _renderer: Renderer) {}
 
   /**
-   * @private
+   * @hidden
    */
   getSides(): number {
     if (isPresent(this.side) && this.side === 'left') {
@@ -52,7 +52,7 @@ export class ItemOptions {
   }
 
   /**
-   * @private
+   * @hidden
    */
   width() {
     return this._elementRef.nativeElement.offsetWidth;
diff --git a/src/components/item/item-reorder-gesture.ts b/src/components/item/item-reorder-gesture.ts
index dbbba4616d..26b007d8fb 100644
--- a/src/components/item/item-reorder-gesture.ts
+++ b/src/components/item/item-reorder-gesture.ts
@@ -5,7 +5,7 @@ import { UIEventManager } from '../../gestures/ui-event-manager';
 
 
 /**
- * @private
+ * @hidden
  */
 export class ItemReorderGesture {
   private selectedItemEle: HTMLElement = null;
@@ -150,7 +150,7 @@ export class ItemReorderGesture {
   }
 
   /**
-   * @private
+   * @hidden
    */
   destroy() {
     this.onDragEnd(null);
diff --git a/src/components/item/item-reorder-util.ts b/src/components/item/item-reorder-util.ts
index e75be84877..0da4082eb3 100644
--- a/src/components/item/item-reorder-util.ts
+++ b/src/components/item/item-reorder-util.ts
@@ -1,19 +1,19 @@
 /**
- * @private
+ * @hidden
  */
 export function indexForItem(element: any): number {
   return element['$ionIndex'];
 }
 
 /**
- * @private
+ * @hidden
  */
 export function reorderListForItem(element: any): any {
   return element['$ionReorderList'];
 }
 
 /**
- * @private
+ * @hidden
  */
 export function findReorderItem(node: any, listNode: any): HTMLElement {
   let nested = 0;
diff --git a/src/components/item/item-reorder.ts b/src/components/item/item-reorder.ts
index 4b952df69b..05cc0c7bb2 100644
--- a/src/components/item/item-reorder.ts
+++ b/src/components/item/item-reorder.ts
@@ -170,7 +170,7 @@ export class ItemReorder implements ItemReorderGestureDelegate {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._element = null;
@@ -178,7 +178,7 @@ export class ItemReorder implements ItemReorderGestureDelegate {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @Input()
   get reorder(): boolean {
@@ -287,14 +287,14 @@ export class ItemReorder implements ItemReorderGestureDelegate {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementClass(classname: string, add: boolean) {
     this._rendered.setElementClass(this._element, classname, add);
   }
 
   /**
-   * @private
+   * @hidden
    */
   getNativeElement(): HTMLElement {
     return this._element;
diff --git a/src/components/item/item-sliding-gesture.ts b/src/components/item/item-sliding-gesture.ts
index a1d3cc4037..2e34d91266 100644
--- a/src/components/item/item-sliding-gesture.ts
+++ b/src/components/item/item-sliding-gesture.ts
@@ -7,7 +7,7 @@ import { Platform } from '../../platform/platform';
 import { pointerCoord } from '../../util/dom';
 
 /**
- * @private
+ * @hidden
  */
 export class ItemSlidingGesture extends PanGesture {
 
diff --git a/src/components/item/item-sliding.ts b/src/components/item/item-sliding.ts
index a9c42d0fa8..d7a12796cc 100644
--- a/src/components/item/item-sliding.ts
+++ b/src/components/item/item-sliding.ts
@@ -133,7 +133,7 @@ export class ItemSliding {
   private _state: SlidingState = SlidingState.Disabled;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(Item) item: Item;
 
@@ -193,14 +193,14 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getOpenAmount(): number {
     return this._openAmount;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getSlidingPercent(): number {
     let openAmount = this._openAmount;
@@ -214,7 +214,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   startSliding(startX: number) {
     if (this._tmr) {
@@ -230,7 +230,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   moveSliding(x: number): number {
     if (this._optsDirty) {
@@ -263,7 +263,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   endSliding(velocity: number): number {
     let restingPoint = (this._openAmount > 0)
@@ -285,7 +285,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   private fireSwipeEvent() {
     if (this._state & SlidingState.SwipeRight) {
@@ -296,7 +296,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   private calculateOptsWidth() {
     if (!this._optsDirty) {
@@ -412,7 +412,7 @@ export class ItemSliding {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementClass(cssClass: string, shouldAdd: boolean) {
     this._renderer.setElementClass(this._elementRef.nativeElement, cssClass, shouldAdd);
diff --git a/src/components/item/item.ts b/src/components/item/item.ts
index d3cc977e17..4057d70194 100644
--- a/src/components/item/item.ts
+++ b/src/components/item/item.ts
@@ -302,12 +302,12 @@ export class Item extends Ion {
   _hasReorder: boolean;
 
   /**
-   * @private
+   * @hidden
    */
   id: string;
 
   /**
-   * @private
+   * @hidden
    */
   labelId: string = null;
 
@@ -357,7 +357,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerInput(type: string) {
     this._inputs.push(type);
@@ -365,7 +365,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     if (this._viewLabel && this._inputs.length) {
@@ -379,7 +379,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _updateColor(newColor: string, componentName?: string) {
     componentName = componentName || 'item'; // item-radio
@@ -387,7 +387,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setName(elementRef: ElementRef) {
     let nodeName = elementRef.nativeElement.nodeName.replace('ION-', '');
@@ -398,14 +398,14 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getLabelText(): string {
     return this._label ? this._label.text : '';
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(Label)
   set contentLabel(label: Label) {
@@ -420,7 +420,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild(Label)
   set viewLabel(label: Label) {
@@ -430,7 +430,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(Button)
   set _buttons(buttons: QueryList<Button>) {
@@ -442,7 +442,7 @@ export class Item extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(Icon)
   set _icons(icons: QueryList<Icon>) {
diff --git a/src/components/item/reorder.ts b/src/components/item/reorder.ts
index b6793bb935..a2450081bc 100644
--- a/src/components/item/reorder.ts
+++ b/src/components/item/reorder.ts
@@ -3,7 +3,7 @@ import { Component, ElementRef, HostListener } from '@angular/core';
 import { findReorderItem } from './item-reorder-util';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-reorder',
diff --git a/src/components/label/label.ts b/src/components/label/label.ts
index caf74e1e86..e2afc8365e 100644
--- a/src/components/label/label.ts
+++ b/src/components/label/label.ts
@@ -81,7 +81,7 @@ export class Label extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   type: string;
 
@@ -99,7 +99,7 @@ export class Label extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @Input()
   get id(): string {
@@ -114,7 +114,7 @@ export class Label extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get text(): string {
     return this.getNativeElement().textContent || '';
diff --git a/src/components/list/list-header.ts b/src/components/list/list-header.ts
index 9f89be2eb1..094e7ecd74 100644
--- a/src/components/list/list-header.ts
+++ b/src/components/list/list-header.ts
@@ -4,7 +4,7 @@ import { Config } from '../../config/config';
 import { Ion } from '../ion';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-list-header'
diff --git a/src/components/list/list.ts b/src/components/list/list.ts
index 38fde00710..6ea7b61d69 100644
--- a/src/components/list/list.ts
+++ b/src/components/list/list.ts
@@ -85,7 +85,7 @@ export class List extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   containsSlidingItem(contains: boolean) {
     this._containsSlidingItems = contains;
@@ -114,7 +114,7 @@ export class List extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   destroy() {
     this._slidingGesture && this._slidingGesture.destroy();
diff --git a/src/components/loading/loading-component.ts b/src/components/loading/loading-component.ts
index ec78bb1922..5b088a9069 100644
--- a/src/components/loading/loading-component.ts
+++ b/src/components/loading/loading-component.ts
@@ -9,7 +9,7 @@ import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';
 
 /**
-* @private
+* @hidden
 */
 @Component({
   selector: 'ion-loading',
diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts
index 36181152d7..790509cc60 100644
--- a/src/components/loading/loading.ts
+++ b/src/components/loading/loading.ts
@@ -9,7 +9,7 @@ import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
 
 /**
- * @private
+ * @hidden
  */
 export class Loading extends ViewController {
   private _app: App;
@@ -31,7 +31,7 @@ export class Loading extends ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransitionName(direction: string) {
     let key = (direction === 'back' ? 'loadingLeave' : 'loadingEnter');
diff --git a/src/components/menu/menu-close.ts b/src/components/menu/menu-close.ts
index 29a97f38b7..e63b042e37 100644
--- a/src/components/menu/menu-close.ts
+++ b/src/components/menu/menu-close.ts
@@ -33,14 +33,14 @@ import { MenuController } from './menu-controller';
 export class MenuClose {
 
   /**
-   * @private
+   * @hidden
    */
   @Input() menuClose: string;
 
   constructor(private _menu: MenuController) {}
 
   /**
-  * @private
+  * @hidden
   */
   @HostListener('click')
   close() {
diff --git a/src/components/menu/menu-controller.ts b/src/components/menu/menu-controller.ts
index d9fd882907..8246df8d81 100644
--- a/src/components/menu/menu-controller.ts
+++ b/src/components/menu/menu-controller.ts
@@ -286,7 +286,7 @@ export class MenuController {
   }
 
   /**
-   * @private
+   * @hidden
    * @return {boolean} if any menu is currently animating
    */
   isAnimating(): boolean {
@@ -294,7 +294,7 @@ export class MenuController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _register(menu: Menu) {
     assert(this._menus.indexOf(menu) < 0, 'menu was already registered');
@@ -302,7 +302,7 @@ export class MenuController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _unregister(menu: Menu) {
     assert(this._menus.indexOf(menu) >= 0, 'menu is not registered');
@@ -310,7 +310,7 @@ export class MenuController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setActiveMenu(menu: Menu) {
     assert(menu.enabled, 'menu must be enabled');
@@ -327,14 +327,14 @@ export class MenuController {
 
 
   /**
-   * @private
+   * @hidden
    */
   static registerType(name: string, cls: new(...args: any[]) => MenuType) {
     menuTypes[name] = cls;
   }
 
   /**
-   * @private
+   * @hidden
    */
   static create(type: string, menuCmp: Menu, plt: Platform) {
     return new menuTypes[type](menuCmp, plt);
diff --git a/src/components/menu/menu-toggle.ts b/src/components/menu/menu-toggle.ts
index ff1a62d36e..f9de56da6a 100644
--- a/src/components/menu/menu-toggle.ts
+++ b/src/components/menu/menu-toggle.ts
@@ -93,17 +93,17 @@ import { ViewController } from '../../navigation/view-controller';
 export class MenuToggle {
 
   /**
-   * @private
+   * @hidden
    */
   @Input() menuToggle: string;
 
   /**
-   * @private
+   * @hidden
    */
   private _isButton: boolean;
 
   /**
-   * @private
+   * @hidden
    */
   private _inNavbar: boolean;
 
@@ -125,7 +125,7 @@ export class MenuToggle {
   }
 
   /**
-  * @private
+  * @hidden
   */
   @HostListener('click')
   toggle() {
@@ -134,7 +134,7 @@ export class MenuToggle {
   }
 
   /**
-  * @private
+  * @hidden
   */
   get isHidden() {
     const menu = this._menu.get(this.menuToggle);
diff --git a/src/components/menu/menu-types.ts b/src/components/menu/menu-types.ts
index 9ca1a59d8b..fb159b4b73 100644
--- a/src/components/menu/menu-types.ts
+++ b/src/components/menu/menu-types.ts
@@ -5,7 +5,7 @@ import { Platform } from '../../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  * Menu Type
  * Base class which is extended by the various types. Each
  * type will provide their own animations for open and close
@@ -75,7 +75,7 @@ export class MenuType {
 
 
 /**
- * @private
+ * @hidden
  * Menu Reveal Type
  * The content slides over to reveal the menu underneath.
  * The menu itself, which is under the content, does not move.
@@ -94,7 +94,7 @@ MenuController.registerType('reveal', MenuRevealType);
 
 
 /**
- * @private
+ * @hidden
  * Menu Push Type
  * The content slides over to reveal the menu underneath.
  * The menu itself also slides over to reveal its bad self.
@@ -130,7 +130,7 @@ MenuController.registerType('push', MenuPushType);
 
 
 /**
- * @private
+ * @hidden
  * Menu Overlay Type
  * The menu slides over the content. The content
  * itself, which is under the menu, does not move.
diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts
index aa1503474f..e2cfebe110 100644
--- a/src/components/menu/menu.ts
+++ b/src/components/menu/menu.ts
@@ -207,22 +207,22 @@ export class Menu implements RootNode {
   private _isPane: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   isOpen: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild(Backdrop) backdrop: Backdrop;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(Content) menuContent: Content;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(Nav) menuNav: Nav;
 
@@ -287,7 +287,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @Input() maxEdgeStart: number;
 
@@ -325,7 +325,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     this._init = true;
@@ -372,7 +372,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onBackdropClick(ev: UIEvent) {
     ev.preventDefault();
@@ -381,7 +381,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   private _getType(): MenuType {
     if (!this._type) {
@@ -395,7 +395,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setOpen(shouldOpen: boolean, animated: boolean = true): Promise<boolean> {
     // If the menu is disabled or it is currenly being animated, let's do nothing
@@ -420,7 +420,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   canSwipe(): boolean {
     return this._isSwipeEnabled &&
@@ -430,7 +430,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   isAnimating(): boolean {
     return this._isAnimating;
@@ -536,21 +536,21 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   open(): Promise<boolean> {
     return this.setOpen(true);
   }
 
   /**
-   * @private
+   * @hidden
    */
   close(): Promise<boolean> {
     return this.setOpen(false);
   }
 
   /**
-   * @private
+   * @hidden
    */
   resize() {
     const content: Content | Nav = this.menuContent
@@ -560,7 +560,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   toggle(): Promise<boolean> {
     return this.setOpen(!this.isOpen);
@@ -571,7 +571,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _updateState() {
     const canOpen = this._canOpen();
@@ -611,7 +611,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   enable(shouldEnable: boolean): Menu {
     this._isEnabled = shouldEnable;
@@ -636,7 +636,7 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   swipeEnable(shouldEnable: boolean): Menu {
     this._isSwipeEnabled = shouldEnable;
@@ -645,70 +645,70 @@ export class Menu implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getNativeElement(): HTMLElement {
     return this._elementRef.nativeElement;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getMenuElement(): HTMLElement {
     return <HTMLElement>this.getNativeElement().querySelector('.menu-inner');
   }
 
   /**
-   * @private
+   * @hidden
    */
   getContentElement(): HTMLElement {
     return this._cntEle;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getBackdropElement(): HTMLElement {
     return this.backdrop.getNativeElement();
   }
 
   /**
-   * @private
+   * @hidden
    */
   width(): number {
     return this.getMenuElement().offsetWidth;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getMenuController(): MenuController {
     return this._menuCtrl;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementClass(className: string, add: boolean) {
     this._renderer.setElementClass(this._elementRef.nativeElement, className, add);
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementAttribute(attributeName: string, value: string) {
     this._renderer.setElementAttribute(this._elementRef.nativeElement, attributeName, value);
   }
 
   /**
-   * @private
+   * @hidden
    */
   getElementRef(): ElementRef {
     return this._elementRef;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._menuCtrl._unregister(this);
diff --git a/src/components/modal/modal-component.ts b/src/components/modal/modal-component.ts
index ddfec8ede9..d8187bd372 100644
--- a/src/components/modal/modal-component.ts
+++ b/src/components/modal/modal-component.ts
@@ -9,7 +9,7 @@ import { ModuleLoader } from '../../util/module-loader';
 import { assert } from '../../util/util';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-modal',
@@ -49,7 +49,7 @@ export class ModalCmp {
     this._load(this._navParams.data.component);
   }
 
-  /** @private */
+  /** @hidden */
   _load(component: any) {
     if (component) {
 
@@ -80,7 +80,7 @@ export class ModalCmp {
     this._gestureBlocker.unblock();
   }
 
-  /** @private */
+  /** @hidden */
   _setCssClass(componentRef: any, className: string) {
     this._renderer.setElementClass(componentRef.location.nativeElement, className, true);
   }
diff --git a/src/components/modal/modal-impl.ts b/src/components/modal/modal-impl.ts
index bbbedf7e14..6444b72ef6 100644
--- a/src/components/modal/modal-impl.ts
+++ b/src/components/modal/modal-impl.ts
@@ -9,7 +9,7 @@ import { NavOptions } from '../../navigation/nav-util';
 import { ViewController } from '../../navigation/view-controller';
 
 /**
- * @private
+ * @hidden
  */
 export class ModalImpl extends ViewController {
   private _app: App;
@@ -37,7 +37,7 @@ export class ModalImpl extends ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransitionName(direction: string): string {
     let key: string;
diff --git a/src/components/modal/modal.ts b/src/components/modal/modal.ts
index 3a54817cf6..37f7fe2c98 100644
--- a/src/components/modal/modal.ts
+++ b/src/components/modal/modal.ts
@@ -9,7 +9,7 @@ import { OverlayProxy } from '../../navigation/overlay-proxy';
 import { ModalImpl } from './modal-impl';
 
 /**
- * @private
+ * @hidden
  */
 export class Modal extends OverlayProxy {
 
diff --git a/src/components/nav/nav-pop-anchor.ts b/src/components/nav/nav-pop-anchor.ts
index e3ff6582f1..97b74f70f3 100644
--- a/src/components/nav/nav-pop-anchor.ts
+++ b/src/components/nav/nav-pop-anchor.ts
@@ -6,7 +6,7 @@ import { ViewController } from '../../navigation/view-controller';
 import { NavPop } from './nav-pop';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'a[navPop]',
diff --git a/src/components/nav/nav-pop.ts b/src/components/nav/nav-pop.ts
index 05301c8e93..9bbb1269fb 100644
--- a/src/components/nav/nav-pop.ts
+++ b/src/components/nav/nav-pop.ts
@@ -35,7 +35,7 @@ export class NavPop {
   }
 
 /**
- * @private
+ * @hidden
  */
   @HostListener('click')
   onClick(): boolean {
diff --git a/src/components/nav/nav-push-anchor.ts b/src/components/nav/nav-push-anchor.ts
index 7df78c2cd3..a1a738bc58 100644
--- a/src/components/nav/nav-push-anchor.ts
+++ b/src/components/nav/nav-push-anchor.ts
@@ -5,7 +5,7 @@ import { DeepLinker } from '../../navigation/deep-linker';
 import { NavPush } from './nav-push';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'a[navPush]',
diff --git a/src/components/nav/nav-push.ts b/src/components/nav/nav-push.ts
index 2deeae0f72..b2de8355f5 100644
--- a/src/components/nav/nav-push.ts
+++ b/src/components/nav/nav-push.ts
@@ -67,7 +67,7 @@ export class NavPush {
   }
 
 /**
- * @private
+ * @hidden
  */
   @HostListener('click')
   onClick(): boolean {
diff --git a/src/components/nav/nav.ts b/src/components/nav/nav.ts
index 5007dfac1f..6a7ce589ae 100644
--- a/src/components/nav/nav.ts
+++ b/src/components/nav/nav.ts
@@ -100,7 +100,7 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild('viewport', {read: ViewContainerRef})
   set _vp(val: ViewContainerRef) {
@@ -162,7 +162,7 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this.destroy();
diff --git a/src/components/nav/overlay-portal.ts b/src/components/nav/overlay-portal.ts
index ea1f119365..74f68cdb12 100644
--- a/src/components/nav/overlay-portal.ts
+++ b/src/components/nav/overlay-portal.ts
@@ -11,7 +11,7 @@ import { Platform } from '../../platform/platform';
 import { TransitionController } from '../../transitions/transition-controller';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: '[overlay-portal]',
diff --git a/src/components/navbar/navbar.ts b/src/components/navbar/navbar.ts
index 3decc69a69..c2a4d534f4 100644
--- a/src/components/navbar/navbar.ts
+++ b/src/components/navbar/navbar.ts
@@ -66,23 +66,23 @@ import { ViewController } from '../../navigation/view-controller';
 })
 export class Navbar extends ToolbarBase {
   /**
-   * @private
+   * @hidden
    */
   _backText: string;
   /**
-   * @private
+   * @hidden
    */
   _bbIcon: string;
   /**
-   * @private
+   * @hidden
    */
   _hidden: boolean = false;
   /**
-   * @private
+   * @hidden
    */
   _hideBb: boolean = false;
   /**
-   * @private
+   * @hidden
    */
   _sbPadding: boolean;
 
@@ -150,7 +150,7 @@ export class Navbar extends ToolbarBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   didEnter() {
     try {
@@ -161,7 +161,7 @@ export class Navbar extends ToolbarBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setHidden(isHidden: boolean) {
     // used to display none/block the navbar
diff --git a/src/components/option/option.ts b/src/components/option/option.ts
index 0d8cf68c53..8e589b358c 100644
--- a/src/components/option/option.ts
+++ b/src/components/option/option.ts
@@ -64,7 +64,7 @@ export class Option {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get text() {
     return this._elementRef.nativeElement.textContent;
diff --git a/src/components/picker/picker-column.ts b/src/components/picker/picker-column.ts
index cc5fce4648..96f4718f65 100644
--- a/src/components/picker/picker-column.ts
+++ b/src/components/picker/picker-column.ts
@@ -10,7 +10,7 @@ import { pointerCoord } from '../../util/dom';
 import { UIEventManager } from '../../gestures/ui-event-manager';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: '.picker-col',
diff --git a/src/components/picker/picker-component.ts b/src/components/picker/picker-component.ts
index ed25b1a616..ed9644f90a 100644
--- a/src/components/picker/picker-component.ts
+++ b/src/components/picker/picker-component.ts
@@ -13,7 +13,7 @@ import { ViewController } from '../../navigation/view-controller';
 import { PickerColumnCmp } from './picker-column';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-picker-cmp',
diff --git a/src/components/picker/picker-controller.ts b/src/components/picker/picker-controller.ts
index 1da45c22b3..5332ba8dfd 100644
--- a/src/components/picker/picker-controller.ts
+++ b/src/components/picker/picker-controller.ts
@@ -6,7 +6,7 @@ import { Picker } from './picker';
 import { PickerOptions } from './picker-options';
 
 /**
- * @private
+ * @hidden
  * @name PickerController
  * @description
  *
diff --git a/src/components/picker/picker.ts b/src/components/picker/picker.ts
index 49f8a0fde8..f2ce9b289d 100644
--- a/src/components/picker/picker.ts
+++ b/src/components/picker/picker.ts
@@ -11,7 +11,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class Picker extends ViewController {
   private _app: App;
@@ -34,7 +34,7 @@ export class Picker extends ViewController {
   }
 
   /**
-  * @private
+  * @hidden
   */
   getTransitionName(direction: string) {
     let key = (direction === 'back' ? 'pickerLeave' : 'pickerEnter');
diff --git a/src/components/popover/popover-component.ts b/src/components/popover/popover-component.ts
index ca16838af5..275f005627 100644
--- a/src/components/popover/popover-component.ts
+++ b/src/components/popover/popover-component.ts
@@ -10,7 +10,7 @@ import { ModuleLoader } from '../../util/module-loader';
 import { assert } from '../../util/util';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-popover',
diff --git a/src/components/popover/popover-impl.ts b/src/components/popover/popover-impl.ts
index 3b7e27940e..9a1cedc568 100644
--- a/src/components/popover/popover-impl.ts
+++ b/src/components/popover/popover-impl.ts
@@ -9,7 +9,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class PopoverImpl extends ViewController {
   private _app: App;
@@ -31,7 +31,7 @@ export class PopoverImpl extends ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransitionName(direction: string) {
     let key = (direction === 'back' ? 'popoverLeave' : 'popoverEnter');
diff --git a/src/components/popover/popover.ts b/src/components/popover/popover.ts
index bc6e9629db..f213207dda 100644
--- a/src/components/popover/popover.ts
+++ b/src/components/popover/popover.ts
@@ -9,7 +9,7 @@ import { OverlayProxy } from '../../navigation/overlay-proxy';
 import { PopoverImpl } from './popover-impl';
 
 /**
- * @private
+ * @hidden
  */
 export class Popover extends OverlayProxy {
 
diff --git a/src/components/radio/radio-button.ts b/src/components/radio/radio-button.ts
index 2eaa4e0788..e306697f73 100644
--- a/src/components/radio/radio-button.ts
+++ b/src/components/radio/radio-button.ts
@@ -185,7 +185,7 @@ export class RadioButton extends Ion implements IonicTapInput, OnDestroy, OnInit
   }
 
   /**
-   * @private
+   * @hidden
    */
   initFocus() {
     this._elementRef.nativeElement.querySelector('button').focus();
diff --git a/src/components/radio/radio-group.ts b/src/components/radio/radio-group.ts
index a5314522f4..5554fe1ff3 100644
--- a/src/components/radio/radio-group.ts
+++ b/src/components/radio/radio-group.ts
@@ -77,32 +77,32 @@ export class RadioGroup {
   _disabled: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   _btns: RadioButton[] = [];
 
   /**
-   * @private
+   * @hidden
    */
   _fn: Function;
 
   /**
-   * @private
+   * @hidden
    */
   _ids: number = -1;
 
   /**
-   * @private
+   * @hidden
    */
   _init: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   value: any;
 
   /**
-   * @private
+   * @hidden
    */
   id: number;
 
@@ -131,7 +131,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     let activeButton = this._btns.find(b => b.checked);
@@ -141,7 +141,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     console.debug('radio group, writeValue', val);
@@ -157,7 +157,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
@@ -173,12 +173,12 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
 
   /**
-   * @private
+   * @hidden
    */
   _update() {
     // loop through each of the radiobuttons
@@ -199,14 +199,14 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setActive(radioButton: RadioButton) {
     this._renderer.setElementAttribute(this._elementRef.nativeElement, 'aria-activedescendant', radioButton.id);
   }
 
   /**
-   * @private
+   * @hidden
    */
   add(button: RadioButton): string {
     this._btns.push(button);
@@ -221,7 +221,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   remove(button: RadioButton) {
     let index = this._btns.indexOf(button);
@@ -234,7 +234,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChild(ListHeader)
   set _header(header: any) {
@@ -247,7 +247,7 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(val: any) {
     // onChange used when there is not an formControlName
@@ -260,12 +260,12 @@ export class RadioGroup {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() {}
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
diff --git a/src/components/range/range-knob.ts b/src/components/range/range-knob.ts
index 11c771cc14..4ed49d12b8 100644
--- a/src/components/range/range-knob.ts
+++ b/src/components/range/range-knob.ts
@@ -3,7 +3,7 @@ import { Component, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN } from '../../platform/key';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: '.range-knob-handle',
diff --git a/src/components/range/range.ts b/src/components/range/range.ts
index 8e557e7e71..d77c67e2e4 100644
--- a/src/components/range/range.ts
+++ b/src/components/range/range.ts
@@ -147,7 +147,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   @ViewChild('slider') public _slider: ElementRef;
 
   /**
-   * @private
+   * @hidden
    */
   value: any;
 
@@ -172,7 +172,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   id: string;
 
@@ -331,7 +331,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterViewInit() {
     // add touchstart/mousedown listeners
@@ -539,7 +539,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
     }
   }
 
-  /** @private */
+  /** @hidden */
   _keyChg(isIncrease: boolean, isKnobB: boolean) {
     const step = this._step;
     if (isKnobB) {
@@ -578,7 +578,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     if (isPresent(val)) {
@@ -600,7 +600,7 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
@@ -611,12 +611,12 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(val: any) {
     // used when this input does not have an ngModel or formControlName
@@ -625,19 +625,19 @@ export class Range extends Ion implements AfterViewInit, ControlValueAccessor, O
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() { }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form.deregister(this);
diff --git a/src/components/refresher/refresher-content.ts b/src/components/refresher/refresher-content.ts
index 2bb795c7e3..43d904f51d 100644
--- a/src/components/refresher/refresher-content.ts
+++ b/src/components/refresher/refresher-content.ts
@@ -5,7 +5,7 @@ import { Refresher } from './refresher';
 
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-refresher-content',
@@ -53,7 +53,7 @@ export class RefresherContent {
   constructor(public r: Refresher, private _config: Config) {}
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     if (!this.pullingIcon) {
diff --git a/src/components/refresher/refresher.ts b/src/components/refresher/refresher.ts
index 1f36596b18..f1f3fd6bbe 100644
--- a/src/components/refresher/refresher.ts
+++ b/src/components/refresher/refresher.ts
@@ -491,7 +491,7 @@ export class Refresher {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     // bind event listeners
@@ -500,7 +500,7 @@ export class Refresher {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._setListeners(false);
diff --git a/src/components/scroll/scroll.ts b/src/components/scroll/scroll.ts
index aa1107ddf4..3ba5c9ca2a 100644
--- a/src/components/scroll/scroll.ts
+++ b/src/components/scroll/scroll.ts
@@ -85,29 +85,29 @@ export class Scroll {
   }
 
   /**
-   * @private
+   * @hidden
    */
   maxScale: number = 3;
   /**
-   * @private
+   * @hidden
    */
   zoomDuration: number = 250;
   /**
-   * @private
+   * @hidden
    */
   scrollElement: HTMLElement;
 
   constructor(private _elementRef: ElementRef) {}
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     this.scrollElement = this._elementRef.nativeElement.children[0];
   }
 
   /**
-   * @private
+   * @hidden
    * Add a scroll event handler to the scroll element if it exists.
    * @param {Function} handler  The scroll handler to add to the scroll element.
    * @returns {?Function} a function to remove the specified handler, otherwise
diff --git a/src/components/searchbar/searchbar.ts b/src/components/searchbar/searchbar.ts
index 5305612428..abadcbc0fe 100644
--- a/src/components/searchbar/searchbar.ts
+++ b/src/components/searchbar/searchbar.ts
@@ -184,7 +184,7 @@ export class Searchbar extends Ion {
   @Output() ionClear: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
 
   /**
-   * @private
+   * @hidden
    */
   @HostBinding('class.searchbar-has-focus') _sbHasFocus: boolean;
 
@@ -228,7 +228,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * On Initialization check for attributes
    */
   ngOnInit() {
@@ -239,7 +239,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * After View Checked position the elements
    */
   ngAfterContentInit() {
@@ -247,7 +247,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Positions the input search icon, placeholder, and the cancel button
    * based on the input value and if it is focused. (ios only)
    */
@@ -302,7 +302,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Show the iOS Cancel button on focus, hide it offscreen otherwise
    */
   positionCancelButton() {
@@ -327,7 +327,7 @@ export class Searchbar extends Ion {
 
 
   /**
-   * @private
+   * @hidden
    * Update the Searchbar input value when the input changes
    */
   inputChanged(ev: any) {
@@ -339,7 +339,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Sets the Searchbar to focused and active on input focus.
    */
   inputFocused(ev: UIEvent) {
@@ -351,7 +351,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Sets the Searchbar to not focused and checks if it should align left
    * based on whether there is a value in the searchbar or not.
    */
@@ -370,7 +370,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Clears the input field and triggers the control change.
    */
   clearInput(ev: UIEvent) {
@@ -390,7 +390,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Clears the input field and tells the input to blur since
    * the clearInput function doesn't want the input to blur
    * then calls the custom cancel function if the user passed one in.
@@ -404,7 +404,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Write a new value to the element.
    */
   writeValue(val: any) {
@@ -413,17 +413,17 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange = (_: any) => {};
 
   /**
-   * @private
+   * @hidden
    */
   onTouched = () => {};
 
   /**
-   * @private
+   * @hidden
    * Set the function to be called when the control receives a change event.
    */
   registerOnChange(fn: (_: any) => {}): void {
@@ -431,7 +431,7 @@ export class Searchbar extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Set the function to be called when the control receives a touch event.
    */
   registerOnTouched(fn: () => {}): void {
diff --git a/src/components/segment/segment-button.ts b/src/components/segment/segment-button.ts
index 59310bf5ac..161bf0b482 100644
--- a/src/components/segment/segment-button.ts
+++ b/src/components/segment/segment-button.ts
@@ -79,14 +79,14 @@ export class SegmentButton {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setElementClass(cssClass: string, shouldAdd: boolean) {
     this._renderer.setElementClass(this._elementRef.nativeElement, cssClass, shouldAdd);
   }
 
   /**
-   * @private
+   * @hidden
    * On click of a SegmentButton
    */
   @HostListener('click')
@@ -96,7 +96,7 @@ export class SegmentButton {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     if (!isPresent(this.value)) {
@@ -105,7 +105,7 @@ export class SegmentButton {
   }
 
   /**
-   * @private
+   * @hidden
    */
   set isActive(isActive: any) {
     this._renderer.setElementClass(this._elementRef.nativeElement, 'segment-activated', isActive);
diff --git a/src/components/segment/segment.ts b/src/components/segment/segment.ts
index 68606f731d..b291fc04db 100644
--- a/src/components/segment/segment.ts
+++ b/src/components/segment/segment.ts
@@ -70,7 +70,7 @@ export class Segment extends Ion {
   _disabled: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   value: string;
 
@@ -101,7 +101,7 @@ export class Segment extends Ion {
 
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(SegmentButton) _buttons: QueryList<SegmentButton>;
 
@@ -137,7 +137,7 @@ export class Segment extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Write a new value to the element.
    */
   writeValue(value: any) {
@@ -151,7 +151,7 @@ export class Segment extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterViewInit() {
    this._buttons.forEach(button => {
@@ -172,22 +172,22 @@ export class Segment extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange = (_: any) => {};
   /**
-   * @private
+   * @hidden
    */
   onTouched = (_: any) => {};
 
   /**
-   * @private
+   * @hidden
    * Set the function to be called when the control receives a change event.
    */
   registerOnChange(fn: any) { this.onChange = fn; }
 
   /**
-   * @private
+   * @hidden
    * Set the function to be called when the control receives a touch event.
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
diff --git a/src/components/select/select.ts b/src/components/select/select.ts
index 454cfcf4fc..a05643da9b 100644
--- a/src/components/select/select.ts
+++ b/src/components/select/select.ts
@@ -153,7 +153,7 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   _isOpen: boolean = false;
 
   /**
-   * @private
+   * @hidden
    */
   id: string;
 
@@ -381,14 +381,14 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
 
 
   /**
-   * @private
+   * @hidden
    */
   get text() {
     return (this._multi ? this._texts : this._texts.join());
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(Option)
   set options(val: QueryList<Option>) {
@@ -404,7 +404,7 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   }
 
   /**
-   * @private
+   * @hidden
    */
   _updOpts() {
     this._texts = [];
@@ -439,7 +439,7 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     console.debug('select, writeValue', val);
@@ -448,14 +448,14 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._updOpts();
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
@@ -469,12 +469,12 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) { this.onTouched = fn; }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(val: any) {
     // onChange used when there is not an formControlName
@@ -485,19 +485,19 @@ export class Select extends Ion implements AfterContentInit, ControlValueAccesso
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() { }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form.deregister(this);
diff --git a/src/components/show-hide-when/show-hide-when.ts b/src/components/show-hide-when/show-hide-when.ts
index bff5ba9c33..65f30dcc7e 100644
--- a/src/components/show-hide-when/show-hide-when.ts
+++ b/src/components/show-hide-when/show-hide-when.ts
@@ -4,7 +4,7 @@ import { Platform } from '../../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  */
 export class DisplayWhen {
   isMatch: boolean = false;
diff --git a/src/components/slides/slide.ts b/src/components/slides/slide.ts
index d9b1560455..4cef42401e 100644
--- a/src/components/slides/slide.ts
+++ b/src/components/slides/slide.ts
@@ -35,7 +35,7 @@ export class Slide {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._slides.update(10);
diff --git a/src/components/slides/slides.ts b/src/components/slides/slides.ts
index 86a9e7aac8..06ba23179f 100644
--- a/src/components/slides/slides.ts
+++ b/src/components/slides/slides.ts
@@ -267,7 +267,7 @@ export class Slides extends Ion {
   private _paginationType = 'bullets';
 
 
-  /** @private */
+  /** @hidden */
   paginationBulletRender: (index?: number, cssClass?: string) => void = null;
 
   /**
@@ -309,19 +309,19 @@ export class Slides extends Ion {
   private _isZoom = false;
 
   /**
-   * @private
+   * @hidden
    * Height of container.
    */
   height: number;
 
   /**
-   * @private
+   * @hidden
    * Width of container.
    */
   width: number;
 
   /**
-   * @private
+   * @hidden
    * Enabled this option and swiper will be operated as usual except it will
    * not move, real translate values on wrapper will not be set. Useful when
    * you may need to create custom slide transition.
@@ -329,7 +329,7 @@ export class Slides extends Ion {
   virtualTranslate = false;
 
   /**
-   * @private
+   * @hidden
    * Set to true to round values of slides width and height to prevent blurry
    * texts on usual resolution screens (if you have such)
    */
@@ -362,223 +362,223 @@ export class Slides extends Ion {
   private _slidesPerView: number|string = 1;
 
   /**
-   * @private
+   * @hidden
    */
   slidesPerColumn = 1;
   /**
-   * @private
+   * @hidden
    */
   slidesPerColumnFill = 'column';
   /**
-   * @private
+   * @hidden
    */
   slidesPerGroup = 1;
   /**
-   * @private
+   * @hidden
    */
   centeredSlides = false;
   /**
-   * @private
+   * @hidden
    */
   slidesOffsetBefore = 0;
   /**
-   * @private
+   * @hidden
    */
   slidesOffsetAfter = 0;
 
   /**
-   * @private
+   * @hidden
    */
   touchEventsTarget: 'container';
 
   // autoplay
   /**
-   * @private
+   * @hidden
    */
   autoplayDisableOnInteraction = true;
   /**
-   * @private
+   * @hidden
    */
   autoplayStopOnLast = false;
 
   // Free mode
   /**
-   * @private
+   * @hidden
    */
   freeMode = false;
   /**
-   * @private
+   * @hidden
    */
   freeModeMomentum = true;
   /**
-   * @private
+   * @hidden
    */
   freeModeMomentumRatio = 1;
   /**
-   * @private
+   * @hidden
    */
   freeModeMomentumBounce = true;
   /**
-   * @private
+   * @hidden
    */
   freeModeMomentumBounceRatio = 1;
   /**
-   * @private
+   * @hidden
    */
   freeModeMomentumVelocityRatio = 1;
   /**
-   * @private
+   * @hidden
    */
   freeModeSticky = false;
   /**
-   * @private
+   * @hidden
    */
   freeModeMinimumVelocity = 0.02;
 
   // Autoheight
   /**
-   * @private
+   * @hidden
    */
   autoHeight = false;
 
   // Set wrapper width
   /**
-   * @private
+   * @hidden
    */
   setWrapperSize = false;
 
   // Zoom
   /**
-   * @private
+   * @hidden
    */
   zoomMax = 3;
   /**
-   * @private
+   * @hidden
    */
   zoomMin = 1;
   /**
-   * @private
+   * @hidden
    */
   zoomToggle = true;
 
   // Touches
   /**
-   * @private
+   * @hidden
    */
   touchRatio = 1;
   /**
-   * @private
+   * @hidden
    */
   touchAngle = 45;
   /**
-   * @private
+   * @hidden
    */
   simulateTouch = true;
   /**
-   * @private
+   * @hidden
    */
   shortSwipes = true;
   /**
-   * @private
+   * @hidden
    */
   longSwipes = true;
   /**
-   * @private
+   * @hidden
    */
   longSwipesRatio = 0.5;
   /**
-   * @private
+   * @hidden
    */
   longSwipesMs = 300;
   /**
-   * @private
+   * @hidden
    */
   followFinger = true;
   /**
-   * @private
+   * @hidden
    */
   onlyExternal = false;
   /**
-   * @private
+   * @hidden
    */
   threshold = 0;
   /**
-   * @private
+   * @hidden
    */
   touchMoveStopPropagation = true;
   /**
-   * @private
+   * @hidden
    */
   touchReleaseOnEdges = false;
 
   // To support iOS's swipe-to-go-back gesture (when being used in-app, with UIWebView).
   /**
-   * @private
+   * @hidden
    */
   iOSEdgeSwipeDetection = false;
   /**
-   * @private
+   * @hidden
    */
   iOSEdgeSwipeThreshold = 20;
 
   // Pagination
   /**
-   * @private
+   * @hidden
    */
   paginationClickable = false;
   /**
-   * @private
+   * @hidden
    */
   paginationHide = false;
 
   // Resistance
-  /** @private */
+  /** @hidden */
   resistance = true;
-  /** @private */
+  /** @hidden */
   resistanceRatio = 0.85;
 
   // Progress
-  /** @private */
+  /** @hidden */
   watchSlidesProgress = false;
-  /** @private */
+  /** @hidden */
   watchSlidesVisibility = false;
 
   // Clicks
   /**
-   * @private
+   * @hidden
    */
   preventClicks = true;
   /**
-   * @private
+   * @hidden
    */
   preventClicksPropagation = true;
   /**
-   * @private
+   * @hidden
    */
   slideToClickedSlide = false;
 
   // loop
   /**
-   * @private
+   * @hidden
    */
   loopAdditionalSlides = 0;
   /**
-   * @private
+   * @hidden
    */
   loopedSlides: number = null;
 
   // Swiping/no swiping
   /**
-   * @private
+   * @hidden
    */
   swipeHandler: any = null;
   /**
-   * @private
+   * @hidden
    */
   noSwiping = true;
 
   // Callbacks
-  /** @private */
+  /** @hidden */
   runCallbacksOnInit = true;
 
   // Controller
@@ -587,13 +587,13 @@ export class Slides extends Ion {
 
   // Keyboard
   /**
-   * @private
+   * @hidden
    */
   keyboardControl = true;
 
   // Effects
   /**
-   * @private
+   * @hidden
    */
   coverflow = {
     rotate: 50,
@@ -603,14 +603,14 @@ export class Slides extends Ion {
     slideShadows: true
   };
   /**
-   * @private
+   * @hidden
    */
   flip = {
     slideShadows: true,
     limitRotation: true
   };
   /**
-   * @private
+   * @hidden
    */
   cube = {
     slideShadows: true,
@@ -619,7 +619,7 @@ export class Slides extends Ion {
     shadowScale: 0.94
   };
   /**
-   * @private
+   * @hidden
    */
   fade = {
     crossFade: false
@@ -627,24 +627,24 @@ export class Slides extends Ion {
 
   // Accessibility
   /**
-   * @private
+   * @hidden
    */
   prevSlideMessage = 'Previous slide';
   /**
-   * @private
+   * @hidden
    */
   nextSlideMessage = 'Next slide';
   /**
-   * @private
+   * @hidden
    */
   firstSlideMessage = 'This is the first slide';
   /**
-   * @private
+   * @hidden
    */
   lastSlideMessage = 'This is the last slide';
 
   /**
-   * @private
+   * @hidden
    */
   originalEvent: any;
 
@@ -719,19 +719,19 @@ export class Slides extends Ion {
   @Output() ionSlideDoubleTap: EventEmitter<Slides> = new EventEmitter();
 
 
-  /** @private */
+  /** @hidden */
   ionSlideProgress: EventEmitter<number> = new EventEmitter();
-  /** @private */
+  /** @hidden */
   ionSlideTransitionStart: EventEmitter<Slides> = new EventEmitter();
-  /** @private */
+  /** @hidden */
   ionSlideTransitionEnd: EventEmitter<Slides> = new EventEmitter();
-  /** @private */
+  /** @hidden */
   ionSlideTouchStart: EventEmitter<TouchEvent> = new EventEmitter();
-  /** @private */
+  /** @hidden */
   ionSlideTouchEnd: EventEmitter<TouchEvent> = new EventEmitter();
 
   /**
-   * @private
+   * @hidden
    * Deprecated
    */
   @Input()
@@ -741,7 +741,7 @@ export class Slides extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Deprecated: Use "ionSlideWillChange" instead.
    * Added 2016-12-29
    */
@@ -752,7 +752,7 @@ export class Slides extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Deprecated: Use "ionSlideDidChange" instead.
    * Added 2016-12-29
    */
@@ -763,7 +763,7 @@ export class Slides extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    * Deprecated: Use "ionSlideDrag" instead.
    * Added 2016-12-29
    */
@@ -785,27 +785,27 @@ export class Slides extends Ion {
    * Properties that are exposed publically but no docs.
    * ------------------------------------
    */
-  /** @private */
+  /** @hidden */
   clickedIndex: number;
-  /** @private */
+  /** @hidden */
   clickedSlide: SlideElement;
-  /** @private */
+  /** @hidden */
   container: SlideContainer;
-  /** @private */
+  /** @hidden */
   id: number;
-  /** @private */
+  /** @hidden */
   progress: number;
-  /** @private */
+  /** @hidden */
   realIndex: number;
-  /** @private */
+  /** @hidden */
   renderedHeight: number;
-  /** @private */
+  /** @hidden */
   renderedWidth: number;
-  /** @private */
+  /** @hidden */
   slideId: string;
-  /** @private */
+  /** @hidden */
   swipeDirection: string;
-  /** @private */
+  /** @hidden */
   velocity: number;
 
 
@@ -883,9 +883,9 @@ export class Slides extends Ion {
   /** @internal */
   _zoom: SlideZoom;
 
-  /** @private */
+  /** @hidden */
   nextButton: HTMLElement;
-  /** @private */
+  /** @hidden */
   prevButton: HTMLElement;
 
 
@@ -945,7 +945,7 @@ export class Slides extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._plt.timeout(() => {
@@ -1096,7 +1096,7 @@ export class Slides extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._init = false;
@@ -1113,7 +1113,7 @@ export class Slides extends Ion {
 
 
   /**
-   * @private
+   * @hidden
    * Deprecated, please use the instance of ion-slides.
    */
   getSlider(): void {
diff --git a/src/components/spinner/spinner.ts b/src/components/spinner/spinner.ts
index b9780612cc..b8a0c1c36a 100644
--- a/src/components/spinner/spinner.ts
+++ b/src/components/spinner/spinner.ts
@@ -183,7 +183,7 @@ export class Spinner extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     this._init = true;
@@ -191,7 +191,7 @@ export class Spinner extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   load() {
     if (this._init) {
diff --git a/src/components/split-pane/split-pane.ts b/src/components/split-pane/split-pane.ts
index 4c931470f7..29f52df25a 100644
--- a/src/components/split-pane/split-pane.ts
+++ b/src/components/split-pane/split-pane.ts
@@ -14,7 +14,7 @@ const QUERY: { [key: string]: string }  = {
 };
 
 /**
- * @private
+ * @hidden
  */
 export abstract class RootNode {
   abstract getElementRef(): ElementRef;
@@ -149,16 +149,16 @@ export class SplitPane extends Ion implements RootNode {
   _children: RootNode[];
 
   /**
-   * @private
+   * @hidden
    */
   sideContent: RootNode = null;
   /**
-   * @private
+   * @hidden
    */
   mainContent: RootNode = null;
 
   /**
-   * @private
+   * @hidden
    */
   @ContentChildren(RootNode, { descendants: false })
   set _setchildren(query: QueryList<RootNode>) {
@@ -207,7 +207,7 @@ export class SplitPane extends Ion implements RootNode {
 
 
   /**
-   * @private
+   * @hidden
    */
   _register(node: RootNode, isMain: boolean, callback: Function): boolean {
     if (this.getElementRef().nativeElement !== node.getElementRef().nativeElement.parentNode) {
@@ -227,7 +227,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterViewInit() {
     this._init = true;
@@ -235,7 +235,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _update() {
     if (!this._init) {
@@ -265,7 +265,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _updateChildren() {
     this.mainContent = null;
@@ -275,7 +275,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setVisible(visible: boolean) {
     if (this._visible === visible) {
@@ -290,21 +290,21 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   isVisible(): boolean {
     return this._visible;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setElementClass(className: string, add: boolean) {
     this._renderer.setElementClass(this._elementRef.nativeElement, className, add);
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setPaneCSSClass(elementRef: ElementRef, isMain: boolean) {
     const ele = elementRef.nativeElement;
@@ -313,7 +313,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     assert(this._rmListener, 'at this point _rmListerner should be valid');
@@ -323,7 +323,7 @@ export class SplitPane extends Ion implements RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   initPane(): boolean {
     return true;
diff --git a/src/components/tabs/tab-button.ts b/src/components/tabs/tab-button.ts
index fe33a89e12..d79a726c28 100644
--- a/src/components/tabs/tab-button.ts
+++ b/src/components/tabs/tab-button.ts
@@ -5,7 +5,7 @@ import { Ion } from '../ion';
 import { Tab } from './tab';
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: '.tab-button',
diff --git a/src/components/tabs/tab-highlight.ts b/src/components/tabs/tab-highlight.ts
index 4f7d6fbaea..845d79968e 100644
--- a/src/components/tabs/tab-highlight.ts
+++ b/src/components/tabs/tab-highlight.ts
@@ -4,7 +4,7 @@ import { DomController } from '../../platform/dom-controller';
 import { Tab } from './tab';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: '.tab-highlight'
diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts
index bb5549feb9..9ced302386 100644
--- a/src/components/tabs/tab.ts
+++ b/src/components/tabs/tab.ts
@@ -134,42 +134,42 @@ import { ViewController } from '../../navigation/view-controller';
 })
 export class Tab extends NavControllerBase {
   /**
-   * @private
+   * @hidden
    */
   _isInitial: boolean;
   /**
-   * @private
+   * @hidden
    */
   _isEnabled: boolean = true;
   /**
-   * @private
+   * @hidden
    */
   _isShown: boolean = true;
   /**
-   * @private
+   * @hidden
    */
   _tabId: string;
   /**
-   * @private
+   * @hidden
    */
   _btnId: string;
   /**
-   * @private
+   * @hidden
    */
   _loaded: boolean;
 
   /**
-   * @private
+   * @hidden
    */
   isSelected: boolean;
 
   /**
-   * @private
+   * @hidden
    */
   btn: TabButton;
 
   /**
-   * @private
+   * @hidden
    */
   _tabsHideOnSubPages: boolean;
 
@@ -286,7 +286,7 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   @ViewChild('viewport', {read: ViewContainerRef})
   set _vp(val: ViewContainerRef) {
@@ -294,14 +294,14 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnInit() {
     this.tabBadgeStyle = this.tabBadgeStyle ? this.tabBadgeStyle : 'default';
   }
 
   /**
-   * @private
+   * @hidden
    */
   load(opts: NavOptions, done?: Function) {
     if (!this._loaded && this.root) {
@@ -321,7 +321,7 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   resize() {
     const active = this.getActive();
@@ -333,7 +333,7 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _viewAttachToDOM(viewCtrl: ViewController, componentRef: ComponentRef<any>, viewport: ViewContainerRef) {
     const isTabSubPage = (this._tabsHideOnSubPages && viewCtrl.index > 0);
@@ -354,7 +354,7 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setSelected(isSelected: boolean) {
     this.isSelected = isSelected;
@@ -373,14 +373,14 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get index(): number {
     return this.parent.getIndex(this);
   }
 
   /**
-   * @private
+   * @hidden
    */
   updateHref(component: any, data: any) {
     if (this.btn && this.linker) {
@@ -390,7 +390,7 @@ export class Tab extends NavControllerBase {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this.destroy();
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index 665ec5e995..df7a3f9ebc 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -238,7 +238,7 @@ export class Tabs extends Ion implements AfterViewInit, RootNode {
   @ViewChild('portal', {read: ViewContainerRef}) portal: ViewContainerRef;
 
   /**
-   * @private
+   * @hidden
    */
   parent: NavControllerBase;
 
@@ -362,7 +362,7 @@ export class Tabs extends Ion implements AfterViewInit, RootNode {
   }
 
   /**
-   * @private
+   * @hidden
    */
   add(tab: Tab): string {
     this._tabs.push(tab);
diff --git a/src/components/toast/toast-component.ts b/src/components/toast/toast-component.ts
index 1858282520..f03e688609 100644
--- a/src/components/toast/toast-component.ts
+++ b/src/components/toast/toast-component.ts
@@ -6,7 +6,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 @Component({
   selector: 'ion-toast',
diff --git a/src/components/toast/toast.ts b/src/components/toast/toast.ts
index 07b970810c..ec1803b890 100644
--- a/src/components/toast/toast.ts
+++ b/src/components/toast/toast.ts
@@ -10,7 +10,7 @@ import { ViewController } from '../../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class Toast extends ViewController {
   private _app: App;
@@ -36,7 +36,7 @@ export class Toast extends ViewController {
   }
 
   /**
-  * @private
+  * @hidden
   */
   getTransitionName(direction: string) {
     let key = 'toast' + (direction === 'back' ? 'Leave' : 'Enter');
@@ -44,7 +44,7 @@ export class Toast extends ViewController {
   }
 
   /**
-  * @private
+  * @hidden
   */
   isValidPosition(position: string) {
     return position === TOAST_POSITION_TOP || position === TOAST_POSITION_MIDDLE || position === TOAST_POSITION_BOTTOM;
diff --git a/src/components/toggle/toggle-gesture.ts b/src/components/toggle/toggle-gesture.ts
index 2399e91829..245e839aac 100644
--- a/src/components/toggle/toggle-gesture.ts
+++ b/src/components/toggle/toggle-gesture.ts
@@ -6,7 +6,7 @@ import { pointerCoord } from '../../util/dom';
 import { Toggle } from './toggle';
 
 /**
- * @private
+ * @hidden
  */
 export class ToggleGesture extends PanGesture {
 
diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts
index 6b4346b0b6..8fc3137ac8 100644
--- a/src/components/toggle/toggle.ts
+++ b/src/components/toggle/toggle.ts
@@ -90,7 +90,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   _fn: Function = null;
   _gesture: ToggleGesture;
 
-  /** @private */
+  /** @hidden */
   id: string;
 
   /**
@@ -141,7 +141,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     this._init = true;
@@ -150,7 +150,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   _onDragStart(startX: number) {
     assert(startX, 'startX must be valid');
@@ -161,7 +161,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   _onDragMove(currentX: number) {
     if (!this._startX) {
@@ -188,7 +188,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   _onDragEnd(endX: number) {
     if (!this._startX) {
@@ -226,7 +226,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setChecked(isChecked: boolean) {
     if (isChecked !== this._checked) {
@@ -239,21 +239,21 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   writeValue(val: any) {
     this._setChecked( isTrueProperty(val) );
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnChange(fn: Function): void {
     this._fn = fn;
   }
 
   /**
-   * @private
+   * @hidden
    */
   registerOnTouched(fn: any) {
     this.onTouched = fn;
@@ -273,7 +273,7 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   onChange(isChecked: boolean) {
     // used when this input does not have an ngModel or formControlName
@@ -285,12 +285,12 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   onTouched() {}
 
   /**
-   * @private
+   * @hidden
    */
   @HostListener('keyup', ['$event']) _keyup(ev: KeyboardEvent) {
     if (ev.keyCode === KEY_SPACE || ev.keyCode === KEY_ENTER) {
@@ -302,21 +302,21 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont
   }
 
   /**
-   * @private
+   * @hidden
    */
   initFocus() {
     this._elementRef.nativeElement.querySelector('button').focus();
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDisabledState(isDisabled: boolean) {
     this.disabled = isDisabled;
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._form && this._form.deregister(this);
diff --git a/src/components/toolbar/toolbar-base.ts b/src/components/toolbar/toolbar-base.ts
index 2c29196a1d..78bde542cd 100644
--- a/src/components/toolbar/toolbar-base.ts
+++ b/src/components/toolbar/toolbar-base.ts
@@ -5,7 +5,7 @@ import { Ion } from '../ion';
 import { ToolbarTitle } from './toolbar-title';
 
 /**
- * @private
+ * @hidden
  */
 export class ToolbarBase extends Ion {
   private _title: ToolbarTitle;
@@ -15,14 +15,14 @@ export class ToolbarBase extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _setTitle(titleCmp: ToolbarTitle) {
     this._title = titleCmp;
   }
 
   /**
-   * @private
+   * @hidden
    * Returns the toolbar title text if it exists or an empty string
    */
   getTitleText() {
diff --git a/src/components/toolbar/toolbar-item.ts b/src/components/toolbar/toolbar-item.ts
index dbeee73462..4ef0ccf4d9 100644
--- a/src/components/toolbar/toolbar-item.ts
+++ b/src/components/toolbar/toolbar-item.ts
@@ -8,7 +8,7 @@ import { Toolbar } from './toolbar';
 
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: 'ion-buttons,[menuToggle]'
diff --git a/src/components/toolbar/toolbar-title.ts b/src/components/toolbar/toolbar-title.ts
index 65fbda3b95..4a5b78dfe4 100644
--- a/src/components/toolbar/toolbar-title.ts
+++ b/src/components/toolbar/toolbar-title.ts
@@ -65,7 +65,7 @@ export class ToolbarTitle extends Ion {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTitleText() {
     return this._elementRef.nativeElement.textContent;
diff --git a/src/components/toolbar/toolbar.ts b/src/components/toolbar/toolbar.ts
index e02fa077cf..7b8a3d00de 100644
--- a/src/components/toolbar/toolbar.ts
+++ b/src/components/toolbar/toolbar.ts
@@ -110,7 +110,7 @@ import { ToolbarBase } from './toolbar-base';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class Toolbar extends ToolbarBase {
-  /** @private */
+  /** @hidden */
   _sbPadding: boolean;
 
   /**
diff --git a/src/components/typography/typography.ts b/src/components/typography/typography.ts
index 9ef9e4cf1b..57eb944940 100644
--- a/src/components/typography/typography.ts
+++ b/src/components/typography/typography.ts
@@ -5,7 +5,7 @@ import { Ion } from '../ion';
 
 
 /**
-  * @private TODO remove this line when we remove the other selectors in order to document it
+  * @hidden TODO remove this line when we remove the other selectors in order to document it
   * @name Typography
   * @module ionic
   * @description
diff --git a/src/components/virtual-scroll/virtual-footer.ts b/src/components/virtual-scroll/virtual-footer.ts
index 95a77c89db..6fea534a28 100644
--- a/src/components/virtual-scroll/virtual-footer.ts
+++ b/src/components/virtual-scroll/virtual-footer.ts
@@ -2,7 +2,7 @@ import { Directive, TemplateRef } from '@angular/core';
 import { VirtualContext } from './virtual-util';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({selector: '[virtualFooter]'})
 export class VirtualFooter {
diff --git a/src/components/virtual-scroll/virtual-header.ts b/src/components/virtual-scroll/virtual-header.ts
index e78aa2a5f1..6e517629c4 100644
--- a/src/components/virtual-scroll/virtual-header.ts
+++ b/src/components/virtual-scroll/virtual-header.ts
@@ -2,7 +2,7 @@ import { Directive, TemplateRef } from '@angular/core';
 import { VirtualContext } from './virtual-util';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({selector: '[virtualHeader]'})
 export class VirtualHeader {
diff --git a/src/components/virtual-scroll/virtual-item.ts b/src/components/virtual-scroll/virtual-item.ts
index 2fd350c36f..7f2bfc63f9 100644
--- a/src/components/virtual-scroll/virtual-item.ts
+++ b/src/components/virtual-scroll/virtual-item.ts
@@ -2,7 +2,7 @@ import { Directive, TemplateRef, ViewContainerRef } from '@angular/core';
 import { VirtualContext } from './virtual-util';
 
 /**
- * @private
+ * @hidden
  */
 @Directive({selector: '[virtualItem]'})
 export class VirtualItem {
diff --git a/src/components/virtual-scroll/virtual-scroll.ts b/src/components/virtual-scroll/virtual-scroll.ts
index 24c2831c06..82005ea2b1 100644
--- a/src/components/virtual-scroll/virtual-scroll.ts
+++ b/src/components/virtual-scroll/virtual-scroll.ts
@@ -404,7 +404,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngDoCheck() {
     if (this._init && this._hasChanges()) {
@@ -450,7 +450,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   renderVirtual() {
@@ -524,7 +524,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   scrollUpdate(ev: ScrollEvent) {
     // there is a queue system so that we can
@@ -614,7 +614,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   scrollEnd(ev: ScrollEvent) {
@@ -689,7 +689,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngAfterContentInit() {
     if (!this._itmTmp) {
@@ -703,7 +703,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
   }
 
   /**
-   * @private
+   * @hidden
    */
   ngOnDestroy() {
     this._scrollSub && this._scrollSub.unsubscribe();
diff --git a/src/config/config.ts b/src/config/config.ts
index ddac74ab4e..60ed76ec32 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -132,12 +132,12 @@ export class Config {
   private _trns: any = {};
 
   /**
-   * @private
+   * @hidden
    */
   plt: Platform;
 
   /**
-   * @private
+   * @hidden
    */
   init(config: any, plt: Platform) {
     this._s = config && isObject(config) && !isArray(config) ? config : {};
@@ -336,7 +336,7 @@ export class Config {
   }
 
   /**
-   * @private
+   * @hidden
    * @name settings()
    * @description
    */
@@ -364,28 +364,28 @@ export class Config {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setModeConfig(modeName: string, modeConfig: any) {
     this._modes[modeName] = modeConfig;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getModeConfig(modeName: string): any {
     return this._modes[modeName] || null;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setTransition(trnsName: string, trnsClass: any) {
     this._trns[trnsName] = trnsClass;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransition(trnsName: string): any {
     return this._trns[trnsName] || null;
@@ -394,7 +394,7 @@ export class Config {
 }
 
 /**
- * @private
+ * @hidden
  */
 export function setupConfig(userConfig: any, plt: Platform): Config {
   const config = new Config();
@@ -409,6 +409,6 @@ export function setupConfig(userConfig: any, plt: Platform): Config {
 }
 
 /**
- * @private
+ * @hidden
  */
 export const ConfigToken = new OpaqueToken('USERCONFIG');
diff --git a/src/gestures/drag-gesture.ts b/src/gestures/drag-gesture.ts
index 86b7c74c46..842b681df2 100644
--- a/src/gestures/drag-gesture.ts
+++ b/src/gestures/drag-gesture.ts
@@ -9,7 +9,7 @@ import { UIEventManager } from './ui-event-manager';
 
 
 /**
- * @private
+ * @hidden
  */
 export class PanGesture {
   private debouncer: DomDebouncer;
@@ -177,7 +177,7 @@ export class PanGesture {
 
 
 /**
- * @private
+ * @hidden
  */
 export interface PanGestureConfig {
   threshold?: number;
diff --git a/src/gestures/gesture-config.ts b/src/gestures/gesture-config.ts
index 6e0ad9fa6b..2a30215b55 100644
--- a/src/gestures/gesture-config.ts
+++ b/src/gestures/gesture-config.ts
@@ -3,7 +3,7 @@ import { HammerGestureConfig } from '@angular/platform-browser';
 
 
 /**
- * @private
+ * @hidden
  * This class overrides the default Angular gesture config.
  */
 @Injectable()
diff --git a/src/gestures/gesture-controller.ts b/src/gestures/gesture-controller.ts
index 41289f6bed..b1716a77b0 100644
--- a/src/gestures/gesture-controller.ts
+++ b/src/gestures/gesture-controller.ts
@@ -2,40 +2,40 @@ import { forwardRef, Inject, Injectable } from '@angular/core';
 import { App } from '../components/app/app';
 import { assert } from '../util/util';
 
-/** @private */
+/** @hidden */
 export const GESTURE_GO_BACK_SWIPE = 'goback-swipe';
 
-/** @private */
+/** @hidden */
 export const GESTURE_MENU_SWIPE = 'menu-swipe';
 
-/** @private */
+/** @hidden */
 export const GESTURE_ITEM_SWIPE = 'item-swipe';
 
-/** @private */
+/** @hidden */
 export const GESTURE_REFRESHER = 'refresher';
 
-/** @private */
+/** @hidden */
 export const GESTURE_TOGGLE = 'toggle';
 
 
-/** @private */
+/** @hidden */
 export const GESTURE_PRIORITY_SLIDING_ITEM = -10;
 
-/** @private */
+/** @hidden */
 export const GESTURE_PRIORITY_REFRESHER = 0;
 
-/** @private */
+/** @hidden */
 export const GESTURE_PRIORITY_MENU_SWIPE = 10;
 
-/** @private */
+/** @hidden */
 export const GESTURE_PRIORITY_GO_BACK_SWIPE = 20;
 
-/** @private */
+/** @hidden */
 export const GESTURE_PRIORITY_TOGGLE = 30;
 
 
 /**
-* @private
+* @hidden
 */
 export interface GestureOptions {
   name: string;
@@ -44,7 +44,7 @@ export interface GestureOptions {
 }
 
 /**
-* @private
+* @hidden
 */
 export interface BlockerOptions {
   disableScroll?: boolean;
@@ -52,7 +52,7 @@ export interface BlockerOptions {
 }
 
 /**
-* @private
+* @hidden
 */
 export const BLOCK_ALL: BlockerOptions = {
   disable: [GESTURE_MENU_SWIPE, GESTURE_GO_BACK_SWIPE],
@@ -60,7 +60,7 @@ export const BLOCK_ALL: BlockerOptions = {
 };
 
 /**
-* @private
+* @hidden
 */
 @Injectable()
 export class GestureController {
@@ -200,7 +200,7 @@ export class GestureController {
 }
 
 /**
-* @private
+* @hidden
 */
 export class GestureDelegate {
 
@@ -258,7 +258,7 @@ export class GestureDelegate {
 }
 
 /**
-* @private
+* @hidden
 */
 export class BlockerDelegate {
 
diff --git a/src/gestures/gesture.ts b/src/gestures/gesture.ts
index ed32833d0f..761b7fb280 100644
--- a/src/gestures/gesture.ts
+++ b/src/gestures/gesture.ts
@@ -2,7 +2,7 @@ import { defaults } from '../util/util';
 import { Hammer, DIRECTION_HORIZONTAL, DIRECTION_VERTICAL } from './hammer';
 
 /**
- * @private
+ * @hidden
  * A gesture recognizer class.
  *
  * TODO(mlynch): Re-enable the DOM event simulation that was causing issues (or verify hammer does this already, it might);
diff --git a/src/gestures/pointer-events.ts b/src/gestures/pointer-events.ts
index 2343dcb2a2..cd8806ffa0 100644
--- a/src/gestures/pointer-events.ts
+++ b/src/gestures/pointer-events.ts
@@ -2,7 +2,7 @@ import { assert } from '../util/util';
 import { Platform, EventListenerOptions } from '../platform/platform';
 
 /**
- * @private
+ * @hidden
  */
 export class PointerEvents {
   private rmTouchStart: Function = null;
diff --git a/src/gestures/slide-edge-gesture.ts b/src/gestures/slide-edge-gesture.ts
index 047059ddc2..5737e46c7b 100644
--- a/src/gestures/slide-edge-gesture.ts
+++ b/src/gestures/slide-edge-gesture.ts
@@ -4,7 +4,7 @@ import { pointerCoord } from '../util/dom';
 import { Platform } from '../platform/platform';
 
 /**
- * @private
+ * @hidden
  */
 export class SlideEdgeGesture extends SlideGesture {
   public edges: Array<string>;
diff --git a/src/gestures/slide-gesture.ts b/src/gestures/slide-gesture.ts
index 7e9cd2aafb..ac836fd6bf 100644
--- a/src/gestures/slide-gesture.ts
+++ b/src/gestures/slide-gesture.ts
@@ -4,7 +4,7 @@ import { Platform } from '../platform/platform';
 import { pointerCoord } from '../util/dom';
 
 /**
- * @private
+ * @hidden
  */
 export class SlideGesture extends PanGesture {
   public slide: SlideData = null;
@@ -92,7 +92,7 @@ export class SlideGesture extends PanGesture {
 }
 
 /**
- * @private
+ * @hidden
  */
 export interface SlideData {
   min: number;
diff --git a/src/gestures/ui-event-manager.ts b/src/gestures/ui-event-manager.ts
index 4d826ff908..a8688d25ea 100644
--- a/src/gestures/ui-event-manager.ts
+++ b/src/gestures/ui-event-manager.ts
@@ -3,7 +3,7 @@ import { Platform, EventListenerOptions } from '../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  */
 export class UIEventManager {
   private evts: Function[] = [];
diff --git a/src/index.ts b/src/index.ts
index af1797e8c5..1c2ba157e7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -651,7 +651,7 @@ export class DeepLinkModule {
 }
 
 /**
- * @private
+ * @hidden
  */
 export function provideLocationStrategy(platformLocationStrategy: PlatformLocation,
                                         baseHref: string, config: Config) {
diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
index be0f861452..f3e08261b6 100644
--- a/src/navigation/nav-controller-base.ts
+++ b/src/navigation/nav-controller-base.ts
@@ -21,7 +21,7 @@ import { Transition } from '../transitions/transition';
 import { TransitionController } from '../transitions/transition-controller';
 
 /**
- * @private
+ * @hidden
  * This class is for internal use only. It is not exported publicly.
  */
 export class NavControllerBase extends Ion implements NavController {
diff --git a/src/navigation/nav-controller.ts b/src/navigation/nav-controller.ts
index 71bca1ae27..ff0f5cfd01 100644
--- a/src/navigation/nav-controller.ts
+++ b/src/navigation/nav-controller.ts
@@ -387,7 +387,7 @@ export abstract class NavController {
   viewWillUnload: EventEmitter<any>;
 
   /**
-   * @private
+   * @hidden
    */
   id: string;
 
@@ -399,7 +399,7 @@ export abstract class NavController {
   parent: any;
 
   /**
-   * @private
+   * @hidden
    */
   config: Config;
 
@@ -457,7 +457,7 @@ export abstract class NavController {
   abstract popToRoot(opts?: NavOptions, done?: Function): Promise<any>;
 
   /**
-   * @private
+   * @hidden
    * Pop to a specific view in the history stack. If an already created
    * instance of the page is not found in the stack, then it'll `setRoot`
    * to the nav stack by removing all current pages and pushing on a
@@ -474,7 +474,7 @@ export abstract class NavController {
   abstract popTo(page: Page | string | ViewController, params?: any, opts?: NavOptions, done?: Function): Promise<any>;
 
   /**
-   * @private
+   * @hidden
    * Pop sequently all the pages in the stack.
    *
    * @returns {Promise} Returns a promise which is resolved when the transition has completed.
@@ -607,12 +607,12 @@ export abstract class NavController {
   abstract canGoBack(): boolean;
 
   /**
-   * @private
+   * @hidden
    */
   abstract registerChildNav(nav: any): void;
 
   /**
-   * @private
+   * @hidden
    */
   abstract resize(): void;
 }
diff --git a/src/navigation/nav-params.ts b/src/navigation/nav-params.ts
index 9337bad1cd..5cd6f12c16 100644
--- a/src/navigation/nav-params.ts
+++ b/src/navigation/nav-params.ts
@@ -23,7 +23,7 @@
 export class NavParams {
 
   /**
-   * @private
+   * @hidden
    * @param {TODO} data  TODO
    */
   constructor(public data: any = {}) {}
diff --git a/src/navigation/nav-util.ts b/src/navigation/nav-util.ts
index 0c03b0ea8f..1c294d3e50 100644
--- a/src/navigation/nav-util.ts
+++ b/src/navigation/nav-util.ts
@@ -116,7 +116,7 @@ export interface DeepLinkMetadataType {
 }
 
 /**
- * @private
+ * @hidden
  */
 export class DeepLinkMetadata implements DeepLinkMetadataType {
   component?: any;
@@ -135,12 +135,12 @@ export interface DeepLinkMetadataFactory {
 }
 
 /**
- * @private
+ * @hidden
  */
 export var DeepLinkMetadataFactory: DeepLinkMetadataFactory;
 
 /**
- * @private
+ * @hidden
  */
 export interface DeepLinkConfig {
   links: DeepLinkMetadata[];
diff --git a/src/navigation/swipe-back.ts b/src/navigation/swipe-back.ts
index aef0911c85..8ffea77b37 100644
--- a/src/navigation/swipe-back.ts
+++ b/src/navigation/swipe-back.ts
@@ -7,7 +7,7 @@ import { SlideData } from '../gestures/slide-gesture';
 import { SlideEdgeGesture } from '../gestures/slide-edge-gesture';
 
 /**
- * @private
+ * @hidden
  */
 export class SwipeBackGesture extends SlideEdgeGesture {
 
diff --git a/src/navigation/url-serializer.ts b/src/navigation/url-serializer.ts
index bd4ab53bfb..5db4b5bd65 100644
--- a/src/navigation/url-serializer.ts
+++ b/src/navigation/url-serializer.ts
@@ -5,7 +5,7 @@ import { isArray, isBlank, isPresent } from '../util/util';
 
 
 /**
- * @private
+ * @hidden
  */
 export class UrlSerializer {
   links: NavLink[];
@@ -318,7 +318,7 @@ function sortConfigLinks(a: NavLink, b: NavLink) {
 const URL_REPLACE_REG = /\s+|\?|\!|\$|\,|\.|\+|\"|\'|\*|\^|\||\/|\\|\[|\]|#|%|`|>|<|;|:|@|&|=/g;
 
 /**
- * @private
+ * @hidden
  */
 export const DeepLinkConfigToken = new OpaqueToken('USERLINKS');
 
diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts
index e40ce51606..dc61da36a9 100644
--- a/src/navigation/view-controller.ts
+++ b/src/navigation/view-controller.ts
@@ -81,28 +81,28 @@ export class ViewController {
   willUnload: EventEmitter<any> = new EventEmitter();
 
   /**
-   * @private
+   * @hidden
    */
   readReady: EventEmitter<any> = new EventEmitter<any>();
 
   /**
-   * @private
+   * @hidden
    */
   writeReady: EventEmitter<any> = new EventEmitter<any>();
 
-  /** @private */
+  /** @hidden */
   data: any;
 
-  /** @private */
+  /** @hidden */
   instance: any;
 
-  /** @private */
+  /** @hidden */
   id: string;
 
-  /** @private */
+  /** @hidden */
   isOverlay: boolean = false;
 
-  /** @private */
+  /** @hidden */
   @Output() private _emitter: EventEmitter<any> = new EventEmitter();
 
   constructor(public component?: any, data?: any, rootCssClass: string = DEFAULT_CSS_CLASS) {
@@ -113,7 +113,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   init(componentRef: ComponentRef<any>) {
     this._cmp = componentRef;
@@ -130,14 +130,14 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   subscribe(generatorOrNext?: any): any {
     return this._emitter.subscribe(generatorOrNext);
   }
 
   /**
-   * @private
+   * @hidden
    */
   emit(data?: any) {
     this._emitter.emit(data);
@@ -183,28 +183,28 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getNav(): NavController {
     return this._nav;
   }
 
   /**
-   * @private
+   * @hidden
    */
   getTransitionName(direction: string): string {
     return this._nav && this._nav.config.get('pageTransition');
   }
 
   /**
-   * @private
+   * @hidden
    */
   getNavParams(): NavParams {
     return new NavParams(this.data);
   }
 
   /**
-   * @private
+   * @hidden
    */
   setLeavingOpts(opts: NavOptions) {
     this._leavingOpts = opts;
@@ -226,7 +226,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   get name(): string {
     return (this.component ? this.component.name : '');
@@ -255,7 +255,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   _domShow(shouldShow: boolean, renderer: Renderer) {
@@ -273,14 +273,14 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getZIndex(): number {
     return this._zIndex;
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   _setZIndex(zIndex: number, renderer: Renderer) {
@@ -329,7 +329,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getIONContent(): Content {
     return this._ionCntDir;
@@ -341,7 +341,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getIONContentRef(): ElementRef {
     return this._ionCntRef;
@@ -352,7 +352,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getHeader(): Header {
     return this._hdrDir;
@@ -363,7 +363,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getFooter(): Footer {
     return this._ftrDir;
@@ -374,7 +374,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getNavbar(): Navbar {
     return this._nb;
@@ -416,7 +416,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view has loaded. This event only happens once per view will be created.
    * This event is fired before the component and his children have been initialized.
    */
@@ -426,7 +426,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view has loaded. This event only happens once per view being
    * created. If a view leaves but is cached, then this will not
    * fire again on a subsequent viewing. This method is a good place
@@ -439,7 +439,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view is about to enter and become the active view.
    */
   _willEnter() {
@@ -456,7 +456,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view has fully entered and is now the active view. This
    * will fire, whether it was the first load or loaded from the cache.
    */
@@ -469,7 +469,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view is about to leave and no longer be the active view.
    */
   _willLeave(willUnload: boolean) {
@@ -483,7 +483,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * The view has finished leaving and is no longer the active view. This
    * will fire, whether it is cached or unloaded.
    */
@@ -500,7 +500,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _willUnload() {
     this.willUnload.emit(null);
@@ -513,7 +513,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    * DOM WRITE
    */
   _destroy(renderer: Renderer) {
@@ -537,7 +537,7 @@ export class ViewController {
   }
 
   /**
-   * @private
+   * @hidden
    */
   _lifecycleTest(lifecycle: string): boolean | Promise<any> {
     const instance = this.instance;
diff --git a/src/platform/dom-controller.ts b/src/platform/dom-controller.ts
index fb8af2d54e..8d5675ce27 100644
--- a/src/platform/dom-controller.ts
+++ b/src/platform/dom-controller.ts
@@ -9,7 +9,7 @@ import { removeArrayItem } from '../util/util';
 
 
 /**
- * @private
+ * @hidden
  */
 export class DomDebouncer {
 
@@ -51,7 +51,7 @@ export class DomDebouncer {
 
 
 /**
- * @private
+ * @hidden
  */
 @Injectable()
 export class DomController {
@@ -150,6 +150,6 @@ function dispatch(timeStamp: number, r: Function[], w: Function[]) {
 
 
 /**
- * @private
+ * @hidden
  */
 export type DomCallback = { (timeStamp?: number): void };
diff --git a/src/platform/keyboard.ts b/src/platform/keyboard.ts
index 7e8b3a7c1e..a37ae62b4c 100644
--- a/src/platform/keyboard.ts
+++ b/src/platform/keyboard.ts
@@ -137,7 +137,7 @@ export class Keyboard {
   }
 
   /**
-   * @private
+   * @hidden
    */
   focusOutline(setting: any) {
     /* Focus Outline
diff --git a/src/platform/platform.ts b/src/platform/platform.ts
index 9a1bcd2e97..b15a82fd69 100644
--- a/src/platform/platform.ts
+++ b/src/platform/platform.ts
@@ -50,7 +50,7 @@ export class Platform {
   private _isPortrait: boolean = null;
   private _uiEvtOpts = false;
 
-  /** @private */
+  /** @hidden */
   zone: NgZone;
 
   /** @internal */
@@ -82,42 +82,42 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   setWindow(win: Window) {
     this._win = win;
   }
 
   /**
-   * @private
+   * @hidden
    */
   win() {
     return this._win;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDocument(doc: HTMLDocument) {
     this._doc = doc;
   }
 
   /**
-   * @private
+   * @hidden
    */
   doc() {
     return this._doc;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setZone(zone: NgZone) {
     this.zone = zone;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setCssProps(docElement: HTMLElement) {
     this.Css = getCss(docElement);
@@ -222,7 +222,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   version(): PlatformVersion {
     for (var platformName in this._versions) {
@@ -268,7 +268,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * This should be triggered by the engine when the platform is
    * ready. If there was no custom prepareReady method from the engine,
    * such as Cordova or Electron, then it uses the default DOM ready.
@@ -280,7 +280,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * This is the default prepareReady if it's not replaced by an engine,
    * such as Cordova or Electron. If there was no custom prepareReady
    * method from an engine then it uses the method below, which triggers
@@ -376,7 +376,7 @@ export class Platform {
   // called by engines (the browser)that do not provide them
 
   /**
-   * @private
+   * @hidden
    */
   exitApp() {}
 
@@ -384,7 +384,7 @@ export class Platform {
   // **********************************************
 
   /**
-   * @private
+   * @hidden
    */
   backButton: EventEmitter<Event> = new EventEmitter<Event>();
 
@@ -441,7 +441,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   runBackButtonAction() {
     // decide which one back button action should run
@@ -461,14 +461,14 @@ export class Platform {
   // **********************************************
 
   /**
-   * @private
+   * @hidden
    */
   setUserAgent(userAgent: string) {
     this._ua = userAgent;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setQueryParams(url: string) {
     this._qp.parseUrl(url);
@@ -489,21 +489,21 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   userAgent(): string {
     return this._ua || '';
   }
 
   /**
-   * @private
+   * @hidden
    */
   setNavigatorPlatform(navigatorPlt: string) {
     this._nPlt = navigatorPlt;
   }
 
   /**
-   * @private
+   * @hidden
    */
   navigatorPlatform(): string {
     return this._nPlt || '';
@@ -530,21 +530,21 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   getElementComputedStyle(ele: HTMLElement, pseudoEle?: string) {
     return this._win['getComputedStyle'](ele, pseudoEle);
   }
 
   /**
-   * @private
+   * @hidden
    */
   getElementFromPoint(x: number, y: number) {
     return <HTMLElement>this._doc['elementFromPoint'](x, y);
   }
 
   /**
-   * @private
+   * @hidden
    */
   getElementBoundingClientRect(ele: HTMLElement) {
     return ele['getBoundingClientRect']();
@@ -625,7 +625,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * This requestAnimationFrame will NOT be wrapped by zone.
    */
   raf(callback: {(timeStamp?: number): void}|Function): number {
@@ -634,7 +634,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   cancelRaf(rafId: number) {
     const win: any = this._win;
@@ -642,7 +642,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * This setTimeout will NOT be wrapped by zone.
    */
   timeout(callback: Function, timeout?: number): number {
@@ -651,7 +651,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * This setTimeout will NOT be wrapped by zone.
    */
   cancelTimeout(timeoutId: number) {
@@ -660,7 +660,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    * Built to use modern event listener options, like "passive".
    * If options are not supported, then just return a boolean which
    * represents "capture". Returns a method to remove the listener.
@@ -698,7 +698,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   transitionEnd(el: HTMLElement, callback: {(ev?: TransitionEvent): void}, zone = true) {
     const unRegs: Function[] = [];
@@ -725,7 +725,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   windowLoad(callback: Function) {
     const win = this._win;
@@ -744,28 +744,28 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   isActiveElement(ele: HTMLElement) {
     return !!(ele && (this.getActiveElement() === ele));
   }
 
   /**
-   * @private
+   * @hidden
    */
   getActiveElement() {
     return this._doc['activeElement'];
   }
 
   /**
-   * @private
+   * @hidden
    */
   hasFocus(ele: HTMLElement) {
     return !!((ele && (this.getActiveElement() === ele)) && (ele.parentElement.querySelector(':focus') === ele));
   }
 
   /**
-   * @private
+   * @hidden
    */
   hasFocusedTextInput() {
     const ele = this.getActiveElement();
@@ -776,7 +776,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   focusOutActiveElement() {
     const activeElement: any = this.getActiveElement();
@@ -817,35 +817,35 @@ export class Platform {
   // **********************************************
 
   /**
-   * @private
+   * @hidden
    */
   setPlatformConfigs(platformConfigs: {[key: string]: PlatformConfig}) {
     this._registry = platformConfigs || {};
   }
 
   /**
-   * @private
+   * @hidden
    */
   getPlatformConfig(platformName: string): PlatformConfig {
     return this._registry[platformName] || {};
   }
 
   /**
-   * @private
+   * @hidden
    */
   registry() {
     return this._registry;
   }
 
   /**
-   * @private
+   * @hidden
    */
   setDefault(platformName: string) {
     this._default = platformName;
   }
 
   /**
-   * @private
+   * @hidden
    */
   testQuery(queryValue: string, queryTestValue: string): boolean {
     const valueSplit = queryValue.toLowerCase().split(';');
@@ -853,7 +853,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   testNavigatorPlatform(navigatorPlatformExpression: string): boolean {
     const rgx = new RegExp(navigatorPlatformExpression, 'i');
@@ -861,7 +861,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   matchUserAgentVersion(userAgentExpression: RegExp): any {
     if (this._ua && userAgentExpression) {
@@ -883,7 +883,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   isPlatformMatch(queryStringName: string, userAgentAtLeastHas?: string[], userAgentMustNotHave: string[] = []): boolean {
     const queryValue = this._qp.get('ionicplatform');
@@ -909,7 +909,7 @@ export class Platform {
     return false;
   }
 
-  /** @private */
+  /** @hidden */
   init() {
     this._initEvents();
 
@@ -1004,7 +1004,7 @@ export class Platform {
   }
 
   /**
-   * @private
+   * @hidden
    */
   private matchPlatform(platformName: string): PlatformNode {
     // build a PlatformNode and assign config data to it
@@ -1042,7 +1042,7 @@ function insertSuperset(registry: any, platformNode: PlatformNode) {
 }
 
 /**
- * @private
+ * @hidden
  */
 class PlatformNode {
   private c: PlatformConfig;
@@ -1166,7 +1166,7 @@ export interface EventListenerOptions {
 
 
 /**
- * @private
+ * @hidden
  */
 export function setupPlatform(doc: HTMLDocument, platformConfigs: {[key: string]: PlatformConfig}, zone: NgZone): Platform {
   const plt = new Platform();
diff --git a/src/platform/query-params.ts b/src/platform/query-params.ts
index 2a9fb868b1..9740e2b4f1 100644
--- a/src/platform/query-params.ts
+++ b/src/platform/query-params.ts
@@ -1,5 +1,5 @@
 /**
- * @private
+ * @hidden
  */
 export class QueryParams {
   data: {[key: string]: any} = {};
diff --git a/src/tap-click/ripple.ts b/src/tap-click/ripple.ts
index 4740d55d2b..8ca85ccd81 100644
--- a/src/tap-click/ripple.ts
+++ b/src/tap-click/ripple.ts
@@ -7,7 +7,7 @@ import { DomController } from '../platform/dom-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 export class RippleActivator implements ActivatorBase {
   protected highlight: Activator;
diff --git a/src/tap-click/tap-click.ts b/src/tap-click/tap-click.ts
index 4c9f88ae2c..92588f4e98 100644
--- a/src/tap-click/tap-click.ts
+++ b/src/tap-click/tap-click.ts
@@ -14,7 +14,7 @@ import { RippleActivator } from './ripple';
 import { UIEventManager } from '../gestures/ui-event-manager';
 
 /**
- * @private
+ * @hidden
  */
 @Injectable()
 export class TapClick {
@@ -234,7 +234,7 @@ function getActivatableTarget(ele: HTMLElement): any {
 }
 
 /**
- * @private
+ * @hidden
  */
 export const isActivatable = function (ele: HTMLElement) {
   if (ACTIVATABLE_ELEMENTS.indexOf(ele.tagName) > -1) {
@@ -256,7 +256,7 @@ const DISABLE_NATIVE_CLICK_AMOUNT = 2500;
 
 
 /**
- * @private
+ * @hidden
  */
 export function setupTapClick(config: Config, plt: Platform, dom: DomController, app: App, zone: NgZone, gestureCtrl: GestureController) {
   return function() {
diff --git a/src/transitions/page-transition.ts b/src/transitions/page-transition.ts
index 2a9a06bdff..5ef4ae897f 100644
--- a/src/transitions/page-transition.ts
+++ b/src/transitions/page-transition.ts
@@ -3,7 +3,7 @@ import { Transition } from './transition';
 
 
 /**
- * @private
+ * @hidden
  */
 export class PageTransition extends Transition {
   enteringPage: Animation;
diff --git a/src/transitions/transition-controller.ts b/src/transitions/transition-controller.ts
index d8198d3ec3..cc7ba3468f 100644
--- a/src/transitions/transition-controller.ts
+++ b/src/transitions/transition-controller.ts
@@ -10,7 +10,7 @@ import { ViewController } from '../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  */
 @Injectable()
 export class TransitionController {
diff --git a/src/transitions/transition.ts b/src/transitions/transition.ts
index 5c7f4e430f..0847b970b8 100644
--- a/src/transitions/transition.ts
+++ b/src/transitions/transition.ts
@@ -4,7 +4,7 @@ import { ViewController } from '../navigation/view-controller';
 
 
 /**
- * @private
+ * @hidden
  *
  * - play
  * - Add before classes - DOM WRITE
diff --git a/src/util/click-block.ts b/src/util/click-block.ts
index e16693a1f8..b82050d63d 100644
--- a/src/util/click-block.ts
+++ b/src/util/click-block.ts
@@ -6,7 +6,7 @@ import { Platform } from '../platform/platform';
 
 
 /**
- * @private
+ * @hidden
  */
 @Directive({
   selector: '.click-block'
diff --git a/src/util/events.ts b/src/util/events.ts
index 5624ecb03d..343c5d4b1c 100644
--- a/src/util/events.ts
+++ b/src/util/events.ts
@@ -107,7 +107,7 @@ export class Events {
 }
 
 /**
- * @private
+ * @hidden
  */
 export function setupEvents(plt: Platform, dom: DomController): Events {
   const events = new Events();
@@ -170,7 +170,7 @@ export function setupEvents(plt: Platform, dom: DomController): Events {
 }
 
 /**
- * @private
+ * @hidden
  */
 export function setupProvideEvents(plt: Platform, dom: DomController) {
   return function() {
diff --git a/src/util/form.ts b/src/util/form.ts
index 6d6ba0bbc1..8b5589728e 100644
--- a/src/util/form.ts
+++ b/src/util/form.ts
@@ -3,7 +3,7 @@ import { removeArrayItem } from './util';
 
 
 /**
- * @private
+ * @hidden
  */
 @Injectable()
 export class Form {
@@ -56,7 +56,7 @@ export class Form {
 }
 
 /**
- * @private
+ * @hidden
  */
 export abstract class IonicTapInput implements IonicFormInput {
 
@@ -73,7 +73,7 @@ export abstract class IonicTapInput implements IonicFormInput {
 }
 
 /**
- * @private
+ * @hidden
  */
 export abstract class IonicFormInput {
 
diff --git a/src/util/module-loader.ts b/src/util/module-loader.ts
index 61367802a8..9e2db848a7 100644
--- a/src/util/module-loader.ts
+++ b/src/util/module-loader.ts
@@ -9,7 +9,7 @@ export const LAZY_LOADED_TOKEN = new OpaqueToken('LZYCMP');
 
 
 /**
- * @private
+ * @hidden
  */
 @Injectable()
 export class ModuleLoader {
@@ -61,7 +61,7 @@ const SPLITTER = '#';
 
 
 /**
- * @private
+ * @hidden
  */
 export function provideModuleLoader(ngModuleLoader: NgModuleLoader, injector: Injector) {
   return new ModuleLoader(ngModuleLoader, injector);
@@ -75,7 +75,7 @@ export interface LoadedModule {
 
 
 /**
- * @private
+ * @hidden
  */
 export function setupPreloadingImplementation(config: Config, deepLinkConfig: DeepLinkConfig, moduleLoader: ModuleLoader) {
   if (config.getBoolean('preloadModules')) {
@@ -103,7 +103,7 @@ export function setupPreloadingImplementation(config: Config, deepLinkConfig: De
 }
 
 /**
- * @private
+ * @hidden
  */
 export function setupPreloading(config: Config, deepLinkConfig: DeepLinkConfig, moduleLoader: ModuleLoader, ngZone: NgZone) {
   return function() {
diff --git a/src/util/scroll-view.ts b/src/util/scroll-view.ts
index d9a5b9ca4e..369f10ccec 100644
--- a/src/util/scroll-view.ts
+++ b/src/util/scroll-view.ts
@@ -169,7 +169,7 @@ export class ScrollView {
 
 
   /**
-   * @private
+   * @hidden
    * JS Scrolling has been provided only as a temporary solution
    * until iOS apps can take advantage of scroll events at all times.
    * The goal is to eventually remove JS scrolling entirely. When we
@@ -508,7 +508,7 @@ export class ScrollView {
   }
 
   /**
-   * @private
+   * @hidden
    */
   destroy() {
     this.stop();
diff --git a/src/util/util.ts b/src/util/util.ts
index 070665399a..9135972fbc 100644
--- a/src/util/util.ts
+++ b/src/util/util.ts
@@ -1,6 +1,6 @@
 
 /**
- * @private
+ * @hidden
  * Given a min and max, restrict the given number
  * to the range.
  * @param min the minimum
@@ -11,12 +11,12 @@ export function clamp(min: number, n: number, max: number) {
   return Math.max(min, Math.min(n, max));
 }
 
-/** @private */
+/** @hidden */
 export function deepCopy(obj: any) {
   return JSON.parse(JSON.stringify(obj));
 }
 
-/** @private */
+/** @hidden */
 export function debounce(fn: Function, wait: number, immediate: boolean = false): any {
  var timeout: number, args: any, context: any, timestamp: number, result: any;
  return function() {
@@ -42,7 +42,7 @@ export function debounce(fn: Function, wait: number, immediate: boolean = false)
 }
 
 /**
- * @private
+ * @hidden
  * Apply default arguments if they don't exist in
  * the first object.
  * @param the destination to apply defaults to.
@@ -62,35 +62,35 @@ export function defaults(dest: any, ...args: any[]) {
 }
 
 
-/** @private */
+/** @hidden */
 export function isBoolean(val: any) { return typeof val === 'boolean'; }
-/** @private */
+/** @hidden */
 export function isString(val: any) { return typeof val === 'string'; }
-/** @private */
+/** @hidden */
 export function isNumber(val: any) { return typeof val === 'number'; }
-/** @private */
+/** @hidden */
 export function isFunction(val: any) { return typeof val === 'function'; }
-/** @private */
+/** @hidden */
 export function isDefined(val: any) { return typeof val !== 'undefined'; }
-/** @private */
+/** @hidden */
 export function isUndefined(val: any) { return typeof val === 'undefined'; }
-/** @private */
+/** @hidden */
 export function isPresent(val: any) { return val !== undefined && val !== null; }
-/** @private */
+/** @hidden */
 export function isBlank(val: any) { return val === undefined || val === null; }
-/** @private */
+/** @hidden */
 export function isObject(val: any) { return typeof val === 'object'; }
-/** @private */
+/** @hidden */
 export function isArray(val: any) { return Array.isArray(val); };
 
 
-/** @private */
+/** @hidden */
 export function isPrimitive(val: any) {
   return isString(val) || isBoolean(val) || (isNumber(val) && !isNaN(val));
 };
 
 
-/** @private */
+/** @hidden */
 export function isTrueProperty(val: any): boolean {
   if (typeof val === 'string') {
     val = val.toLowerCase().trim();
@@ -100,7 +100,7 @@ export function isTrueProperty(val: any): boolean {
 };
 
 
-/** @private */
+/** @hidden */
 export function isCheckedProperty(a: any, b: any): boolean {
   if (a === undefined || a === null || a === '') {
     return (b === undefined || b === null || b === '');
@@ -120,7 +120,7 @@ export function isCheckedProperty(a: any, b: any): boolean {
 };
 
 
-/** @private */
+/** @hidden */
 export function reorderArray(array: any[], indexes: {from: number, to: number}): any[] {
   const element = array[indexes.from];
   array.splice(indexes.from, 1);
@@ -129,14 +129,14 @@ export function reorderArray(array: any[], indexes: {from: number, to: number}):
 }
 
 
-/** @private */
+/** @hidden */
 export function removeArrayItem(array: any[], item: any) {
   const index = array.indexOf(item);
   return !!~index && !!array.splice(index, 1);
 }
 
 
-/** @private */
+/** @hidden */
 export function swipeShouldReset(isResetDirection: boolean, isMovingFast: boolean, isOnResetZone: boolean): boolean {
   // The logic required to know when the sliding item should close (openAmount=0)
   // depends on three booleans (isCloseDirection, isMovingFast, isOnCloseZone)
@@ -157,11 +157,11 @@ export function swipeShouldReset(isResetDirection: boolean, isMovingFast: boolea
 }
 
 
-/** @private */
+/** @hidden */
 const ASSERT_ENABLED = true;
 
 
-/** @private */
+/** @hidden */
 function _runInDev(fn: Function) {
   if (ASSERT_ENABLED === true) {
     return fn();
@@ -169,7 +169,7 @@ function _runInDev(fn: Function) {
 }
 
 
-/** @private */
+/** @hidden */
 function _assert(actual: any, reason: string) {
   if (!actual && ASSERT_ENABLED === true) {
     let message = 'IONIC ASSERT: ' + reason;
@@ -179,7 +179,7 @@ function _assert(actual: any, reason: string) {
   }
 }
 
-/** @private */
+/** @hidden */
 export function requestIonicCallback(functionToLazy: any) {
   if ('requestIdleCallback' in window) {
     return (window as any).requestIdleCallback(functionToLazy);
@@ -188,8 +188,8 @@ export function requestIonicCallback(functionToLazy: any) {
   }
 }
 
-/** @private */
+/** @hidden */
 export { _assert as assert};
 
-/** @private */
+/** @hidden */
 export { _runInDev as runInDev};