From b533eed0fb3b8d41d7a2b8fd727010e5cc6293c9 Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 10 Sep 2021 08:02:49 +0000 Subject: [PATCH] master => main Change-Id: Ib5abdd36858828fde46ee3898489ffd1362e99b2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/213028 Reviewed-by: Alexander Thomas --- CONTRIBUTING.md | 8 ++++---- README.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a508ebdf640..bf9f47dfa28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ If you'd like to improve the documentation, you have three options: * To report an API doc bug, [create an SDK issue](https://github.com/dart-lang/sdk/issues/new?title=API%20doc%20issue:). * Contribute to the Dart developer websites such as [dart.dev](https://dart.dev) (repo: [dart-lang/site-www](https://github.com/dart-lang/site-www)) and [dart.dev/web](https://dart.dev/web) (repo: [dart-lang/site-www/src/web](https://github.com/dart-lang/site-www/tree/master/src/web)). For more information, see [Writing for Dart and Flutter websites](https://github.com/dart-lang/site-shared/wiki/Writing-for-Dart-and-Flutter-websites). - * Improve the API reference docs at [api.dart.dev](https://api.dart.dev) by editing doc comments in the [Dart SDK repo](https://github.com/dart-lang/sdk/tree/master/sdk/lib). For more information on how to write API docs, see [Effective Dart: Documentation](https://dart.dev/guides/language/effective-dart/documentation). + * Improve the API reference docs at [api.dart.dev](https://api.dart.dev) by editing doc comments in the [Dart SDK repo](https://github.com/dart-lang/sdk/tree/main/sdk/lib). For more information on how to write API docs, see [Effective Dart: Documentation](https://dart.dev/guides/language/effective-dart/documentation). ## Before you contribute @@ -41,10 +41,10 @@ git commit ... ``` -## Keeping your branch updated with origin/master +## Keeping your branch updated with origin/main As you work, and before you send a patch for review, you should -ensure your branch is merging cleanly to `origin/master`. +ensure your branch is merging cleanly to `origin/main`. There are multiple ways to do this, but we generally recommend running: @@ -56,7 +56,7 @@ git rebase-update Note: you can run this command from any branch. This command will fetch -origin/master, rebase all your open branches, and delete +origin/main, rebase all your open branches, and delete cleanly merged branches. Your local workflow may vary. diff --git a/README.md b/README.md index 79cec90103d..a82e962d189 100644 --- a/README.md +++ b/README.md @@ -60,12 +60,12 @@ The easiest way to contribute to Dart is to [file issues][dartbug]. You can also contribute patches, as described in [Contributing][contrib]. [website]: https://dart.dev -[license]: https://github.com/dart-lang/sdk/blob/master/LICENSE +[license]: https://github.com/dart-lang/sdk/blob/main/LICENSE [repo]: https://github.com/dart-lang/sdk [lang]: https://dart.dev/guides/language/language-tour [tools]: https://dart.dev/tools [codelabs]: https://dart.dev/codelabs [dartbug]: http://dartbug.com -[contrib]: https://github.com/dart-lang/sdk/blob/master/CONTRIBUTING.md +[contrib]: https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md [pubsite]: https://pub.dev -[patent_grant]: https://github.com/dart-lang/sdk/blob/master/PATENT_GRANT +[patent_grant]: https://github.com/dart-lang/sdk/blob/main/PATENT_GRANT