From 6e4e1b078a73bbbcbb190eca6288bb3bde39548c Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <nawazcode@gmail.com>
Date: Thu, 30 Mar 2023 15:18:16 +0530
Subject: [PATCH 01/12] Document 'dart pub add' support for adding dependency
 overrides

---
 src/tools/pub/cmd/pub-add.md | 58 ++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 268f886635..67eb5422bc 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -9,11 +9,11 @@ _Add_ is one of the commands of the [pub tool](/tools/pub/cmd).
 $ dart pub add [dev:]<package>[:<constraint>] [[dev:]<package>[:<constraint>]... ] [options]
 ```
 
-This command adds the specified packages to the `pubspec.yaml` as dependencies, 
-and then retrieves the dependencies to resolve `pubspec.yaml`.  
+This command adds the specified packages to the `pubspec.yaml` as dependencies,
+and then retrieves the dependencies to resolve `pubspec.yaml`.
 
 The following example command is equivalent to
-editing `pubspec.yaml` to add the `http` package, 
+editing `pubspec.yaml` to add the `http` package,
 and then calling `dart pub get`:
 
 ```terminal
@@ -39,6 +39,26 @@ $ dart pub add foo:'>2.0.0 <3.0.1'
 If `dart pub add <package>:<constraint>` is an existing dependency,
 it will update the constraint.
 
+### Adding Dependency Overrides
+
+Starting in Dart 3, `dart pub add` supports adding dependency overrides in a similar fashion to dev dependencies. To add a dependency override, use the following syntax:
+`dart pub add override:<package>:<version>`
+
+For example, to add an override for the `foo` package version `1.0.0`, run the following command:
+
+```
+dart pub add override:foo:1.0.0
+```
+
+This will add an override to your `pubspec.yaml` file:
+
+```
+dependency_overrides:
+foo: 1.0.0
+```
+
+Note that dependency overrides can conflict with the normal dependency resolution process and should be used with caution.
+
 ## `dev` dependency
 
 The `dev:` prefix adds the package as a [dev dependency][],
@@ -61,14 +81,14 @@ $ dart pub add --dev foo
 ## Source descriptor
 
 {{site.alert.version-note}}
-  YAML-formatted descriptor syntax was added in Dart 2.19.
-  The descriptor replaces arguments like `--path`, `--sdk`, `--git-<option>`, etc.
-  We still support these arguments, but the recommended method is now
-  YAML-descriptor only.
+YAML-formatted descriptor syntax was added in Dart 2.19.
+The descriptor replaces arguments like `--path`, `--sdk`, `--git-<option>`, etc.
+We still support these arguments, but the recommended method is now
+YAML-descriptor only.
 {{site.alert.end}}
 
 The YAML descriptor syntax allows you to add multiple packages from different
-sources, and apply different options and contraints to each. 
+sources, and apply different options and contraints to each.
 
 ```nocode
 $ dart pub add [options] [dev:]<package>[:descriptor] [[dev:]<package>[:descriptor] ...]
@@ -83,7 +103,7 @@ The syntax reflects how dependencies are written in `pubspec.yaml`.
 The `descriptor` syntax cannot be used in conjunction with any of the optional
 arguments it replaces. Their new, corresponding YAML sources are listed below.
 
-### `git` 
+### `git`
 
 Adds a [git dependency](/tools/pub/dependencies#git-packages).
 
@@ -139,7 +159,7 @@ _Previously the `--hosted-url=<package_server_url>` option_.
 
 Adds a [path dependency]() on a locally stored package.
 
-```terminal 
+```terminal
 $ dart pub add 'foo:{"path":"../foo"}'
 ```
 
