diff --git a/packages/flutter/lib/cupertino.dart b/packages/flutter/lib/cupertino.dart
index d93282de01c..b0d9abc0d05 100644
--- a/packages/flutter/lib/cupertino.dart
+++ b/packages/flutter/lib/cupertino.dart
@@ -17,6 +17,7 @@ export 'src/cupertino/app.dart';
 export 'src/cupertino/bottom_tab_bar.dart';
 export 'src/cupertino/button.dart';
 export 'src/cupertino/colors.dart';
+export 'src/cupertino/constants.dart';
 export 'src/cupertino/context_menu.dart';
 export 'src/cupertino/context_menu_action.dart';
 export 'src/cupertino/date_picker.dart';
diff --git a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
index a84b595911d..524404d2ed0 100644
--- a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
+++ b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
@@ -87,11 +87,6 @@ class AnimatedIcon extends StatelessWidget {
   ///
   /// Announced in accessibility modes (e.g TalkBack/VoiceOver).
   /// This label does not show in the UI.
-  ///
-  /// See also:
-  ///
-  ///  * [Semantics.label], which is set to [semanticLabel] in the underlying
-  ///    [Semantics] widget.
   final String semanticLabel;
 
   /// The text direction to use for rendering the icon.
@@ -100,6 +95,11 @@ class AnimatedIcon extends StatelessWidget {
   ///
   /// If the text direction is [TextDirection.rtl], the icon will be mirrored
   /// horizontally (e.g back arrow will point right).
+  ///
+  /// See also:
+  ///
+  ///  * [SemanticProperties.label], which is set to [semanticLabel] in the
+  ///    underlying [Semantics] widget.
   final TextDirection textDirection;
 
   static final _UiPathFactory _pathFactory = () => ui.Path();
diff --git a/packages/flutter/lib/src/material/app_bar.dart b/packages/flutter/lib/src/material/app_bar.dart
index d26abdce6a3..23df6d45a7c 100644
--- a/packages/flutter/lib/src/material/app_bar.dart
+++ b/packages/flutter/lib/src/material/app_bar.dart
@@ -222,7 +222,7 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   ///
   /// Typically the [leading] widget is an [Icon] or an [IconButton].
   ///
-  /// Becomes the leading component of the [NavigationToolBar] built
+  /// Becomes the leading component of the [NavigationToolbar] built
   /// by this widget. The [leading] widget's width and height are constrained to
   /// be no bigger than [leadingWidth] and [toolbarHeight] respectively.
   ///
@@ -277,7 +277,7 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   /// Typically a [Text] widget that contains a description of the current
   /// contents of the app.
   ///
-  /// Becomes the middle component of the [NavigationToolBar] built by this widget.
+  /// Becomes the middle component of the [NavigationToolbar] built by this widget.
   /// The [title]'s width is constrained to fit within the remaining space
   /// between the toolbar's [leading] and [actions] widgets. Its height is
   /// _not_ constrained. The [title] is vertically centered and clipped to fit
@@ -310,7 +310,7 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   /// For less common operations, consider using a [PopupMenuButton] as the
   /// last action.
   ///
-  /// The [actions] become the trailing component of the [NavigationToolBar] built
+  /// The [actions] become the trailing component of the [NavigationToolbar] built
   /// by this widget. The height of each action is constrained to be no bigger
   /// than the [toolbarHeight].
   final List<Widget> actions;
@@ -341,16 +341,16 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   ///
   /// The value is non-negative.
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.elevation] is used,
-  /// if that is also null, the default value is 4, the appropriate elevation
-  /// for app bars.
+  /// If this property is null, then [AppBarTheme.elevation] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, the default value
+  /// is 4, the appropriate elevation for app bars.
   final double elevation;
 
   /// The color to paint the shadow below the app bar.
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.shadowColor] is used,
-  /// if that is also null, the default value is fully opaque black, the appropriate
-  /// color for shadows.
+  /// If this property is null, then [AppBarTheme.shadowColor] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, the default value
+  /// is fully opaque black, the appropriate color for shadows.
   final Color shadowColor;
 
   /// The material's shape as well its shadow.
@@ -362,22 +362,25 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   /// The color to use for the app bar's material. Typically this should be set
   /// along with [brightness], [iconTheme], [textTheme].
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.color] is used,
-  /// if that is also null, then [ThemeData.primaryColor] is used.
+  /// If this property is null, then [AppBarTheme.color] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then
+  /// [ThemeData.primaryColor] is used.
   final Color backgroundColor;
 
   /// The brightness of the app bar's material. Typically this is set along
   /// with [backgroundColor], [iconTheme], [textTheme].
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.brightness] is used,
-  /// if that is also null, then [ThemeData.primaryColorBrightness] is used.
+  /// If this property is null, then [AppBarTheme.brightness] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then
+  /// [ThemeData.primaryColorBrightness] is used.
   final Brightness brightness;
 
   /// The color, opacity, and size to use for app bar icons. Typically this
   /// is set along with [backgroundColor], [brightness], [textTheme].
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.iconTheme] is used,
-  /// if that is also null, then [ThemeData.primaryIconTheme] is used.
+  /// If this property is null, then [AppBarTheme.iconTheme] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then
+  /// [ThemeData.primaryIconTheme] is used.
   final IconThemeData iconTheme;
 
   /// The color, opacity, and size to use for the icons that appear in the app
@@ -385,15 +388,17 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
   /// themed differently than the icon that appears in the app bar's [leading]
   /// widget.
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.actionsIconTheme] is
-  /// used, if that is also null, then this falls back to [iconTheme].
+  /// If this property is null, then [AppBarTheme.actionsIconTheme] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then this falls
+  /// back to [iconTheme].
   final IconThemeData actionsIconTheme;
 
   /// The typographic styles to use for text in the app bar. Typically this is
   /// set along with [brightness] [backgroundColor], [iconTheme].
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.textTheme] is used,
-  /// if that is also null, then [ThemeData.primaryTextTheme] is used.
+  /// If this property is null, then [AppBarTheme.textTheme] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then
+  /// [ThemeData.primaryTextTheme] is used.
   final TextTheme textTheme;
 
   /// Whether this app bar is being displayed at the top of the screen.
@@ -405,8 +410,9 @@ class AppBar extends StatefulWidget implements PreferredSizeWidget {
 
   /// Whether the title should be centered.
   ///
-  /// If this property is null, then [ThemeData.appBarTheme.centerTitle] is used,
-  /// if that is also null, then value is adapted to the current [TargetPlatform].
+  /// If this property is null, then [AppBarTheme.centerTitle] of
+  /// [ThemeData.appBarTheme] is used. If that is also null, then value is
+  /// adapted to the current [TargetPlatform].
   final bool centerTitle;
 
   /// Whether the title should be wrapped with header [Semantics].
diff --git a/packages/flutter/lib/src/material/app_bar_theme.dart b/packages/flutter/lib/src/material/app_bar_theme.dart
index 356bf47ab53..5529513002d 100644
--- a/packages/flutter/lib/src/material/app_bar_theme.dart
+++ b/packages/flutter/lib/src/material/app_bar_theme.dart
@@ -31,7 +31,7 @@ import 'theme.dart';
 ///    application.
 @immutable
 class AppBarTheme with Diagnosticable {
-  /// Creates a theme that can be used for [ThemeData.AppBarTheme].
+  /// Creates a theme that can be used for [ThemeData.appBarTheme].
   const AppBarTheme({
     this.brightness,
     this.color,
@@ -48,7 +48,7 @@ class AppBarTheme with Diagnosticable {
   /// If null, [AppBar] uses [ThemeData.primaryColorBrightness].
   final Brightness brightness;
 
-  /// Default value for [AppBar.color].
+  /// Default value for [AppBar.backgroundColor].
   ///
   /// If null, [AppBar] uses [ThemeData.primaryColor].
   final Color color;
diff --git a/packages/flutter/lib/src/material/bottom_app_bar.dart b/packages/flutter/lib/src/material/bottom_app_bar.dart
index 26283945ccf..066c9844ed5 100644
--- a/packages/flutter/lib/src/material/bottom_app_bar.dart
+++ b/packages/flutter/lib/src/material/bottom_app_bar.dart
@@ -72,8 +72,9 @@ class BottomAppBar extends StatefulWidget {
 
   /// The bottom app bar's background color.
   ///
-  /// If this property is null then [ThemeData.bottomAppBarTheme.color] is used,
-  /// if that's null then [ThemeData.bottomAppBarColor] is used.
+  /// If this property is null then [BottomAppBarTheme.color] of
+  /// [ThemeData.bottomAppBarTheme] is used. If that's null then
+  /// [ThemeData.bottomAppBarColor] is used.
   final Color color;
 
   /// The z-coordinate at which to place this bottom app bar relative to its
@@ -82,14 +83,16 @@ class BottomAppBar extends StatefulWidget {
   /// This controls the size of the shadow below the bottom app bar. The
   /// value is non-negative.
   ///
-  /// If this property is null then [ThemeData.bottomAppBarTheme.elevation] is used,
-  /// if that's null, the default value is 8.
+  /// If this property is null then [BottomAppBarTheme.elevation] of
+  /// [ThemeData.bottomAppBarTheme] is used. If that's null, the default value
+  /// is 8.
   final double elevation;
 
   /// The notch that is made for the floating action button.
   ///
-  /// If this property is null then [ThemeData.bottomAppBarTheme.shape] is used,
-  /// if that's null then the shape will be rectangular with no notch.
+  /// If this property is null then [BottomAppBarTheme.shape] of
+  /// [ThemeData.bottomAppBarTheme] is used. If that's null then the shape will
+  /// be rectangular with no notch.
   final NotchedShape shape;
 
   /// {@macro flutter.widgets.Clip}
diff --git a/packages/flutter/lib/src/material/bottom_app_bar_theme.dart b/packages/flutter/lib/src/material/bottom_app_bar_theme.dart
index ff8e0d67696..93683bfacbc 100644
--- a/packages/flutter/lib/src/material/bottom_app_bar_theme.dart
+++ b/packages/flutter/lib/src/material/bottom_app_bar_theme.dart
@@ -29,7 +29,7 @@ import 'theme.dart';
 ///    application.
 @immutable
 class BottomAppBarTheme with Diagnosticable {
-  /// Creates a theme that can be used for [ThemeData.BottomAppBarTheme].
+  /// Creates a theme that can be used for [ThemeData.bottomAppBarTheme].
   const BottomAppBarTheme({
     this.color,
     this.elevation,
diff --git a/packages/flutter/lib/src/material/bottom_navigation_bar.dart b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
index fc5c89c5b36..c2d171ba0d0 100644
--- a/packages/flutter/lib/src/material/bottom_navigation_bar.dart
+++ b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
@@ -154,7 +154,7 @@ class BottomNavigationBar extends StatefulWidget {
   /// are non-null, they will be used instead of [selectedItemColor] and
   /// [unselectedItemColor].
   ///
-  /// If custom [IconThemData]s are used, you must provide both
+  /// If custom [IconThemeData]s are used, you must provide both
   /// [selectedIconTheme] and [unselectedIconTheme], and both
   /// [IconThemeData.color] and [IconThemeData.size] must be set.
   ///
@@ -246,7 +246,7 @@ class BottomNavigationBar extends StatefulWidget {
   /// The color of the [BottomNavigationBar] itself.
   ///
   /// If [type] is [BottomNavigationBarType.shifting] and the
-  /// [items]s, have [BottomNavigationBarItem.backgroundColor] set, the [item]'s
+  /// [items] have [BottomNavigationBarItem.backgroundColor] set, the [items]'
   /// backgroundColor will splash and overwrite this color.
   final Color backgroundColor;
 
@@ -256,13 +256,13 @@ class BottomNavigationBar extends StatefulWidget {
   final double iconSize;
 
   /// The color of the selected [BottomNavigationBarItem.icon] and
-  /// [BottomNavigationBarItem.label].
+  /// [BottomNavigationBarItem.title].
   ///
   /// If null then the [ThemeData.primaryColor] is used.
   final Color selectedItemColor;
 
   /// The color of the unselected [BottomNavigationBarItem.icon] and
-  /// [BottomNavigationBarItem.label]s.
+  /// [BottomNavigationBarItem.title]s.
   ///
   /// If null then the [TextTheme.caption]'s color is used.
   final Color unselectedItemColor;
@@ -299,7 +299,8 @@ class BottomNavigationBar extends StatefulWidget {
 
   /// The font size of the [BottomNavigationBarItem] labels when they are selected.
   ///
-  /// If [selectedLabelStyle.fontSize] is non-null, it will be used instead of this.
+  /// If [TextStyle.fontSize] of [selectedLabelStyle] is non-null, it will be
+  /// used instead of this.
   ///
   /// Defaults to `14.0`.
   final double selectedFontSize;
@@ -307,7 +308,8 @@ class BottomNavigationBar extends StatefulWidget {
   /// The font size of the [BottomNavigationBarItem] labels when they are not
   /// selected.
   ///
-  /// If [unselectedLabelStyle.fontSize] is non-null, it will be used instead of this.
+  /// If [TextStyle.fontSize] of [unselectedLabelStyle] is non-null, it will be
+  /// used instead of this.
   ///
   /// Defaults to `12.0`.
   final double unselectedFontSize;
diff --git a/packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart b/packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart
index 23f95364ef5..f914b8b237e 100644
--- a/packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart
+++ b/packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart
@@ -32,7 +32,7 @@ import 'theme.dart';
 ///    application.
 @immutable
 class BottomNavigationBarThemeData with Diagnosticable {
-  /// Creates a theme that can be used for [ThemeData.BottomNavigationBarTheme].
+  /// Creates a theme that can be used for [ThemeData.bottomNavigationBarTheme].
   const BottomNavigationBarThemeData({
     this.backgroundColor,
     this.elevation,
@@ -70,13 +70,13 @@ class BottomNavigationBarThemeData with Diagnosticable {
   final IconThemeData unselectedIconTheme;
 
   /// The color of the selected [BottomNavigationBarItem.icon] and
-  /// [BottomNavigationBarItem.label].
+  /// [BottomNavigationBarItem.title].
   ///
   /// See [BottomNavigationBar.selectedItemColor].
   final Color selectedItemColor;
 
   /// The color of the unselected [BottomNavigationBarItem.icon] and
-  /// [BottomNavigationBarItem.label]s.
+  /// [BottomNavigationBarItem.title]s.
   ///
   /// See [BottomNavigationBar.unselectedItemColor].
   final Color unselectedItemColor;
diff --git a/packages/flutter/lib/src/material/bottom_sheet.dart b/packages/flutter/lib/src/material/bottom_sheet.dart
index 9c4fdda2056..e94634344c4 100644
--- a/packages/flutter/lib/src/material/bottom_sheet.dart
+++ b/packages/flutter/lib/src/material/bottom_sheet.dart
@@ -154,8 +154,9 @@ class BottomSheet extends StatefulWidget {
   /// a bottom sheet with rounded corners and an edge-to-edge [Image] at the
   /// top.
   ///
-  /// If this property is null then [ThemeData.bottomSheetTheme.clipBehavior] is
-  /// used. If that's null then the behavior will be [Clip.none].
+  /// If this property is null then [BottomSheetTheme.clipBehavior] of
+  /// [ThemeData.bottomSheetTheme] is used. If that's null then the behavior
+  /// will be [Clip.none].
   final Clip clipBehavior;
 
   @override
diff --git a/packages/flutter/lib/src/material/button_bar.dart b/packages/flutter/lib/src/material/button_bar.dart
index 0843c8389d7..4a017588b3d 100644
--- a/packages/flutter/lib/src/material/button_bar.dart
+++ b/packages/flutter/lib/src/material/button_bar.dart
@@ -76,41 +76,41 @@ class ButtonBar extends StatelessWidget {
 
   /// How the children should be placed along the horizontal axis.
   ///
-  /// If null then it will use [ButtonBarTheme.alignment]. If that is null,
+  /// If null then it will use [ButtonBarThemeData.alignment]. If that is null,
   /// it will default to [MainAxisAlignment.end].
   final MainAxisAlignment alignment;
 
   /// How much horizontal space is available. See [Row.mainAxisSize].
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.mainAxisSize].
+  /// If null then it will use the surrounding [ButtonBarThemeData.mainAxisSize].
   /// If that is null, it will default to [MainAxisSize.max].
   final MainAxisSize mainAxisSize;
 
-  /// Overrides the surrounding [ButtonTheme.textTheme] to define a button's
+  /// Overrides the surrounding [ButtonBarThemeData.textTheme] to define a button's
   /// base colors, size, internal padding and shape.
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.buttonTextTheme].
+  /// If null then it will use the surrounding [ButtonBarThemeData.buttonTextTheme].
   /// If that is null, it will default to [ButtonTextTheme.primary].
   final ButtonTextTheme buttonTextTheme;
 
   /// Overrides the surrounding [ButtonThemeData.minWidth] to define a button's
   /// minimum width.
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.buttonMinWidth].
+  /// If null then it will use the surrounding [ButtonBarThemeData.buttonMinWidth].
   /// If that is null, it will default to 64.0 logical pixels.
   final double buttonMinWidth;
 
   /// Overrides the surrounding [ButtonThemeData.height] to define a button's
   /// minimum height.
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.buttonHeight].
+  /// If null then it will use the surrounding [ButtonBarThemeData.buttonHeight].
   /// If that is null, it will default to 36.0 logical pixels.
   final double buttonHeight;
 
   /// Overrides the surrounding [ButtonThemeData.padding] to define the padding
   /// for a button's child (typically the button's label).
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.buttonPadding].
+  /// If null then it will use the surrounding [ButtonBarThemeData.buttonPadding].
   /// If that is null, it will default to 8.0 logical pixels on the left
   /// and right.
   final EdgeInsetsGeometry buttonPadding;
@@ -118,7 +118,7 @@ class ButtonBar extends StatelessWidget {
   /// Overrides the surrounding [ButtonThemeData.alignedDropdown] to define whether
   /// a [DropdownButton] menu's width will match the button's width.
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.buttonAlignedDropdown].
+  /// If null then it will use the surrounding [ButtonBarThemeData.buttonAlignedDropdown].
   /// If that is null, it will default to false.
   final bool buttonAlignedDropdown;
 
@@ -127,7 +127,7 @@ class ButtonBar extends StatelessWidget {
   ///
   /// Overrides the surrounding [ButtonThemeData.layoutBehavior].
   ///
-  /// If null then it will use the surrounding [ButtonBarTheme.layoutBehavior].
+  /// If null then it will use the surrounding [ButtonBarThemeData.layoutBehavior].
   /// If that is null, it will default [ButtonBarLayoutBehavior.padded].
   final ButtonBarLayoutBehavior layoutBehavior;
 
@@ -143,7 +143,7 @@ class ButtonBar extends StatelessWidget {
   /// bottom and "ends" at the top.
   ///
   /// If null then it will use the surrounding
-  /// [ButtonBarTheme.overflowDirection]. If that is null, it will
+  /// [ButtonBarThemeData.overflowDirection]. If that is null, it will
   /// default to [VerticalDirection.down].
   final VerticalDirection overflowDirection;
 
diff --git a/packages/flutter/lib/src/material/button_bar_theme.dart b/packages/flutter/lib/src/material/button_bar_theme.dart
index f9e7995cf64..29ff1fcfdb6 100644
--- a/packages/flutter/lib/src/material/button_bar_theme.dart
+++ b/packages/flutter/lib/src/material/button_bar_theme.dart
@@ -54,7 +54,7 @@ class ButtonBarThemeData with Diagnosticable {
   /// Defines a [ButtonBar] button's base colors, and the defaults for
   /// the button's minimum size, internal padding, and shape.
   ///
-  /// This will override the surrounding [ButtonTheme.textTheme] setting
+  /// This will override the surrounding [ButtonThemeData.textTheme] setting
   /// for buttons contained in the [ButtonBar].
   ///
   /// Despite the name, this property is not a [TextTheme], its value is not a
@@ -63,22 +63,22 @@ class ButtonBarThemeData with Diagnosticable {
 
   /// The minimum width for [ButtonBar] buttons.
   ///
-  /// This will override the surrounding [ButtonTheme.minWidth] setting
+  /// This will override the surrounding [ButtonThemeData.minWidth] setting
   /// for buttons contained in the [ButtonBar].
   ///
   /// The actual horizontal space allocated for a button's child is
-  /// at least this value less the theme's horizontal [padding].
+  /// at least this value less the theme's horizontal [ButtonThemeData.padding].
   final double buttonMinWidth;
 
   /// The minimum height for [ButtonBar] buttons.
   ///
-  /// This will override the surrounding [ButtonTheme.height] setting
+  /// This will override the surrounding [ButtonThemeData.height] setting
   /// for buttons contained in the [ButtonBar].
   final double buttonHeight;
 
   /// Padding for a [ButtonBar] button's child (typically the button's label).
   ///
-  /// This will override the surrounding [ButtonTheme.padding] setting
+  /// This will override the surrounding [ButtonThemeData.padding] setting
   /// for buttons contained in the [ButtonBar].
   final EdgeInsetsGeometry buttonPadding;
 
@@ -90,7 +90,7 @@ class ButtonBarThemeData with Diagnosticable {
   /// edge of the menu's value with the leading edge of the values
   /// displayed by the menu items.
   ///
-  /// This will override the surrounding [ButtonTheme.alignedDropdown] setting
+  /// This will override the surrounding [ButtonThemeData.alignedDropdown] setting
   /// for buttons contained in the [ButtonBar].
   ///
   /// This property only affects [DropdownButton] contained in a [ButtonBar]
diff --git a/packages/flutter/lib/src/material/button_style.dart b/packages/flutter/lib/src/material/button_style.dart
index 61c6525d12b..d8bb11dae63 100644
--- a/packages/flutter/lib/src/material/button_style.dart
+++ b/packages/flutter/lib/src/material/button_style.dart
@@ -121,7 +121,7 @@ class ButtonStyle with Diagnosticable {
   /// The style for a button's [Text] widget descendants.
   ///
   /// The color of the [textStyle] is typically not used directly, the
-  /// [foreground] color is used instead.
+  /// [foregroundColor] is used instead.
   final MaterialStateProperty<TextStyle> textStyle;
 
   /// The button's background fill color.
diff --git a/packages/flutter/lib/src/material/button_theme.dart b/packages/flutter/lib/src/material/button_theme.dart
index 594e0999948..94d1a05f50a 100644
--- a/packages/flutter/lib/src/material/button_theme.dart
+++ b/packages/flutter/lib/src/material/button_theme.dart
@@ -251,7 +251,7 @@ class ButtonThemeData with Diagnosticable {
   /// Create a button theme object that can be used with [ButtonTheme]
   /// or [ThemeData].
   ///
-  /// The [textTheme], [minWidth], [height], [alignedDropDown], and
+  /// The [textTheme], [minWidth], [height], [alignedDropdown], and
   /// [layoutBehavior] parameters must not be null. The [minWidth] and
   /// [height] parameters must greater than or equal to zero.
   ///
@@ -596,7 +596,8 @@ class ButtonThemeData with Diagnosticable {
   ///
   /// If [button] is not [MaterialButton.enabled], the value of
   /// [getDisabledTextColor] is returned. If the button is enabled and
-  /// [buttonTextColor] is non-null, then [buttonTextColor] is returned.
+  /// [MaterialButton.textColor] is non-null, then [MaterialButton.textColor]
+  /// is returned.
   ///
   /// Otherwise the text color depends on the value of [getTextTheme]
   /// and [getBrightness].
@@ -604,7 +605,7 @@ class ButtonThemeData with Diagnosticable {
   ///  * [ButtonTextTheme.normal]: [Colors.white] is used if [getBrightness]
   ///    resolves to [Brightness.dark]. [Colors.black87] is used if
   ///    [getBrightness] resolves to [Brightness.light].
-  ///  * [ButtonTextTheme.accent]: [colorScheme.secondary].
+  ///  * [ButtonTextTheme.accent]: [ColorScheme.secondary] of [colorScheme].
   ///  * [ButtonTextTheme.primary]: If [getFillColor] is dark then [Colors.white],
   ///    otherwise if [button] is a [FlatButton] or an [OutlineButton] then
   ///    [colorScheme.primary], otherwise [Colors.black].
@@ -854,9 +855,9 @@ class ButtonThemeData with Diagnosticable {
 
   /// The minimum size of the [button]'s tap target.
   ///
-  /// Returns the button's [MaterialButton.tapTargetSize] if it is non-null.
+  /// Returns the button's [MaterialButton.materialTapTargetSize] if it is non-null.
   ///
-  /// Otherwise the value of the [materialTapTargetSize] constructor
+  /// Otherwise the value of the `materialTapTargetSize` constructor
   /// parameter is returned if that's non-null.
   ///
   /// Otherwise [MaterialTapTargetSize.padded] is returned.
diff --git a/packages/flutter/lib/src/material/card.dart b/packages/flutter/lib/src/material/card.dart
index f3b8a592bc0..f778d1ef27c 100644
--- a/packages/flutter/lib/src/material/card.dart
+++ b/packages/flutter/lib/src/material/card.dart
@@ -122,8 +122,8 @@ class Card extends StatelessWidget {
   ///
   /// Defines the card's [Material.color].
   ///
-  /// If this property is null then [ThemeData.cardTheme.color] is used,
-  /// if that's null then [ThemeData.cardColor] is used.
+  /// If this property is null then [CardTheme.color] of [ThemeData.cardTheme]
+  /// is used. If that's null then [ThemeData.cardColor] is used.
   final Color color;
 
   /// The color to paint the shadow below the card.
@@ -138,17 +138,17 @@ class Card extends StatelessWidget {
   ///
   /// Defines the card's [Material.elevation].
   ///
-  /// If this property is null then [ThemeData.cardTheme.elevation] is used,
-  /// if that's null, the default value is 1.0.
+  /// If this property is null then [CardTheme.elevation] of
+  /// [ThemeData.cardTheme] is used. If that's null, the default value is 1.0.
   final double elevation;
 
   /// The shape of the card's [Material].
   ///
   /// Defines the card's [Material.shape].
   ///
-  /// If this property is null then [ThemeData.cardTheme.shape] is used.
-  /// If that's null then the shape will be a [RoundedRectangleBorder] with a
-  /// circular corner radius of 4.0.
+  /// If this property is null then [CardTheme.shape] of [ThemeData.cardTheme]
+  /// is used. If that's null then the shape will be a [RoundedRectangleBorder]
+  /// with a circular corner radius of 4.0.
   final ShapeBorder shape;
 
   /// Whether to paint the [shape] border in front of the [child].
@@ -159,17 +159,17 @@ class Card extends StatelessWidget {
 
   /// {@macro flutter.widgets.Clip}
   ///
-  /// If this property is null then [ThemeData.cardTheme.clipBehavior] is used.
-  /// If that's null then the behavior will be [Clip.none].
+  /// If this property is null then [CardTheme.clipBehavior] of
+  /// [ThemeData.cardTheme] is used. If that's null then the behavior will be [Clip.none].
   final Clip clipBehavior;
 
   /// The empty space that surrounds the card.
   ///
   /// Defines the card's outer [Container.margin].
   ///
-  /// If this property is null then [ThemeData.cardTheme.margin] is used,
-  /// if that's null, the default margin is 4.0 logical pixels on all sides:
-  /// `EdgeInsets.all(4.0)`.
+  /// If this property is null then [CardTheme.margin] of
+  /// [ThemeData.cardTheme] is used. If that's null, the default margin is 4.0
+  /// logical pixels on all sides: `EdgeInsets.all(4.0)`.
   final EdgeInsetsGeometry margin;
 
   /// Whether this widget represents a single semantic container, or if false
diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index a02c5aaff1e..cdd7810fff8 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -165,8 +165,8 @@ class Checkbox extends StatefulWidget {
   ///
   /// See also:
   ///
-  ///  * [ThemeData.visualDensity], which specifies the [density] for all widgets
-  ///    within a [Theme].
+  ///  * [ThemeData.visualDensity], which specifies the [visualDensity] for all
+  ///    widgets within a [Theme].
   final VisualDensity visualDensity;
 
   /// The color for the checkbox's [Material] when it has the input focus.
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index adcdd870e8c..499c610f5fc 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -86,7 +86,7 @@ abstract class ChipAttributes {
   /// This only has an effect on widgets that respect the [DefaultTextStyle],
   /// such as [Text].
   ///
-  /// If [labelStyle.color] is a [MaterialStateProperty<Color>], [MaterialStateProperty.resolve]
+  /// If [TextStyle.color] is a [MaterialStateProperty<Color>], [MaterialStateProperty.resolve]
   /// is used for the following [MaterialState]s:
   ///
   ///  * [MaterialState.disabled].
@@ -130,8 +130,8 @@ abstract class ChipAttributes {
   ///
   /// See also:
   ///
-  ///  * [ThemeData.visualDensity], which specifies the [density] for all widgets
-  ///    within a [Theme].
+  ///  * [ThemeData.visualDensity], which specifies the [visualDensity] for all
+  ///    widgets within a [Theme].
   VisualDensity get visualDensity;
 
   /// The padding around the [label] widget.
@@ -257,7 +257,7 @@ abstract class DeletableChipAttributes {
   VoidCallback get onDeleted;
 
   /// The [Color] for the delete icon. The default is based on the ambient
-  /// [IconTheme.color].
+  /// [IconThemeData.color].
   Color get deleteIconColor;
 
   /// The message to be used for the chip's delete button tooltip.
@@ -283,7 +283,8 @@ abstract class CheckmarkableChipAttributes {
   // ignore: unused_element
   factory CheckmarkableChipAttributes._() => null;
 
-  /// Whether or not to show a check mark when [selected] is true.
+  /// Whether or not to show a check mark when
+  /// [SelectableChipAttributes.selected] is true.
   ///
   /// Defaults to true.
   bool get showCheckmark;
@@ -431,7 +432,7 @@ abstract class DisabledChipAttributes {
   ///
   /// If this is true, but all of the user action callbacks are null (i.e.
   /// [SelectableChipAttributes.onSelected], [TappableChipAttributes.onPressed],
-  /// and [DeletableChipAttributes.onDelete]), then the
+  /// and [DeletableChipAttributes.onDeleted]), then the
   /// control will still be shown as disabled.
   ///
   /// This is typically used if you want the chip to be disabled, but also show
@@ -447,7 +448,7 @@ abstract class DisabledChipAttributes {
   ///
   /// The chip is disabled when [isEnabled] is false, or all three of
   /// [SelectableChipAttributes.onSelected], [TappableChipAttributes.onPressed],
-  /// and [DeletableChipAttributes.onDelete] are null.
+  /// and [DeletableChipAttributes.onDeleted] are null.
   ///
   /// It defaults to [Colors.black38].
   Color get disabledColor;
diff --git a/packages/flutter/lib/src/material/chip_theme.dart b/packages/flutter/lib/src/material/chip_theme.dart
index 3363d0dbf80..d2397288a1c 100644
--- a/packages/flutter/lib/src/material/chip_theme.dart
+++ b/packages/flutter/lib/src/material/chip_theme.dart
@@ -284,14 +284,15 @@ class ChipThemeData with Diagnosticable {
   /// (slightly transparent black) for light themes, and Color(0xdeffffff)
   /// (slightly transparent white) for dark themes.
   ///
-  /// May be set to null, in which case the ambient [IconTheme.color] is used.
+  /// May be set to null, in which case the ambient [IconThemeData.color] is used.
   final Color deleteIconColor;
 
   /// Color to be used for the chip's background indicating that it is disabled.
   ///
-  /// The chip is disabled when [isEnabled] is false, or all three of
-  /// [SelectableChipAttributes.onSelected], [TappableChipAttributes.onPressed],
-  /// and [DeletableChipAttributes.onDelete] are null.
+  /// The chip is disabled when [DisabledChipAttributes.isEnabled] is false, or
+  /// all three of [SelectableChipAttributes.onSelected],
+  /// [TappableChipAttributes.onPressed], and
+  /// [DeletableChipAttributes.onDeleted] are null.
   ///
   /// It defaults to [Colors.black38].
   final Color disabledColor;
@@ -299,14 +300,14 @@ class ChipThemeData with Diagnosticable {
   /// Color to be used for the chip's background, indicating that it is
   /// selected.
   ///
-  /// The chip is selected when [selected] is true.
+  /// The chip is selected when [SelectableChipAttributes.selected] is true.
   final Color selectedColor;
 
   /// An alternate color to be used for the chip's background, indicating that
   /// it is selected. For example, this color is used by [ChoiceChip] when the
   /// choice is selected.
   ///
-  /// The chip is selected when [selected] is true.
+  /// The chip is selected when [SelectableChipAttributes.selected] is true.
   final Color secondarySelectedColor;
 
   /// Color of the chip's shadow when the elevation is greater than 0.
@@ -328,7 +329,7 @@ class ChipThemeData with Diagnosticable {
   ///  * [shadowColor]
   final Color selectedShadowColor;
 
-  /// Whether or not to show a check mark when [selected] is true.
+  /// Whether or not to show a check mark when [SelectableChipAttributes.selected] is true.
   ///
   /// For instance, the [ChoiceChip] sets this to false so that it can be
   /// selected without showing the check mark.
@@ -341,7 +342,7 @@ class ChipThemeData with Diagnosticable {
   /// This will override the color set by the platform's brightness setting.
   final Color checkmarkColor;
 
-  /// The padding around the [label] widget.
+  /// The padding around the [Chip.label] widget.
   ///
   /// By default, this is 4 logical pixels at the beginning and the end of the
   /// label, and zero on top and bottom.
diff --git a/packages/flutter/lib/src/material/colors.dart b/packages/flutter/lib/src/material/colors.dart
index ec11c7a9133..46510ac881f 100644
--- a/packages/flutter/lib/src/material/colors.dart
+++ b/packages/flutter/lib/src/material/colors.dart
@@ -331,7 +331,7 @@ class Colors {
 
   /// White with 60% opacity.
   ///
-  /// Used for medium-emphasis text and hint text when [Theme.brightness] is
+  /// Used for medium-emphasis text and hint text when [ThemeData.brightness] is
   /// set to [Brightness.dark].
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/material/Colors.whites.png)
diff --git a/packages/flutter/lib/src/material/data_table.dart b/packages/flutter/lib/src/material/data_table.dart
index 85a9d258553..1ec7726ed5a 100644
--- a/packages/flutter/lib/src/material/data_table.dart
+++ b/packages/flutter/lib/src/material/data_table.dart
@@ -498,11 +498,11 @@ class DataTable extends StatelessWidget {
   /// {@template flutter.material.dataTable.showCheckboxColumn}
   /// Whether the widget should display checkboxes for selectable rows.
   ///
-  /// If true, a [CheckBox] will be placed at the beginning of each row that is
+  /// If true, a [Checkbox] will be placed at the beginning of each row that is
   /// selectable. However, if [DataRow.onSelectChanged] is not set for any row,
   /// checkboxes will not be placed, even if this value is true.
   ///
-  /// If false, all rows will not display a [CheckBox].
+  /// If false, all rows will not display a [Checkbox].
   /// {@endtemplate}
   final bool showCheckboxColumn;
 
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 685ebe4b845..a1b56d60504 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -281,8 +281,8 @@ class AlertDialog extends StatelessWidget {
 
   /// Style for the text in the [title] of this [AlertDialog].
   ///
-  /// If null, [DialogTheme.titleTextStyle] is used, if that's null, defaults to
-  /// [ThemeData.textTheme.headline6].
+  /// If null, [DialogTheme.titleTextStyle] is used. If that's null, defaults to
+  /// [TextTheme.headline6] of [ThemeData.textTheme].
   final TextStyle titleTextStyle;
 
   /// The (optional) content of the dialog is displayed in the center of the
@@ -304,15 +304,15 @@ class AlertDialog extends StatelessWidget {
 
   /// Style for the text in the [content] of this [AlertDialog].
   ///
-  /// If null, [DialogTheme.contentTextStyle] is used, if that's null, defaults
-  /// to [ThemeData.textTheme.subtitle1].
+  /// If null, [DialogTheme.contentTextStyle] is used. If that's null, defaults
+  /// to [TextTheme.subtitle1] of [ThemeData.textTheme].
   final TextStyle contentTextStyle;
 
   /// The (optional) set of actions that are displayed at the bottom of the
   /// dialog.
   ///
   /// Typically this is a list of [TextButton] widgets. It is recommended to
-  /// set the [textAlign] to [TextAlign.end] for the [Text] within the
+  /// set the [Text.textAlign] to [TextAlign.end] for the [Text] within the
   /// [TextButton], so that buttons whose labels wrap to an extra line align
   /// with the overall [ButtonBar]'s alignment within the dialog.
   ///
@@ -366,7 +366,7 @@ class AlertDialog extends StatelessWidget {
   /// bottom and "ends" at the top.
   ///
   /// If null then it will use the surrounding
-  /// [ButtonBarTheme.overflowDirection]. If that is null, it will
+  /// [ButtonBarThemeData.overflowDirection]. If that is null, it will
   /// default to [VerticalDirection.down].
   ///
   /// See also:
@@ -396,7 +396,7 @@ class AlertDialog extends StatelessWidget {
   /// between the entire button bar and the edges of the dialog.
   ///
   /// If this property is null, then it will use the surrounding
-  /// [ButtonBarTheme.buttonPadding]. If that is null, it will default to
+  /// [ButtonBarThemeData.buttonPadding]. If that is null, it will default to
   /// 8.0 logical pixels on the left and right.
   ///
   /// See also:
@@ -420,7 +420,7 @@ class AlertDialog extends StatelessWidget {
   ///
   /// See also:
   ///
-  ///  * [SemanticsConfiguration.isRouteName], for a description of how this
+  ///  * [SemanticsConfiguration.namesRoute], for a description of how this
   ///    value is used.
   final String semanticLabel;
 
@@ -764,7 +764,7 @@ class SimpleDialog extends StatelessWidget {
 
   /// Style for the text in the [title] of this [SimpleDialog].
   ///
-  /// If null, [DialogTheme.titleTextStyle] is used, if that's null, defaults to
+  /// If null, [DialogTheme.titleTextStyle] is used. If that's null, defaults to
   /// [ThemeData.textTheme.headline6].
   final TextStyle titleTextStyle;
 
diff --git a/packages/flutter/lib/src/material/dialog_theme.dart b/packages/flutter/lib/src/material/dialog_theme.dart
index 77b6d4bfe98..0008af94f5e 100644
--- a/packages/flutter/lib/src/material/dialog_theme.dart
+++ b/packages/flutter/lib/src/material/dialog_theme.dart
@@ -56,12 +56,12 @@ class DialogTheme with Diagnosticable {
 
   /// Used to configure the [DefaultTextStyle] for the [AlertDialog.title] widget.
   ///
-  /// If null, defaults to [ThemeData.textTheme.headline6].
+  /// If null, defaults to [TextTheme.headline6] of [ThemeData.textTheme].
   final TextStyle titleTextStyle;
 
   /// Used to configure the [DefaultTextStyle] for the [AlertDialog.content] widget.
   ///
-  /// If null, defaults to [ThemeData.textTheme.subtitle1].
+  /// If null, defaults to [TextTheme.subtitle1] of [ThemeData.textTheme].
   final TextStyle contentTextStyle;
 
   /// Creates a copy of this object but with the given fields replaced with the
diff --git a/packages/flutter/lib/src/material/divider.dart b/packages/flutter/lib/src/material/divider.dart
index ae492e91e2b..01342d06851 100644
--- a/packages/flutter/lib/src/material/divider.dart
+++ b/packages/flutter/lib/src/material/divider.dart
@@ -107,7 +107,7 @@ class Divider extends StatelessWidget {
   /// A divider with a [thickness] of 0.0 is always drawn as a line with a
   /// height of exactly one device pixel.
   ///
-  /// If this is null, then the [DividerThemeData.dividerThickness] is used. If
+  /// If this is null, then the [DividerThemeData.thickness] is used. If
   /// that is also null, then this defaults to 0.0.
   final double thickness;
 
diff --git a/packages/flutter/lib/src/material/dropdown.dart b/packages/flutter/lib/src/material/dropdown.dart
index 1d5bed0d35a..128dec0d1be 100644
--- a/packages/flutter/lib/src/material/dropdown.dart
+++ b/packages/flutter/lib/src/material/dropdown.dart
@@ -791,7 +791,7 @@ class DropdownButton<T> extends StatefulWidget {
   /// Creates a dropdown button.
   ///
   /// The [items] must have distinct values. If [value] isn't null then it
-  /// must be equal to one of the [DropDownMenuItem] values. If [items] or
+  /// must be equal to one of the [DropdownMenuItem] values. If [items] or
   /// [onChanged] is null, the button will be disabled, the down arrow
   /// will be greyed out, and the [disabledHint] will be shown (if provided).
   /// If [disabledHint] is null and [hint] is non-null, [hint] will instead be
@@ -880,12 +880,12 @@ class DropdownButton<T> extends StatefulWidget {
   /// {@template flutter.material.dropdownButton.onChanged}
   /// Called when the user selects an item.
   ///
-  /// If the [onChanged] callback is null or the list of [items] is null
-  /// then the dropdown button will be disabled, i.e. its arrow will be
+  /// If the [onChanged] callback is null or the list of [DropdownButton.items]
+  /// is null then the dropdown button will be disabled, i.e. its arrow will be
   /// displayed in grey and it will not respond to input. A disabled button
-  /// will display the [disabledHint] widget if it is non-null. If
-  /// [disabledHint] is also null but [hint] is non-null, [hint] will instead
-  /// be displayed.
+  /// will display the [DropdownButton.disabledHint] widget if it is non-null.
+  /// If [DropdownButton.disabledHint] is also null but [DropdownButton.hint] is
+  /// non-null, [DropdownButton.hint] will instead be displayed.
   /// {@endtemplate}
   final ValueChanged<T> onChanged;
 
@@ -1014,7 +1014,7 @@ class DropdownButton<T> extends StatefulWidget {
   /// The color of any [Icon] descendant of [icon] if this button is disabled,
   /// i.e. if [onChanged] is null.
   ///
-  /// Defaults to [Colors.grey.shade400] when the theme's
+  /// Defaults to [MaterialColor.shade400] of [Colors.grey] when the theme's
   /// [ThemeData.brightness] is [Brightness.light] and to
   /// [Colors.white10] when it is [Brightness.dark]
   final Color iconDisabledColor;
@@ -1022,7 +1022,7 @@ class DropdownButton<T> extends StatefulWidget {
   /// The color of any [Icon] descendant of [icon] if this button is enabled,
   /// i.e. if [onChanged] is defined.
   ///
-  /// Defaults to [Colors.grey.shade700] when the theme's
+  /// Defaults to [MaterialColor.shade700] of [Colors.grey] when the theme's
   /// [ThemeData.brightness] is [Brightness.light] and to
   /// [Colors.white70] when it is [Brightness.dark]
   final Color iconEnabledColor;
diff --git a/packages/flutter/lib/src/material/elevated_button_theme.dart b/packages/flutter/lib/src/material/elevated_button_theme.dart
index ab80eea2f5e..fc03195683f 100644
--- a/packages/flutter/lib/src/material/elevated_button_theme.dart
+++ b/packages/flutter/lib/src/material/elevated_button_theme.dart
@@ -138,7 +138,7 @@ class ContainedButtonThemeData extends ElevatedButtonThemeData {
   /// Please use [new ElevatedButtonTheme].
   const ContainedButtonThemeData({ ButtonStyle style }) : super(style: style);
 
-  /// Please use [ElevatedButtonTheme.lerp()].
+  /// Please use [ElevatedButtonThemeData.lerp].
   static ContainedButtonThemeData lerp(ContainedButtonThemeData a, ContainedButtonThemeData b, double t) {
     return ElevatedButtonThemeData.lerp(a, b, t) as ContainedButtonThemeData;
   }
diff --git a/packages/flutter/lib/src/material/floating_action_button_location.dart b/packages/flutter/lib/src/material/floating_action_button_location.dart
index b11cee477b1..6e810926cd0 100644
--- a/packages/flutter/lib/src/material/floating_action_button_location.dart
+++ b/packages/flutter/lib/src/material/floating_action_button_location.dart
@@ -416,7 +416,7 @@ abstract class StandardFabLocation extends FloatingActionButtonLocation {
 /// Mixin for a "top" floating action button location, such as
 /// [FloatingActionButtonLocation.startTop].
 ///
-/// The [adjustment], typically [kMiniButtonOffsetAdjustment], is ignored in the
+/// The `adjustment`, typically [kMiniButtonOffsetAdjustment], is ignored in the
 /// Y axis of "top" positions. For "top" positions, the X offset is adjusted to
 /// move closer to the edge of the screen. This is so that a minified floating
 /// action button appears to align with [CircleAvatar]s in the
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index 27fe0ab35c3..c188fc450e0 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -218,7 +218,7 @@ class Material extends StatefulWidget {
   /// widget conceptually defines an independent printed piece of material.
   ///
   /// Defaults to 0. Changing this value will cause the shadow and the elevation
-  /// overlay to animate over [animationDuration].
+  /// overlay to animate over [Material.animationDuration].
   ///
   /// The value is non-negative.
   ///
@@ -226,7 +226,7 @@ class Material extends StatefulWidget {
   ///
   ///  * [ThemeData.applyElevationOverlayColor] which controls the whether
   ///    an overlay color will be applied to indicate elevation.
-  ///  * [color] which may have an elevation overlay applied.
+  ///  * [Material.color] which may have an elevation overlay applied.
   ///
   /// {@endtemplate}
   final double elevation;
diff --git a/packages/flutter/lib/src/material/material_state.dart b/packages/flutter/lib/src/material/material_state.dart
index 1a234942145..f90ad2bd277 100644
--- a/packages/flutter/lib/src/material/material_state.dart
+++ b/packages/flutter/lib/src/material/material_state.dart
@@ -18,7 +18,7 @@ import 'package:flutter/rendering.dart';
 ///
 /// See also:
 ///
-///  * [MaterialProperty], an interface for objects that "resolve" to
+///  * [MaterialStateProperty], an interface for objects that "resolve" to
 ///    different values depending on a widget's material state.
 ///  * [MaterialStateColor], a [Color] that implements `MaterialStateProperty`
 ///    which is used in APIs that need to accept either a [Color] or a
diff --git a/packages/flutter/lib/src/material/slider_theme.dart b/packages/flutter/lib/src/material/slider_theme.dart
index 16f5e64c24f..7510fdcb440 100644
--- a/packages/flutter/lib/src/material/slider_theme.dart
+++ b/packages/flutter/lib/src/material/slider_theme.dart
@@ -3227,7 +3227,7 @@ class _PaddleSliderValueIndicatorPathPainter {
   }
 }
 
-/// A callback that formats a numeric value from a [Slider] or [RangerSlider] widget.
+/// A callback that formats a numeric value from a [Slider] or [RangeSlider] widget.
 ///
 /// See also:
 ///
@@ -3241,7 +3241,7 @@ typedef SemanticFormatterCallback = String Function(double value);
 /// other, it waits for movement defined by [dx] to determine the selected
 /// thumb.
 ///
-/// Override [RangeSlider.thumbSelector] for custom thumb selection.
+/// Override [SliderThemeData.thumbSelector] for custom thumb selection.
 typedef RangeThumbSelector = Thumb Function(
   TextDirection textDirection,
   RangeValues values,
diff --git a/packages/flutter/lib/src/material/tab_indicator.dart b/packages/flutter/lib/src/material/tab_indicator.dart
index 513274657c5..9393f26a9f0 100644
--- a/packages/flutter/lib/src/material/tab_indicator.dart
+++ b/packages/flutter/lib/src/material/tab_indicator.dart
@@ -15,8 +15,8 @@ import 'colors.dart';
 /// The [borderSide] defines the line's color and weight.
 ///
 /// The [TabBar.indicatorSize] property can be used to define the indicator's
-/// bounds in terms of its (centered) widget with [TabIndicatorSize.label],
-/// or the entire tab with [TabIndicatorSize.tab].
+/// bounds in terms of its (centered) widget with [TabBarIndicatorSize.label],
+/// or the entire tab with [TabBarIndicatorSize.tab].
 class UnderlineTabIndicator extends Decoration {
   /// Create an underline style selected tab indicator.
   ///
diff --git a/packages/flutter/lib/src/material/text_form_field.dart b/packages/flutter/lib/src/material/text_form_field.dart
index 9919d961582..08024f1d573 100644
--- a/packages/flutter/lib/src/material/text_form_field.dart
+++ b/packages/flutter/lib/src/material/text_form_field.dart
@@ -37,9 +37,9 @@ export 'package:flutter/services.dart' show SmartQuotesType, SmartDashesType;
 /// when it is no longer needed. This will ensure we discard any resources used
 /// by the object.
 ///
-/// By default, [TextFormField.decoration] will apply the
-/// [ThemeData.inputDecorationTheme] for the current context to the
-/// [InputDecoration], see [InputDecoration.applyDefaults].
+/// By default, `decoration` will apply the [ThemeData.inputDecorationTheme] for
+/// the current context to the [InputDecoration], see
+/// [InputDecoration.applyDefaults].
 ///
 /// For a documentation about the various parameters, see [TextField].
 ///
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 229b71ca3f9..b3407396b5d 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -77,7 +77,7 @@ const Color _kDarkThemeSplashColor = Color(0x40CCCCCC);
 ///   * [OutlineButton]
 ///   * [FlatButton]
 ///   * [RaisedButton]
-///   * [TimePicker]
+///   * The time picker widget ([showTimePicker])
 ///   * [SnackBar]
 ///   * [Chip]
 ///   * [RawChip]
diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 61bbc76ddad..394fd372da1 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -1981,7 +1981,7 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
 /// to add inherited widgets like [Localizations.override],
 /// [Directionality], or [MediaQuery].
 ///
-/// The [entryMode] parameter can be used to
+/// The `initialEntryMode` parameter can be used to
 /// determine the initial time entry selection of the picker (either a clock
 /// dial or text input).
 ///