diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index 2acc500fa2..ae042e9a06 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -135,7 +135,7 @@ export class TextInput extends InputBase {
  * however, with Ionic wrapping the native HTML text area element, Ionic
  * is able to better handle the user experience and interactivity.
  *
- * Not that `<ion-textarea>` must load its value from the `value` or
+ * Note that `<ion-textarea>` must load its value from the `value` or
  * `[(ngModel)]` attribute. Unlike the native `<textarea>` element,
  * `<ion-textarea>` does not support loading its value from the
  * textarea's inner content.
diff --git a/src/components/scroll/scroll.ts b/src/components/scroll/scroll.ts
index 0a1a00e126..66a82da30c 100644
--- a/src/components/scroll/scroll.ts
+++ b/src/components/scroll/scroll.ts
@@ -18,7 +18,7 @@ import { Ion } from '../ion';
  * </ion-scroll>
  * ```
  *@property {boolean} [scrollX] - whether to enable scrolling along the X axis
- *@property {boolean} [scrollY] - whether to enable scrolling along the Y axis
+ *@property {boolean} [scrollY] - whether to enable scrolling along the Y axis; requires the following CSS declaration: ion-scroll { white-space: nowrap; }
  *@property {boolean} [zoom] - whether to enable zooming
  *@property {number} [maxZoom] - set the max zoom amount for ion-scroll
  * @demo /docs/v2/demos/scroll/
diff --git a/src/config/config.ts b/src/config/config.ts
index 20907c5095..2d10d416c2 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -100,6 +100,7 @@ import { isObject, isDefined, isFunction, isArray } from '../util/util';
  * | `popoverLeave`           | `string`            | The name of the transition to use while a popover is dismissed.                                                                                  |
  * | `prodMode`               | `boolean`           | Disable development mode, which turns off assertions and other checks within the framework. One important assertion this disables verifies that a change detection pass does not result in additional changes to any bindings (also known as unidirectional data flow).
  * | `spinner`                | `string`            | The default spinner to use when a name is not defined.                                                                                           |
+ * | `swipeBackEnabled`       | `boolean`           | Whether native iOS swipe to go back functionality is enabled.
  * | `tabsHighlight`          | `boolean`           | Whether to show a highlight line under the tab when it is selected.                                                                              |
  * | `tabsLayout`             | `string`            | The layout to use for all tabs. Available options: `"icon-top"`, `"icon-left"`, `"icon-right"`, `"icon-bottom"`, `"icon-hide"`, `"title-hide"`.  |
  * | `tabsPlacement`          | `string`            | The position of the tabs relative to the content. Available options: `"top"`, `"bottom"`                                                         |
diff --git a/tooling/generators/component/component.tmpl.html b/tooling/generators/component/component.tmpl.html
index 16d977a8f4..a9ff5e07be 100644
--- a/tooling/generators/component/component.tmpl.html
+++ b/tooling/generators/component/component.tmpl.html
@@ -1,7 +1,7 @@
 <!--
   Generated template for the <%= jsClassName %> component.
 
-  See https://angular.io/docs/ts/latest/api/core/ComponentMetadata-class.html
+  See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
   for more info on Angular 2 Components.
 -->
 <div>
diff --git a/tooling/generators/component/component.tmpl.js b/tooling/generators/component/component.tmpl.js
index 7a378982ec..48e8e08d31 100644
--- a/tooling/generators/component/component.tmpl.js
+++ b/tooling/generators/component/component.tmpl.js
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 /*
   Generated class for the <%= jsClassName %> component.
 
-  See https://angular.io/docs/ts/latest/api/core/ComponentMetadata-class.html
+  See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
   for more info on Angular 2 Components.
 */
 @Component({
diff --git a/tooling/generators/component/component.tmpl.ts b/tooling/generators/component/component.tmpl.ts
index ce2fcb7d90..dc133d53e0 100644
--- a/tooling/generators/component/component.tmpl.ts
+++ b/tooling/generators/component/component.tmpl.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 /*
   Generated class for the <%= jsClassName %> component.
 
-  See https://angular.io/docs/ts/latest/api/core/ComponentMetadata-class.html
+  See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
   for more info on Angular 2 Components.
 */
 @Component({
diff --git a/tooling/generators/directive/directive.tmpl.js b/tooling/generators/directive/directive.tmpl.js
index 781c9625c9..028579b687 100644
--- a/tooling/generators/directive/directive.tmpl.js
+++ b/tooling/generators/directive/directive.tmpl.js
@@ -3,7 +3,7 @@ import { Directive } from '@angular/core';
 /*
   Generated class for the <%= jsClassName %> directive.
 
-  See https://angular.io/docs/ts/latest/api/core/DirectiveMetadata-class.html
+  See https://angular.io/docs/ts/latest/api/core/index/DirectiveMetadata-class.html
   for more info on Angular 2 Directives.
 */
 @Directive({
diff --git a/tooling/generators/directive/directive.tmpl.ts b/tooling/generators/directive/directive.tmpl.ts
index 781c9625c9..028579b687 100644
--- a/tooling/generators/directive/directive.tmpl.ts
+++ b/tooling/generators/directive/directive.tmpl.ts
@@ -3,7 +3,7 @@ import { Directive } from '@angular/core';
 /*
   Generated class for the <%= jsClassName %> directive.
 
-  See https://angular.io/docs/ts/latest/api/core/DirectiveMetadata-class.html
+  See https://angular.io/docs/ts/latest/api/core/index/DirectiveMetadata-class.html
   for more info on Angular 2 Directives.
 */
 @Directive({