@@ -167,13 +187,13 @@ For options that apply to all pub commands, see
 [Global options](/tools/pub/cmd#global-options).
 
 {{site.alert.note}}
-  The previous `pub add` syntax for options
-  (without YAML descriptors) applies the
-  specified options to all the packages
-  included in an invocation of the command.
-  For example, `dart pub add test http --dev` 
-  will add both the `test` and `http` packages 
-  as dev dependencies.
+The previous `pub add` syntax for options
+(without YAML descriptors) applies the
+specified options to all the packages
+included in an invocation of the command.
+For example, `dart pub add test http --dev`
+will add both the `test` and `http` packages
+as dev dependencies.
 {{site.alert.end}}
 
 ### `--[no-]offline`
@@ -192,6 +212,6 @@ in immediate dependencies (`--precompile`).
 To prevent precompilation, use `--no-precompile`.
 
 {{site.alert.info}}
-  *Problems?*
-  See [Troubleshooting Pub](/tools/pub/troubleshoot).
+_Problems?_
+See [Troubleshooting Pub](/tools/pub/troubleshoot).
 {{site.alert.end}}

From 65383116bb7105dc4ebce74c5e0eaf7d57e6b980 Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:32:46 +0530
Subject: [PATCH 02/12] indentations reverted

---
 src/tools/pub/cmd/pub-add.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 67eb5422bc..d28f9f7987 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -39,7 +39,7 @@ $ dart pub add foo:'>2.0.0 <3.0.1'
 If `dart pub add <package>:<constraint>` is an existing dependency,
 it will update the constraint.
 
-### Adding Dependency Overrides
+## Adding Dependency Overrides
 
 Starting in Dart 3, `dart pub add` supports adding dependency overrides in a similar fashion to dev dependencies. To add a dependency override, use the following syntax:
 `dart pub add override:<package>:<version>`
@@ -81,10 +81,10 @@ $ dart pub add --dev foo
 ## Source descriptor
 
 {{site.alert.version-note}}
-YAML-formatted descriptor syntax was added in Dart 2.19.
-The descriptor replaces arguments like `--path`, `--sdk`, `--git-<option>`, etc.
-We still support these arguments, but the recommended method is now
-YAML-descriptor only.
+  YAML-formatted descriptor syntax was added in Dart 2.19.
+  The descriptor replaces arguments like `--path`, `--sdk`, `--git-<option>`, etc.
+  We still support these arguments, but the recommended method is now
+  YAML-descriptor only.
 {{site.alert.end}}
 
 The YAML descriptor syntax allows you to add multiple packages from different
@@ -187,13 +187,13 @@ For options that apply to all pub commands, see
 [Global options](/tools/pub/cmd#global-options).
 
 {{site.alert.note}}
-The previous `pub add` syntax for options
-(without YAML descriptors) applies the
-specified options to all the packages
-included in an invocation of the command.
-For example, `dart pub add test http --dev`
-will add both the `test` and `http` packages
-as dev dependencies.
+  The previous `pub add` syntax for options
+  (without YAML descriptors) applies the
+  specified options to all the packages
+  included in an invocation of the command.
+  For example, `dart pub add test http --dev`
+  will add both the `test` and `http` packages
+  as dev dependencies.
 {{site.alert.end}}
 
 ### `--[no-]offline`
@@ -212,6 +212,6 @@ in immediate dependencies (`--precompile`).
 To prevent precompilation, use `--no-precompile`.
 
 {{site.alert.info}}
-_Problems?_
-See [Troubleshooting Pub](/tools/pub/troubleshoot).
+  *Problems?*
+  See [Troubleshooting Pub](/tools/pub/troubleshoot).
 {{site.alert.end}}

From f1c4f9d14c659a260e15b1ed8a2a225a6d880ad8 Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:48:26 +0530
Subject: [PATCH 03/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index d28f9f7987..d7896411cc 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -39,7 +39,7 @@ $ dart pub add foo:'>2.0.0 <3.0.1'
 If `dart pub add <package>:<constraint>` is an existing dependency,
 it will update the constraint.
 
-## Adding Dependency Overrides
+## Dependency overrides
 
 Starting in Dart 3, `dart pub add` supports adding dependency overrides in a similar fashion to dev dependencies. To add a dependency override, use the following syntax:
 `dart pub add override:<package>:<version>`

From 49bb135a15bac26a6f19f4b4f4de1d7e7c92855f Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:49:46 +0530
Subject: [PATCH 04/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index d7896411cc..04fc2076d6 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -41,8 +41,10 @@ it will update the constraint.
 
 ## Dependency overrides
 
-Starting in Dart 3, `dart pub add` supports adding dependency overrides in a similar fashion to dev dependencies. To add a dependency override, use the following syntax:
-`dart pub add override:<package>:<version>`
+To specify a [dependency override][], add the `override:` prefix and
+include a [source descriptor](#source-descriptor).
+
+[dependency override]: /tools/pub/dependencies#dependency-overrides
 
 For example, to add an override for the `foo` package version `1.0.0`, run the following command:
 

From 44d9d674541391014de02df6438140b3d142ba6e Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:53:46 +0530
Subject: [PATCH 05/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 04fc2076d6..0c07e22a85 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -46,7 +46,9 @@ include a [source descriptor](#source-descriptor).
 
 [dependency override]: /tools/pub/dependencies#dependency-overrides
 
-For example, to add an override for the `foo` package version `1.0.0`, run the following command:
+**For example**, to override all references to `package:foo`
+to use version `1.0.0` of the package,
+run the following command:
 
 ```
 dart pub add override:foo:1.0.0

From bd73097f7d3c5a0d117c6a1c4be5648ba8e4e309 Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:54:01 +0530
Subject: [PATCH 06/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 0c07e22a85..8492a2a8df 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -54,7 +54,7 @@ run the following command:
 dart pub add override:foo:1.0.0
 ```
 
-This will add an override to your `pubspec.yaml` file:
+This adds the override to your `pubspec.yaml` file:
 
 ```
 dependency_overrides:

From 3716f17e0bb83c3ebe1bd8bc64d9b6315833fbcc Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:54:24 +0530
Subject: [PATCH 07/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 8492a2a8df..8c5b881d4a 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -50,7 +50,7 @@ include a [source descriptor](#source-descriptor).
 to use version `1.0.0` of the package,
 run the following command:
 
-```
+```terminal
 dart pub add override:foo:1.0.0
 ```
 

From 1f0b9c519f597b5bbcb3f0b2c9262506dd95ea26 Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:54:42 +0530
Subject: [PATCH 08/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 8c5b881d4a..9e7b0ea655 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -51,7 +51,7 @@ to use version `1.0.0` of the package,
 run the following command:
 
 ```terminal
-dart pub add override:foo:1.0.0
+$ dart pub add override:foo:1.0.0
 ```
 
 This adds the override to your `pubspec.yaml` file:

From 387c1acd73e1674f3abba8a4751723897af01b75 Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:55:10 +0530
Subject: [PATCH 09/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 9e7b0ea655..87a7984c5a 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -56,7 +56,7 @@ $ dart pub add override:foo:1.0.0
 
 This adds the override to your `pubspec.yaml` file:
 
-```
+```yaml
 dependency_overrides:
 foo: 1.0.0
 ```

From 9d99de86b656d8fefd2fc8e57c5732cb5042ec0a Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:55:40 +0530
Subject: [PATCH 10/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 87a7984c5a..ff904f6da8 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -61,8 +61,6 @@ dependency_overrides:
 foo: 1.0.0
 ```
 
-Note that dependency overrides can conflict with the normal dependency resolution process and should be used with caution.
-
 ## `dev` dependency
 
 The `dev:` prefix adds the package as a [dev dependency][],

From 5d171213f9f00d41e129aabe3538399472a6b21e Mon Sep 17 00:00:00 2001
From: Shaik Ahmad Nawaz <96189881+shaikahmadnawaz@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:55:52 +0530
Subject: [PATCH 11/12] Update src/tools/pub/cmd/pub-add.md

Co-authored-by: Parker Lougheed <parlough@gmail.com>
---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index ff904f6da8..71ac4fae01 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -58,7 +58,7 @@ This adds the override to your `pubspec.yaml` file:
 
 ```yaml
 dependency_overrides:
-foo: 1.0.0
+  foo: 1.0.0
 ```
 
 ## `dev` dependency

From 223e0caf86d90b24628213d32573527fe9d71dfa Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Tue, 4 Apr 2023 17:54:41 -0500
Subject: [PATCH 12/12] Further clean up "For example"

---
 src/tools/pub/cmd/pub-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pub/cmd/pub-add.md b/src/tools/pub/cmd/pub-add.md
index 71ac4fae01..4c7ec24da0 100644
--- a/src/tools/pub/cmd/pub-add.md
+++ b/src/tools/pub/cmd/pub-add.md
@@ -46,7 +46,7 @@ include a [source descriptor](#source-descriptor).
 
 [dependency override]: /tools/pub/dependencies#dependency-overrides
 
-**For example**, to override all references to `package:foo`
+**For example:** To override all references to `package:foo`
 to use version `1.0.0` of the package,
 run the following command: