Skip to content

Commit 8716461

Browse files
parloughCommit Queue
authored and
Commit Queue
committed
[docs] Misc minor cleanup to migrated wiki docs
Fixes a few minor issues relating to outdated links, spelling, Markdown formatting, word choice, etc. Bug: #54066 Change-Id: Ic7b9b33b27d2ce2c30f9b1fe17b0bc91873ecfb7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/369764 Reviewed-by: Nate Bosch <nbosch@google.com> Reviewed-by: Devon Carew <devoncarew@google.com> Commit-Queue: Devon Carew <devoncarew@google.com>
1 parent 82a3006 commit 8716461

25 files changed

+95
-95
lines changed

docs/Adding-and-Updating-Dependencies.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ When adding new third party source dependencies please be very careful. Make sur
1717
For example, a compiler's license might allow using it to compile our binary, but could be too restrictive to allow using its source code as part of the source code for a Dart SDK tool.
1818
You must add a README.google if you check in third-party code, and note any local changes that have been applied to the code (see below for a template). Please cc dart-engprod@google.com on any third-party additions.
1919

20-
If you need to discuss license issues to make sure that a license is compatible please reach out to the legal team at google or talk with dart-engprod@google.com who can guide you to the right
20+
If you need to discuss license issues to make sure that a license is compatible please reach out to the legal team at Google or talk with dart-engprod@google.com who can guide you to the right
2121
person. Please refrain from speculating about licenses or make assumptions about what you may and may not do. If in doubt you should ask. If you are not a Google employee, contact a Dart team member who is.
2222

2323
We have a few rules to make sure that we can continue to build older versions of the SDK even if people delete or rewrite the history of repositories containing our third-party dependencies. There are two options for using repositories not hosted under https://github.com/dart-lang/ or https://github.com/google/:
2424

2525
1. Move it to the dart-lang org, or fork it there. Moving is better than forking since it avoids fragmented versions. If you do fork, please state in the README that this is used for pulling in as a DEPS, don't make local changes, and be sure to not publish to pub from the dart-lang fork.
2626

27-
2. Get the github repo mirrored on the dart.googlesource.com git server, and pull the dependency from there. This is the same way we do normal dependencies from dart-lang (see below), with one important exception:
27+
2. Get the GitHub repo mirrored on the dart.googlesource.com git server, and pull the dependency from there. This is the same way we do normal dependencies from dart-lang (see below), with one important exception:
2828
**For security reasons, all code pulled in to build the Dart SDK must be reviewed by Google employees, no matter where it comes from.** This means that you, or a Google employee, need to do an initial review of all code up to and including the commit you put in the DEPS file for all external packages.
2929

3030
All external packages must be pinned to a fixed commit (revision) in the DEPS file. If you update the DEPS to pin a newer version, you need to do another review of the changes between the two revisions. You can upload the review (of the changes in the dependency, not just the change in the DEPS file) to https://dart-review.googlesource.com for easy reviewing, and upstream any fixes in this dependency, before pinning the new version of the dependency.
3131

