diff --git a/packages/forms/src/directives/checkbox_value_accessor.ts b/packages/forms/src/directives/checkbox_value_accessor.ts
index 6aeea5b98b..123364cf73 100644
--- a/packages/forms/src/directives/checkbox_value_accessor.ts
+++ b/packages/forms/src/directives/checkbox_value_accessor.ts
@@ -19,10 +19,12 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
/**
* The accessor for writing a value and listening to changes on a checkbox input element.
*
- * ### Example
- * ```
- *
- * ```
+ * @usageNotes
+ * ### Example
+ *
+ * ```
+ *
+ * ```
*
* @ngModule FormsModule
* @ngModule ReactiveFormsModule
diff --git a/packages/forms/src/directives/control_value_accessor.ts b/packages/forms/src/directives/control_value_accessor.ts
index aa90ecb045..c58dce5786 100644
--- a/packages/forms/src/directives/control_value_accessor.ts
+++ b/packages/forms/src/directives/control_value_accessor.ts
@@ -15,7 +15,7 @@ import {InjectionToken} from '@angular/core';
*
* Implement this interface to create a custom form control directive
* that integrates with Angular forms.
- *
+ *
* @see DefaultValueAccessor
*/
export interface ControlValueAccessor {
@@ -26,6 +26,7 @@ export interface ControlValueAccessor {
* This method is called by the forms API to write to the view when programmatic
* changes from model to view are requested.
*
+ * @usageNotes
* ### Write a value to the element
*
* The following example writes a value to the native DOM element.
@@ -51,6 +52,7 @@ export interface ControlValueAccessor {
* When implementing the `registerOnChange` method in your own value accessor,
* save the given function so your class calls it at the appropriate time.
*
+ * @usageNotes
* ### Store the change function
*
* The following example stores the provided function as an internal method.
@@ -83,6 +85,7 @@ export interface ControlValueAccessor {
* function so your class calls it when the control should be considered
* blurred or "touched".
*
+ * @usageNotes
* ### Store the callback function
*
* The following example stores the provided function as an internal method.
@@ -112,6 +115,7 @@ export interface ControlValueAccessor {
* or from 'DISABLED'. Depending on the status, it enables or disables the
* appropriate DOM element.
*
+ * @usageNotes
* The following is an example of writing the disabled property to a native DOM element:
*
* ```ts
diff --git a/packages/forms/src/directives/default_value_accessor.ts b/packages/forms/src/directives/default_value_accessor.ts
index 10da6ed93c..65a75ff60a 100644
--- a/packages/forms/src/directives/default_value_accessor.ts
+++ b/packages/forms/src/directives/default_value_accessor.ts
@@ -35,10 +35,12 @@ export const COMPOSITION_BUFFER_MODE = new InjectionToken('CompositionE
* The default accessor for writing a value and listening to changes that is used by the
* `NgModel`, `FormControlDirective`, and `FormControlName` directives.
*
- * ### Example
- * ```
- *
- * ```
+ * @usageNotes
+ * ### Example
+ *
+ * ```
+ *
+ * ```
*
* @ngModule FormsModule
* @ngModule ReactiveFormsModule
diff --git a/packages/forms/src/directives/number_value_accessor.ts b/packages/forms/src/directives/number_value_accessor.ts
index 4ed6d81cbc..741dfac573 100644
--- a/packages/forms/src/directives/number_value_accessor.ts
+++ b/packages/forms/src/directives/number_value_accessor.ts
@@ -20,10 +20,13 @@ export const NUMBER_VALUE_ACCESSOR: any = {
* The accessor for writing a number value and listening to changes that is used by the
* `NgModel`, `FormControlDirective`, and `FormControlName` directives.
*
- * ### Example
- * ```
- *
- * ```
+ * @usageNotes
+ * ### Example
+ *
+ * ```
+ *
+ * ```
+ *
* @ngModule FormsModule
* @ngModule ReactiveFormsModule
*/
diff --git a/packages/forms/src/directives/radio_control_value_accessor.ts b/packages/forms/src/directives/radio_control_value_accessor.ts
index 5346ee8c60..7db67cdada 100644
--- a/packages/forms/src/directives/radio_control_value_accessor.ts
+++ b/packages/forms/src/directives/radio_control_value_accessor.ts
@@ -66,6 +66,7 @@ export class RadioControlRegistry {
* value accessor will be active on any radio control that has a form directive. You do
* **not** need to add a special selector to activate it.
*
+ * @usageNotes
* ### How to use radio buttons with form directives
*
* To use radio buttons in a template-driven form, you'll want to ensure that radio buttons
diff --git a/packages/forms/src/directives/range_value_accessor.ts b/packages/forms/src/directives/range_value_accessor.ts
index 8c35fbb3f9..ba5d75758a 100644
--- a/packages/forms/src/directives/range_value_accessor.ts
+++ b/packages/forms/src/directives/range_value_accessor.ts
@@ -20,10 +20,13 @@ export const RANGE_VALUE_ACCESSOR: StaticProvider = {
* The accessor for writing a range value and listening to changes that is used by the
* `NgModel`, `FormControlDirective`, and `FormControlName` directives.
*
- * ### Example
- * ```
- *
- * ```
+ * @usageNotes
+ * ### Example
+ *
+ * ```
+ *
+ * ```
+ *
* @ngModule FormsModule
* @ngModule ReactiveFormsModule
*/
diff --git a/packages/forms/src/directives/reactive_directives/form_control_directive.ts b/packages/forms/src/directives/reactive_directives/form_control_directive.ts
index 01fba08c66..d2e2797df2 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_directive.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_directive.ts
@@ -38,6 +38,7 @@ export const formControlBinding: any = {
* any values written to the DOM element through user input will be reflected in the
* `FormControl` instance (view -> model).
*
+ * @usageNotes
* Use this directive if you'd like to create and manage a `FormControl` instance directly.
* Simply create a `FormControl`, save it to your component class, and pass it into the
* `FormControlDirective`.
@@ -70,6 +71,7 @@ export const formControlBinding: any = {
* form directives has been deprecated in Angular v6 and will be removed in Angular v7.
*
* Now deprecated:
+ *
* ```html
*
* ```
diff --git a/packages/forms/src/directives/reactive_directives/form_control_name.ts b/packages/forms/src/directives/reactive_directives/form_control_name.ts
index 841b3b73d8..999b9b55cf 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_name.ts
@@ -38,6 +38,7 @@ export const controlNameBinding: any = {
* any values written to the DOM element through user input will be reflected in the
* `FormControl` instance (view -> model).
*
+ * @usageNotes
* This directive is designed to be used with a parent `FormGroupDirective` (selector:
* `[formGroup]`).
*
@@ -78,6 +79,7 @@ export const controlNameBinding: any = {
* form directives has been deprecated in Angular v6 and will be removed in Angular v7.
*
* Now deprecated:
+ *
* ```html
*