Track 'main' to resolve a merge conflict

Re-applied the changes from commit 1b663f7 (Fix invalid HTML comments
(swiftlang#334), 2024-12-04) -- which landed on 'main' after this branch diverged
-- to the new location for that content.

Reviewed this branch's changes, before and after this merge, as follows:

    opendiff =(git diff main...b6439e7) =(git diff main...HEAD)

References: 1b663f7
References: b6439e7

Author: amartini51

.git-blame-ignore-revs

@@ -2,7 +2,7 @@
 # changes, which should be ignored by git-blame, so that it can instead
 # display more the relevant history and attribution information.
 #
-# To use this file for a single blame operation,
+# To use this file for a single command, pass it as follows:
 #
 #   git blame --ignore-revs-file .git-blame-ignore-revs <somefile>
 #
@@ -14,8 +14,11 @@
 # the --ignore-revs-file option, and the git-config(1) man page's
 # discussion of the blame.ignoreRevsFile option.
 
-# Convert RST to markdown.
+# Convert RST to markdown
 96f0925407c6bd9eadd9d58d253bad3e1ef7a9f2
 
-# Convert the formal grammar to markdown.
+# Convert the formal grammar to markdown
 4039ee0ef4e69d2cf6460861f9444a499503db16
+
+# Clean up formatting of term-definition lists
+c914c44ccdbbda757ee43e5d4c777abf24391a1a

.git-order-file

@@ -62,4 +62,5 @@ TSPL.docc/ReferenceManual/SummaryOfTheGrammar.md
 
 TSPL.docc/RevisionHistory/RevisionHistory.md
 
-# Files that don't match a pattern listed above appear at the end.
+# Files that don't match a pattern listed above, such as assets and
+# build scripts, will appear at the end of the diff.

CODE_OF_CONDUCT.md

@@ -47,7 +47,7 @@ but don't rebase commits that are part of a pull request.
 
 ## Writing commit messages
 
-Use the Git commit message to communicate with other contributors --
+Use the Git commit message to communicate with other contributors —
 both the people working on the project now
 who are reviewing your changes,
 and people who join the project in the future

CONTRIBUTING.md

@@ -2,15 +2,24 @@
 
 Learn what functionality is available in older language modes.
 
-This book describes Swift 5.10,
-the default version of Swift that's included in Xcode 15.3.
-You can use Xcode 15.3 to build targets
-that are written in either 5.10, Swift 4.2, or Swift 4.
-
-When you use Xcode 15.3 to build Swift 4 and Swift 4.2 code,
-most Swift 5.10 functionality is available.
+This book describes Swift 6,
+the default version of Swift that's included in Xcode 16.
+You can use the Swift 6 compiler to build code
+that's written in Swift 6, Swift 5, Swift 4.2, or Swift 4.
+
+When you use the Swift 6 compiler
+to build code that uses the Swift 5 language mode,
+you can use the new features from Swift 6 ---
+they're enabled either by default or by an upcoming feature flag.
+However, to enable strict concurrency checking,
+you need to upgrade to the Swift 6 language mode.
+
+In addition,
+when you use Xcode 15.3 to build Swift 4 and Swift 4.2 code,
+most Swift 5 functionality is still available.
 That said,
-the following changes are available only to code that uses 5.10 or later:
+the following changes are available only to code
+that uses the Swift 5 language mode:
 
 - Functions that return an opaque type require the Swift 5.1 runtime.
 - The `try?` expression doesn't introduce an extra level of optionality
@@ -20,18 +29,18 @@ the following changes are available only to code that uses 5.10 or later:
   For example, `UInt64(0xffff_ffff_ffff_ffff)` evaluates to the correct value
   rather than overflowing.
 
-Concurrency requires 5.10 or later,
+Concurrency requires the Swift 5 language mode
 and a version of the Swift standard library
 that provides the corresponding concurrency types.
 On Apple platforms, set a deployment target
-of at least iOS 13, macOS 10.15, tvOS 13, or watchOS 6.
+of at least iOS 13, macOS 10.15, tvOS 13, watchOS 6, or visionOS 1.
 
-A target written in 5.10 can depend on
-a target that's written in Swift 4.2 or Swift 4,
+A target written in Swift 6 can depend on
+a target that's written in Swift 5, Swift 4.2 or Swift 4,
 and vice versa.
 This means, if you have a large project
 that's divided into multiple frameworks,
-you can migrate your code from Swift 4 to 5.10
+you can migrate your code to a newer language version
 one framework at a time.
 
 <!--

TSPL.docc/Assets/CollectionTypes_intro_2x.png renamed to TSPL.docc/Assets/[email protected]

@@ -255,7 +255,7 @@ occupations["Jayne"] = "Public Relations"
   ```swifttest
   -> var fruits = ["strawberries", "limes", "tangerines"]
   -> fruits[1] = "grapes"
-  ---
+
   -> var occupations = [
          "Malcolm": "Captain",
          "Kaylee": "Mechanic",
@@ -317,7 +317,7 @@ let emptyDictionary: [String: Float] = [:]
   ```swifttest
   -> let emptyArray: [String] = []
   -> let emptyDictionary: [String: Float] = [:]
-  ---
+
   -> let anotherEmptyArray = [String]()
   -> let emptyDictionary = [String: Float]()
   ```
@@ -432,7 +432,7 @@ if let name = optionalName {
   -> var optionalString: String? = "Hello"
   -> print(optionalString == nil)
   <- false
-  ---
+
   -> var optionalName: String? = "John Appleseed"
   -> var greeting = "Hello!"
   -> if let name = optionalName {
@@ -658,7 +658,7 @@ print(m)
      }
   -> print(n)
   <- 128
-  ---
+
   -> var m = 2
   -> repeat {
          m *= 2
@@ -1132,11 +1132,11 @@ class NamedShape {
   -> class NamedShape {
          var numberOfSides: Int = 0
          var name: String
-  ---
+
          init(name: String) {
             self.name = name
          }
-  ---
+
          func simpleDescription() -> String {
             return "A shape with \(numberOfSides) sides."
          }
@@ -1202,17 +1202,17 @@ test.simpleDescription()
   ```swifttest
   -> class Square: NamedShape {
          var sideLength: Double
-  ---
+
          init(sideLength: Double, name: String) {
              self.sideLength = sideLength
              super.init(name: name)
              numberOfSides = 4
          }
-  ---
+
          func area() -> Double {
              return sideLength * sideLength
          }
-  ---
+
          override func simpleDescription() -> String {
              return "A square with sides of length \(sideLength)."
          }
@@ -1276,13 +1276,13 @@ print(triangle.sideLength)
   ```swifttest
   -> class EquilateralTriangle: NamedShape {
          var sideLength: Double = 0.0
-  ---
+
          init(sideLength: Double, name: String) {
              self.sideLength = sideLength
              super.init(name: name)
              numberOfSides = 3
          }
-  ---
+
          var perimeter: Double {
              get {
                   return 3.0 * sideLength
@@ -1291,7 +1291,7 @@ print(triangle.sideLength)
                  sideLength = newValue / 3.0
              }
          }
-  ---
+
          override func simpleDescription() -> String {
              return "An equilateral triangle with sides of length \(sideLength)."
          }
@@ -1471,7 +1471,7 @@ let aceRawValue = ace.rawValue
          case ace = 1
          case two, three, four, five, six, seven, eight, nine, ten
          case jack, queen, king
-  ---
+
          func simpleDescription() -> String {
              switch self {
                  case .ace:
@@ -1562,7 +1562,7 @@ let heartsDescription = hearts.simpleDescription()
   ```swifttest
   -> enum Suit {
          case spades, hearts, diamonds, clubs
-  ---
+
          func simpleDescription() -> String {
              switch self {
                  case .spades:
@@ -1679,10 +1679,10 @@ case let .failure(message):
          case result(String, String)
          case failure(String)
      }
-  ---
+
   -> let success = ServerResponse.result("6:00 am", "8:09 pm")
   -> let failure = ServerResponse.failure("Out of cheese.")
-  ---
+
   -> switch success {
          case let .result(sunrise, sunset):
              print("Sunrise is at \(sunrise) and sunset is at \(sunset).")
@@ -1910,7 +1910,6 @@ let userID = await server.connect()
   ```
 -->
 
-
 ## Protocols and Extensions
 
 Use `protocol` to declare a protocol.
@@ -1982,7 +1981,7 @@ let bDescription = b.simpleDescription
   -> let aDescription = a.simpleDescription
   >> print(aDescription)
   << A very simple class.  Now 100% adjusted.
-  ---
+
   -> struct SimpleStructure: ExampleProtocol {
           var simpleDescription: String = "A simple structure"
           mutating func adjust() {
@@ -2309,13 +2308,13 @@ print(fridgeIsOpen)
   ```swifttest
   -> var fridgeIsOpen = false
   -> let fridgeContent = ["milk", "eggs", "leftovers"]
-  ---
+
   -> func fridgeContains(_ food: String) -> Bool {
          fridgeIsOpen = true
          defer {
              fridgeIsOpen = false
          }
-  ---
+
          let result = fridgeContent.contains(food)
          return result
      }