32-
For all dependencies on GitHub, we need a mirror. File a GitHub issue labeled `area-infrastructure` (https://dartbug.com) requesting a mirror. The mirrors go to `https://dart.googlesource.com/external/github.com/<org>/<repo>.git`. Once the mirror is set up, you can commit your changes to the DEPS file pointing at the github mirror.
32+
For all dependencies on GitHub, we need a mirror. File a GitHub issue labeled `area-infrastructure` (https://dartbug.com) requesting a mirror. The mirrors go to `https://dart.googlesource.com/external/github.com/<org>/<repo>.git`. Once the mirror is set up, you can commit your changes to the DEPS file pointing at the GitHub mirror.
3333

34-
While you wait for the mirror to get set up, you can add the dependency to the DEPS file pointing directly to `http://github.com/<org>/<repo>.git`. This will let you develop against the dependency locally, but don't commit this.
34+
While you wait for the mirror to get set up, you can add the dependency to the DEPS file pointing directly to `https://github.com/<org>/<repo>.git`. This will let you develop against the dependency locally, but don't commit this.
3535

3636
# Rolling dependencies
3737

docs/Branches-and-releases.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
## Branches and work flows
99

10-
We have a rather simple branch setup for the dart project. Normally, everything is developed on the master branch. Features that are not yet ready for prime time are hidden under a flag, and enabled when sufficient stability has been proven. We occasionally create feature branches for landing big and disruptive changes. In addition to that, we have our dev, beta, and stable branches used for releasing the sdk.
10+
We have a rather simple branch setup for the dart project. Normally, everything is developed on the main branch. Features that are not yet ready for prime time are hidden under a flag, and enabled when sufficient stability has been proven. We occasionally create feature branches for landing big and disruptive changes. In addition to that, we have our dev, beta, and stable branches used for releasing the sdk.
1111

1212
In summary, we have in four main branches:
1313

14-
* **[master](https://github.com/dart-lang/sdk/blob/master/tools/VERSION)**:
14+
* **[main](https://github.com/dart-lang/sdk/blob/main/tools/VERSION)**:
1515
Used for "everyday" development; land your CLs here.
1616

1717
* **[dev](https://github.com/dart-lang/sdk/blob/dev/tools/VERSION)**:
18-
Populated from the master branch via full pushes, usually twice a week. Only in emergencies are [cherry picks](Cherry-picks-to-a-release-channel.md) landed on the dev channel. Don't land CLs here. Released via [dev channel builds](https://dart.dev/tools/sdk/archive#dev-channel).
18+
Populated from the main branch via full pushes, usually twice a week. Only in emergencies are [cherry picks](Cherry-picks-to-a-release-channel.md) landed on the dev channel. Don't land CLs here. Released via [dev channel builds](https://dart.dev/tools/sdk/archive#dev-channel).
1919

2020
* **[beta](https://github.com/dart-lang/sdk/blob/beta/tools/VERSION)**:
2121
Populated from the dev branch via full pushes, usually once a month, or via [cherry picks](Cherry-picks-to-a-release-channel.md). Don't land CLs here. Released via [beta channel builds](https://dart.dev/tools/sdk/archive#beta-channel).
@@ -27,9 +27,9 @@ In summary, we have in four main branches:
2727
## Release cycle
2828
Our normal release cycle is roughly 2 months long, but we don't make any guarantees, i.e., we may ship early if we feel that the stability is good or we may ship late if it is not. We don't normally follow a feature driven release cycle, but in some cases for larger changes to the language we may postpone a release to get all tools in sync.
2929

30-
During the entire cycle we do full merges of master to dev, basically releasing a green build from master on dev roughly twice a week. In case of bugs found quickly we do another full push.
30+
During the entire cycle we do full merges of main to dev, basically releasing a green build from main on dev roughly twice a week. In case of bugs found quickly we do another full push.
3131

32-
We spend the last ~2 weeks of the cycle stabilizing the beta channel, starting with a full push of the latest dev release to beta. We only cherry picking critical fixes to the beta channel. People continue working on the master branch and dev releases will continue to be released. In this 2 week period we do multiple batches of cherry picks a week, and release those on the beta channel. We call this cherry-pick season.
32+
We spend the last ~2 weeks of the cycle stabilizing the beta channel, starting with a full push of the latest dev release to beta. We only cherry picking critical fixes to the beta channel. People continue working on the main branch and dev releases will continue to be released. In this 2 week period we do multiple batches of cherry picks a week, and release those on the beta channel. We call this cherry-pick season.
3333

3434
Once we have something that looks good we merge it to stable and release it there. During the 2 months we do patch security, crash and critical bug releases on stable based on the latest stable version.
3535

docs/Building-Dart-SDK-for-ARM-or-RISC-V.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you are running Debian/Ubuntu, you can obtain a cross-compiler by doing the f
2121
$ sudo apt-get install g++-arm-linux-gnueabihf # For 32-bit ARM (ARMv7)
2222
$ sudo apt-get install g++-aarch64-linux-gnu # For 64-bit ARM (ARMv8)
2323
$ sudo apt-get install g++-riscv64-linux-gnu # For 64-bit RISC-V (RV64GC)
24-
```
24+
```
2525

2626
## Android
2727

docs/Building-the-Dart-VM-for-Android.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ Run gclient sync to install the Android NDK and SDK. This may take 10 minutes or
3131

3232
# Building for Android
3333

34-
Once youve set up your build tree, you can build the Dart VM for Android by using the standard Dart build script with the addition of the --os android build flag:
34+
Once you've set up your build tree, you can build the Dart VM for Android by using the standard Dart build script with the addition of the --os android build flag:
3535

3636
`$ tools/build.py --no-goma --arch=arm,arm64,ia32,x64 --os=android runtime`
3737

3838
# Testing the result
3939

40-
Adding adb to your path
40+
Adding `adb` to your path
4141

4242
For convenience, add the path to the adb tool to your shell PATH:
4343

@@ -91,7 +91,7 @@ or
9191

9292
`$ adb -s emulator-name emu kill ← if there is more than one emulator running`
9393

94-
## Running the Dart VM on an Android device ##
94+
## Running the Dart VM on an Android device
9595

9696
First, make sure that the "USB Debugging" mode is enabled by navigating to Settings > Developer options > USB debugging. The box should be checked. You may need to have root on the device.
9797

@@ -110,4 +110,4 @@ Now, you can copy dart and hello.dart to the device as above. If an emulator is
110110

111111
# Notes
112112

113-
The only effect of the target_os line in the Dart .gclient configuration file is to install the Android tools. Despite what the name target_os implies, the target_os line does not affect which OS is targeted. Therefore, once youve installed the Android tools you can (and should) leave the target_os = [android] line in place even when switching back and forth between building for Android and building for Linux.
113+
The only effect of the `target_os` line in the Dart `.gclient` configuration file is to install the Android tools. Despite what the name `target_os` implies, the target_os line does not affect which OS is targeted. Therefore, once you've installed the Android tools you can (and should) leave the `target_os = ["android"]` line in place even when switching back and forth between building for Android and building for Linux.

docs/Building.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[Building the standalone VM only](#standalone)
1010

11-
<a name="dependencies"/>
11+
<a id="dependencies"></a>
1212

1313
# Dependencies
1414

@@ -50,17 +50,17 @@ export PATH="$PATH:$PWD/depot_tools"
5050
5151
## Windows
5252

53-
[Install Visual Studio](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md#visual-studio) (2017 or newer). Make sure to install "Desktop development with C++" component.
53+
[Install Visual Studio](https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#visual-studio) (2017 or newer). Make sure to install "Desktop development with C++" component.
5454

5555
You must have Windows 10 SDK installed. This can be installed separately or by checking the appropriate box in the Visual Studio Installer.
5656

57-
The SDK Debugging Tools must also be installed. If the Windows 10 SDK was installed via the Visual Studio installer, then they can be installed by going to: Control Panel → Programs → Programs and Features → Select the Windows Software Development Kit → Change → Change → Check Debugging Tools For Windows → Change. Or, you can download the standalone SDK installer and use it to install the Debugging Tools.
57+
The SDK Debugging Tools must also be installed. If the Windows 10 SDK was installed via the Visual Studio installer, then they can be installed by going to: Control Panel → Programs → Programs and Features → Select the "Windows Software Development Kit" → Change → Change → Check "Debugging Tools For Windows" → Change. Or, you can download the standalone SDK installer and use it to install the Debugging Tools.
5858

59-
Install Chromium's depot tools following [this](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) or [this](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md#install) instructions.
59+
Install Chromium's depot tools following [this](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) or [this](https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#install) instructions.
6060

6161
**Important:** If you are not a Googler make sure to set `DEPOT_TOOLS_WIN_TOOLCHAIN` system variable to `0` otherwise depot tools will attempt to pull down a Google-internal toolchain instead of using a local installation of Visual Studio.
6262

63-
<a name="source"/>
63+
<a id="source"></a>
6464

6565
# Getting the source
6666

@@ -93,7 +93,7 @@ Note: If you do not have emscripten, you can update your `.gclient` file to pull
9393
},
9494
```
9595

96-
<a name="building"/>
96+
<a id="building"></a>
9797

9898
# Building
9999

@@ -107,7 +107,7 @@ cd sdk
107107
./tools/build.py --mode release --arch x64 create_sdk
108108
```
109109

110-
The output will be in `out/ReleaseX64/dart-sdk` on Linux and Windows, and `xcodebuild/ReleaseX64/dart-sdk` on MacOS.
110+
The output will be in `out/ReleaseX64/dart-sdk` on Linux and Windows, and `xcodebuild/ReleaseX64/dart-sdk` on macOS.
111111

112112
Build the 32-bit SDK:
113113

@@ -116,15 +116,15 @@ Build the 32-bit SDK:
116116
cd sdk
117117
./tools/build.py --mode release --arch ia32 create_sdk
118118
```
119-
The output will be in `out/ReleaseIA32/dart-sdk` on Linux and Windows, or `xcodebuild/ReleaseIA32/dart-sdk` on MacOS.
119+
The output will be in `out/ReleaseIA32/dart-sdk` on Linux and Windows, or `xcodebuild/ReleaseIA32/dart-sdk` on macOS.
120120

121121
See also [Building Dart SDK for ARM or RISC-V](Building-Dart-SDK-for-ARM-or-RISC-V.md).
122122

123123
## Tips
124124

125125
By default the build and test scripts select the debug binaries. You can build and test the release version of the VM by specifying `--mode=release` or both debug and release by specifying `--mode=all` on the respective `build.py` and `test.py` command lines. This can be shortened to `-mrelease` or `-m release`, and the architecture can be specified with `--arch=x64` or `-a x64`, the default. Other architectures, like `ia32`, `arm`, and `arm64` are also supported.
126126

127-
We recommend that you use a local file system at least for the output of the builds. The output directory is `out` on linux, `xcodebuild` on Mac OS, and `build` on Windows. If your code is in some NFS partition, you can link the `out` directory to a local directory:
127+
We recommend that you use a local file system at least for the output of the builds. The output directory is `out` on linux, `xcodebuild` on macOS, and `build` on Windows. If your code is in some NFS partition, you can link the `out` directory to a local directory:
128128
```bash
129129

130130
$ cd sdk/
@@ -143,7 +143,7 @@ Your Visual Studio executable command may have a different name from the standar
143143

144144
## Building on Windows with Visual Studio 2015
145145
Gyp should autodetect the version of Visual Studio you have, and produce solution files in the correct format.
146-
If this is not happening, then set environment variable gyp\_msvs\_version to 2015.
146+
If this is not happening, then set environment variable `gyp_msvs_version` to `2015`.
147147

148148
For example, this will produce Visual Studio 2015-compliant solution files:
149149
```bash
@@ -244,7 +244,7 @@ Some common problems you might get when running tests for the first time:
244244

245245
* Other options include using ssh X tunneling (`ssh -Y`), NX, VNC, setting up `xhost` and exporting the DISPLAY environment variable, or simply running tests locally.
246246

247-
<a name="standalone"/>
247+
<a id="standalone"></a>
248248

249249
# Building the standalone VM only
250250

docs/Cherry-picks-to-a-release-channel.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ This is a patch release that:
7676
...
7777
```
7878

79-
Link to your cherry-pick request as subsequently filed below. You can upload the changelist again with the final link once the github issue has been filed. The cherry-pick request on github is often more useful for users than the original bug, since it explains the rationale concisely and links to the underlying bug for more information.
79+
Link to your cherry-pick request as subsequently filed below. You can upload the changelist again with the final link once the GitHub issue has been filed. The cherry-pick request on GitHub is often more useful for users than the original bug, since it explains the rationale concisely and links to the underlying bug for more information.
8080

8181
If the cherry-pick is infrastructure only and is invisible to users, the `Changelog-Exempt: ...` footer exempts the change from the changelog requirement.
8282

docs/Code-review-workflow-with-GitHub-and-Gerrit.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
There are several ways to contribute code in GitHub, for example
99

10-
1. forking and creating pull request from a forked repo (https://help.github.com/articles/fork-a-repo)
11-
1. branching within the main repo, and doing pull requests from one branch to another.
12-
1. working on a local branch, creating a code review using Gerrit, push directly into master (this article).
10+
1. Forking and creating pull request from a forked repo (https://help.github.com/articles/fork-a-repo)
11+
1. Branching within the main repo, and doing pull requests from one branch to another.
12+
1. Working on a local branch, creating a code review using Gerrit, push directly into main (this article).
1313

1414
## Step 1: get the source
1515

@@ -32,7 +32,7 @@ There is a `codereview.settings` file in the repo to configure things automatica
3232

3333
## Step 3: Create a branch for your new changes
3434

35-
Pick a branch name not existing locally nor in the remote repo, we recommend that you use your user name as a prefix to make things simpler.
35+
Pick a branch name not existing locally nor in the remote repo, we recommend that you use your username as a prefix to make things simpler.
3636

3737
> cd sdk # the repo created above
3838
> git checkout -b uname_example # new branch

docs/Debugging-Dart-VM-with-AddressSanitizer.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export UBSAN_SYMBOLIZER_PATH="$PWD/buildtools/linux-x64/clang/bin/llvm-symbolize
5050
./tools/sdks/dart-sdk/bin/dart ./tools/test.dart -n dartk-linux-release-x64 -N dartk-ubsan-linux-release-x64
5151
```
5252

53-
The handle_segv=0 is only crucial when running through the test suite, wherein several tests are expected to segfault, and will fail if ASan installs its own segfault handler.
53+
The `handle_segv=0` is only crucial when running through the test suite, wherein several tests are expected to segfault, and will fail if ASan installs its own segfault handler.
5454

5555
# Development #
5656

docs/External-Package-Maintenance.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Bumping versions
44

55
Dart packages have two varieties of versioning schemes. We use
6-
[semver](semver.org) with a variation that the numbers are shifted to the right
6+
[semver](https://semver.org) with a variation that the numbers are shifted to the right
77
if the package is not stable enough to reach a `1.0.0` release. Note that the
88
Dart team culture was previously to keep packages at `0.x` for a long time,
99
whereas now we prefer to publish `1.0.0` as soon as feasible to avoid confusion
@@ -113,11 +113,11 @@ at a time and then the old behavior can be removed once everything is migrated.
113113
request. Prefer to merge into that branch to resolve conflicts, prefer not
114114
to rebase.
115115
- Comments are tied to commits, so force pushing also destroys comment
116-
history in github prs.
116+
history in GitHub prs.
117117
- Pushing a new commit with code review updates makes it easy to review
118118
changes since your last review, by looking at the new commits only.
119119
- Add comments from the "Files changed" view, even as the PR author, so that
120120
they can sent in a batch rather than replying to each one by one on the
121121
"Conversation" view.
122122
- The [gh cli tool](https://cli.github.com/) makes it easy to checkout a PR
123-
in cases where a change may be easer to understand in an IDE.
123+
in cases where a change may be easier to understand in an IDE.

0 commit comments

Comments
 (0)