Merge branch '2.0' into popover

scripts/docs/templates/common.template.html

@@ -333,6 +333,14 @@ Improve this doc
 <@- endif -@>
 
 
+<@ block advanced @>
+<@- if doc.advanced -@>
+<h2><a class="anchor" name="advanced" href="#advanced"></a>Advanced</h2>
+<$ doc.advanced | marked $>
+<@- endif -@>
+<@ endblock @>
+
+
 <!-- related link -->
 <@- if doc.see @>
 

src/components/action-sheet/action-sheet.ts

@@ -22,7 +22,7 @@ import {ViewController} from '../nav/view-controller';
  * An action sheet is created from an array of `buttons`, with each button
  * including properties for its `text`, and optionally a `handler` and `role`.
  * If a handler returns `false` then the action sheet will not be dismissed. An
- * action sheet can also optionally have a `title` and a `subTitle`.
+ * action sheet can also optionally have a `title`, `subTitle` and an `icon`.
  *
  * A button's `role` property can either be `destructive` or `cancel`. Buttons
  * without a role property will have the default look for the platform. Buttons
@@ -82,7 +82,7 @@ import {ViewController} from '../nav/view-controller';
  * transitions were fired at roughly the same time, it's difficult for the
  * nav controller to cleanly animate multiple transitions that may
  * have been kicked off asynchronously. This is further described in the
- * [`Nav Transition Promises`](../../nav/NavController) section. For action sheets,
+ * [`Nav Transition Promises`](../../nav/NavController/#nav-transition-promises) section. For action sheets,
  * this means it's best to wait for the action sheet to finish its transition
  * out before starting a new transition on the same nav controller.
  *

src/components/datetime/datetime.ts

@@ -145,7 +145,7 @@ const DATETIME_VALUE_ACCESSOR = new Provider(
  * and `23` means `11pm`.
  *
  * It's also important to note that neither the `displayFormat` or `pickerFormat` can
- * set the datetime value's output, which is the value that sent the the component's
+ * set the datetime value's output, which is the value that is set by the component's
  * `ngModel`. The format's are merely for displaying the value as text and the picker's
  * interface, but the datetime's value is always persisted as a valid ISO 8601 datetime
  * string.

src/components/label/label.ts

@@ -47,7 +47,7 @@ import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from '@angu
  *
  * @demo /docs/v2/demos/label/
  * @see {@link ../../../../components#inputs Input Component Docs}
- * @see {@link ../Input Input API Docs}
+ * @see {@link ../../input/Input Input API Docs}
  *
  */
 

src/platform/storage/sql.ts

@@ -144,6 +144,10 @@ export class SqlStorage extends StorageEngine {
     return this.query('delete from kv where key = ?', [key]);
   }
 
+  /**
+  * Clear all keys/values of your database.
+  * @return {Promise} that resolves or rejects with an object of the form { tx: Transaction, res: Result (or err)}
+  */
   clear(): Promise<any> {
     return this.query('delete from kv');
   }