Update TSPL to 6.1

Author: SamYin Kim

contributing.md

@@ -15,4 +15,108 @@
 
 如果修改过程中我的库有了更新，请重复6、7、8步。
 
-修改之后，首先push到你的库，然后登录GitHub，在你的库的首页可以看到一个 `pull request` 按钮，点击它，填写一些说明信息，然后提交即可。
+修改之后，首先push到你的库，然后登录GitHub，在你的库的首页可以看到一个 `pull request` 按钮，点击它，填写一些说明信息，然后提交即可。
+
+# Contributing to *The Swift Programming Language* book
+
+By submitting a pull request,
+you represent that you have the right to license your contribution
+to Apple and the community,
+and agree by submitting the patch
+that your contributions are licensed under
+the [Swift license](https://swift.org/LICENSE.txt).
+
+For small changes,
+like typo fixes and revisions within a few paragraphs,
+the discussion of those changes is usually small enough
+to be part of the pull request.
+For large changes,
+like new chapters and sections,
+start a thread in the [Swift forums][forum]
+to discuss your approach and identify possible issues
+before you invest a lot of time in writing.
+In general,
+the amount of discussion around a change before making a pull request
+corresponds to the size of that change.
+
+Content in this book follows [Apple Style Guide][asg]
+and [this book’s style guide][tspl-style].
+
+[asg]: https://help.apple.com/applestyleguide/
+[forum]: https://forums.swift.org/c/swift-documentation/92
+[tspl-style]: /Style.md
+
+## Working on a feature branch
+
+If this is your first contribution,
+start by making a fork of the Git repository.
+
+In your fork,
+make a new branch starting at `main`
+with a brief, descriptive name.
+Branch names are ephemeral:
+When a pull request is merged,
+the merge commit doesn’t include name of your feature branch.
+
+If you need to incorporate changes from `main` or resolve a merge conflict,
+merge `main` into your feature branch.
+Before creating a pull request,
+you can instead rebase your feature branch onto `main` if you prefer,
+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 —
+both the people working on the project now
+who are reviewing your changes,
+and people who join the project in the future
+who will need to understand what you changed and why.
+
+Every commit starts with a one-sentence summary.
+The summary usually fits in 50 characters,
+but it's ok to exceed that amount occasionally
+if rewriting for brevity would make it too hard to read.
+If it's hard to write a good summary,
+try breaking your changes into multiple smaller commits.
+
+If you can't explain the commit entirely in its summary,
+skip one line and add additional information.
+This additional information includes information like
+the reasons for the change,
+the approach you took when making it,
+alternatives you considered,
+and a summary of what you changed.
+Hard wrap these lines at 72 characters
+and leave a blank line between paragraphs.
+The body of a commit is plain text,
+not markdown like the content of the book.
+
+Following these formatting conventions in your commit
+makes it easier to read
+in places like the output from `git` and notification emails.
+Most text editors can help you write a commit message
+by marking lines that are too long
+and hard wrapping text automatically.
+
+## Submitting a pull request
+
+Use the following steps when creating a new pull request:
+
+1. Test that your changes build locally by running `docc preview TSPL.docc`.
+2. Create a pull request in this repository.
+3. Write a brief message in the pull request to introduce your work in context.
+
+Within a few days,
+someone will assign reviewers and start a build in CI.
+
+During the review of the pull request,
+add new commits on your branch to incorporate feedback,
+but don’t rebase or force push.
+Rewriting the branch's history
+makes it hard for reviewers to see
+what changed since the last time they reviewed your changes.
+If there are merge conflicts,
+merge `main` into your branch or use the GitHub web UI
+to resolve the conflicts when accepting the pull request.
+
+After a pull request is merged, delete the feature branch.

swift-6.docc/GuidedTour/GuidedTour.md

@@ -1,9 +1,3 @@
-<!--
-要翻译的文件：https://github.com/SwiftGGTeam/the-swift-programming-language-in-chinese/blob/swift-6-beta-translation/swift-6.docc/GuidedTour/GuidedTour.md
-Swift 文档源文件地址：https://docs.swift.org/swift-book/documentation/the-swift-programming-language/guidedtour
-翻译估计用时：⭐️⭐️⭐️⭐️⭐️
--->
-
 # A Swift Tour
 
 Explore the features and syntax of Swift.
@@ -261,7 +255,7 @@ occupations["Jayne"] = "Public Relations"
   ```swifttest
   -> var fruits = ["strawberries", "limes", "tangerines"]
   -> fruits[1] = "grapes"
-  ---
+
   -> var occupations = [
          "Malcolm": "Captain",
          "Kaylee": "Mechanic",
@@ -323,7 +317,7 @@ let emptyDictionary: [String: Float] = [:]
   ```swifttest
   -> let emptyArray: [String] = []
   -> let emptyDictionary: [String: Float] = [:]
-  ---
+
   -> let anotherEmptyArray = [String]()
   -> let emptyDictionary = [String: Float]()
   ```
@@ -438,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 {
@@ -664,7 +658,7 @@ print(m)
      }
   -> print(n)
   <- 128
-  ---
+
   -> var m = 2
   -> repeat {
          m *= 2
@@ -1138,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."
          }
@@ -1208,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)."
          }
@@ -1282,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
@@ -1297,7 +1291,7 @@ print(triangle.sideLength)
                  sideLength = newValue / 3.0
              }
          }
-  ---
+
          override func simpleDescription() -> String {
              return "An equilateral triangle with sides of length \(sideLength)."
          }
@@ -1477,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:
@@ -1568,7 +1562,7 @@ let heartsDescription = hearts.simpleDescription()
   ```swifttest
   -> enum Suit {
          case spades, hearts, diamonds, clubs
-  ---
+
          func simpleDescription() -> String {
              switch self {
                  case .spades:
@@ -1685,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).")
@@ -1916,7 +1910,6 @@ let userID = await server.connect()
   ```
 -->
 
-
 ## Protocols and Extensions
 
 Use `protocol` to declare a protocol.
@@ -1988,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() {
@@ -2315,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
      }

swift-6.docc/Info.plist

@@ -2,13 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDisplayName</key>
-	<string>The Swift Programming Language（中文版）</string>
-	<key>CFBundleIdentifier</key>
-	<string>team.swiftgg.tspl</string>
-	<key>CDDefaultCodeListingLanguage</key>
-	<string>swift</string>
-	<key>CDDefaultModuleKind</key>
-	<string></string>
+    <key>CFBundleDisplayName</key>
+    <string>The Swift Programming Language</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.swift.tspl</string>
+    <key>CDDefaultCodeListingLanguage</key>
+    <string>swift</string>
+    <key>CDDefaultModuleKind</key>
+    <string></string>
 </dict>
 </plist>