Updated per @athomas review

Author: Tony Sansone

src/_sass/_site.scss

@@ -514,14 +514,11 @@ thead:has(th:empty) {
   color: $site-color-body;
   margin-top: 1rem;
   padding: 1.5rem;
-<<<<<<< HEAD
-=======
 
   i.material-icons {
     font-size: 1.25em;
     user-select: none;
   }
->>>>>>> a9d6c41c (Updated for 11ty)
 
   .alert-header {
     display: flex;
@@ -883,8 +880,4 @@ div h4:first-child,
 div h5:first-child,
 div h6:first-child {
   margin-top: 0rem;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> a9d6c41c (Updated for 11ty)

src/content/get-dart/_linux.md

@@ -1,22 +1,12 @@
 
-<<<<<<< HEAD
 ### Install using package manager {:.no_toc}
-=======
-### Install using package manager
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
 
 Choose to install either using [apt-get](#install-using-apt-get)
 or downloading a [`.deb`](#install-a-debian-package) package.
 
 Both methods trigger an SDK update whenever Dart releases a new version.
 
-<<<<<<< HEAD
 #### Install using `apt-get` {:.no_toc}
-=======
-#### Install using `apt-get`
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
 
 Perform the following steps for the first install only.
 
@@ -54,19 +44,10 @@ To install the Dart SDK as a Debian package (`*.deb`).
 
    * From a GUI, double-click the `.deb` file.
 
-<<<<<<< HEAD
    * From a terminal, run the following command:
-=======
-   * From a console, run the following command:
->>>>>>> a9d6c41c (Updated for 11ty)
 
      ```console
      $ sudo dpkg -i dart_3.2.6-1_amd64.deb
      ```
 
 [sudo]: https://www.sudo.ws/
-<<<<<<< HEAD
-=======
-[Debian stable]: https://www.debian.org/releases
-[Ubuntu LTS]: https://wiki.ubuntu.com/Releases
->>>>>>> a9d6c41c (Updated for 11ty)

src/content/get-dart/_mac.md

@@ -1,38 +1,6 @@
 
-<<<<<<< HEAD
-### Install using Homebrew  {:.no_toc}
+### Install using Homebrew {:.no_toc}
 
-=======
-### System requirements
-{: .no_toc}
-
-Dart supports the following hardware architectures and platform versions
-to develop and run Dart code on macOS.
-
-#### Hardware architecture
-{: .no_toc}
-
-Dart supports the following CPU architectures.
-
-| Platform | x86 | x64 | ARM | ARM64 | RISC-V |
-|----------|-----|-----|-----|-------|--------|
-| macOS    | No  | Yes | No  | Yes   | No     |
-{:.table .table-striped}
-
-#### Operating system
-{: .no_toc}
-
-Dart supports the latest three major versions of macOS.
-
-| Platform | OS Versions                              |
-|----------|------------------------------------------|
-| macOS    | {% for version in site.data.macos %}{% if version.eol != false %}{% break %}{%- else -%}{{version.cycle}} ({{version.codename}}){% endif %}, {% endfor %} |
-{:.table .table-striped}
-
-### Install using Homebrew
-{: .no_toc}
-
->>>>>>> a9d6c41c (Updated for 11ty)
 To install the Dart SDK, use [Homebrew][].
 
 1. Install Homebrew if needed.
@@ -49,41 +17,22 @@ To install the Dart SDK, use [Homebrew][].
    $ brew install dart
    ```
 
-<<<<<<< HEAD
-### Verify PATH includes Homebrew  {:.no_toc}
-
-Verify that your `PATH` includes the **Homebrew `bin`**.
-=======
-
-### Verify PATH includes Homebrew
-{: .no_toc}
+### Verify PATH includes Homebrew {:.no_toc}
 
-Verify that your `PATH` includes the **Homebrew `bin`.
->>>>>>> a9d6c41c (Updated for 11ty)
-Setting up the path correctly makes it easier to use Dart SDK commands
+Verify that your `PATH` includes the **Homebrew `bin` directory**.
+Setting up the correct path simplifies using Dart SDK commands
 such as `dart run` and `dart format`.
-For help configuring your path,
-consult the [Homebrew FAQ.](https://docs.brew.sh/FAQ)
+To get help configuring your `PATH`, consult the [Homebrew FAQ][].
 
-<<<<<<< HEAD
-### Upgrade using Homebrew  {:.no_toc}
-=======
-### Upgrade using Homebrew
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
+### Upgrade using Homebrew {:.no_toc}
 
 To upgrade when a new release of Dart is available:
 
 ```console
 $ brew upgrade dart
 ```
 
-<<<<<<< HEAD
-### Switch Dart versions  {:.no_toc}
-=======
-### Switch Dart versions
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
+### Switch Dart versions {:.no_toc}
 
 To switch between locally installed Dart releases:
 
@@ -102,12 +51,7 @@ To switch between locally installed Dart releases:
    $ brew unlink dart@<old> && brew unlink dart@<new> && brew link dart@<new>
    ```
 
-<<<<<<< HEAD
-### List installed Dart versions  {:.no_toc}
-=======
-### List installed Dart versions
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
+### List installed Dart versions {:.no_toc}
 
 To see which versions of Dart you've installed:
 
@@ -116,7 +60,5 @@ $ brew info dart
 ```
 
 [Homebrew]: https://brew.sh
-<<<<<<< HEAD
 [tap]: {{site.gh-dart.org}}/homebrew-dart
-=======
->>>>>>> a9d6c41c (Updated for 11ty)
+[Homebrew FAQ]: https://docs.brew.sh/FAQ#my-mac-apps-dont-find-homebrew-utilities

src/content/get-dart/_windows.md

@@ -1,41 +1,22 @@
-<<<<<<< HEAD
 
 ### Install using Chocolatey {:.no_toc}
 
 To install the Dart SDK, use [Chocolatey][Chocolatey].
 Chocolatey requires [elevated permissions].
 
-=======
-### Install using Chocolatey
-{: .no_toc}
-
-To install the Dart SDK, use [Chocolatey][Chocolatey].
-Chocolatey requires [elevated permissions].
-
->>>>>>> a9d6c41c (Updated for 11ty)
 Install Chocolatey, then run a [command prompt] with elevated permissions.
 
 ```ps
 C:\> choco install dart-sdk
 ```
 
-<<<<<<< HEAD
 ### Change default install path {:.no_toc}
-=======
-### Change default install path
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
 
 By default, Chocolatey installs the SDK at `C:\tools\dart-sdk`.
 To change that location, set the [`ChocolateyToolsLocation`][]
 environment variable to your desired installation directory.
 
-<<<<<<< HEAD
 ### Verify your PATH includes Dart {:.no_toc}
-=======
-### Verify your PATH includes Dart
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
 
 Verify you can run Dart.
 
@@ -55,12 +36,7 @@ add the SDK location to your PATH:
 6. In each window that you just opened,
    click **Apply** or **OK** to dismiss it and apply the path change.
 
-<<<<<<< HEAD
 ### Upgrade using Chocolatey {:.no_toc}
-=======
-### Upgrade using Chocolatey
-{: .no_toc}
->>>>>>> a9d6c41c (Updated for 11ty)
 
 To upgrade the Dart SDK:
 

src/content/get-dart/index.md

@@ -8,22 +8,22 @@ js: [{url: '/assets/js/get-dart/install.js', defer: true}]
 This page describes how to download the Dart SDK.
 The Dart SDK includes the libraries and command-line tools that you need to develop Dart command-line, server, and non-Flutter web apps.
 
-To learn more about the Dart SDK, see the [Dart SDK overview](/tools/sdk).
+To learn more about the Dart SDK, consult the [Dart SDK overview](/tools/sdk).
 
 ## System requirements
 
 Dart supports the following hardware architectures and platform versions
-to develop and run Dart code.
+to develop and run Dart code.q
 
 {% assign yes = '<span class="material-symbols" style="color: #158477;">verified</span>' %}
 {% assign no = '<span class="material-symbols" style="color: #D43324">dangerous</span>' %}
 {% assign beta = '<span class="material-symbols" style="color: #13C2AD">gpp_maybe</span>' %}
 {% assign na = '<span class="material-symbols" style="color: #DADCE0">do_not_disturb_on</span>' %}
-{% assign macversions = '' %}
+{% assign macversions = 'Latest three versions of macOS:<br>' %}
 {% for version in macos limit:3 %}
 {%- if version.eol == false -%}
 {% capture maclinkversion -%}
-[{{version.cycle}}]({{version.link}}) ({{version.codename}})
+[{{version.codename}}]({{version.link}}) ({{version.cycle}})
 {%- endcapture -%}
 {% assign macversions = macversions | append: maclinkversion %}
 {%- unless forloop.last -%}{% assign macversions = macversions | append: ', ' %}{% endunless -%}
@@ -139,4 +139,4 @@ follow the [instructions on this page](#install)
 [10]: https://www.microsoft.com/en-us/software-download/windows10%20
 [11]: https://www.microsoft.com/en-us/software-download/windows11
 [Debian stable]: https://www.debian.org/releases
-[Ubuntu LTS]: https://wiki.ubuntu.com/Releases
+[Ubuntu LTS]: https://wiki.ubuntu.com/Releases