Track 'main' to resolve merge conflict.

Trivial conflict in Style.md by keeping both additions.

Author: amartini51

.git-blame-ignore-revs

@@ -0,0 +1,21 @@
+# This file is a list of commits that made uninteresting formatting
+# 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,
+#
+#   git blame --ignore-revs-file .git-blame-ignore-revs <somefile>
+#
+# To use this file for all blame operations, run the following command:
+#
+#   git config --local blame.ignoreRevsFile .git-blame-ignore-revs
+#
+# For more information, see the git-blame(1) man page's discussion of
+# the --ignore-revs-file option, and the git-config(1) man page's
+# discussion of the blame.ignoreRevsFile option.
+
+# Convert RST to markdown.
+96f0925407c6bd9eadd9d58d253bad3e1ef7a9f2
+
+# Convert the formal grammar to markdown.
+4039ee0ef4e69d2cf6460861f9444a499503db16

.git-order-file

@@ -0,0 +1,65 @@
+# This file lists the chapters of TSPL, in the order they appear in the
+# book.  When reviewing changes, the diff can be easier to read when it
+# appears in this order.
+#
+# To use this file for single command, run a command like the following:
+#
+#     git log -O .git-order-file
+#     git diff -O .git-order-file
+#
+# To use it for all diffs, run the following command:
+#
+#     git config --local diff.orderFile .git-order-file
+#
+# For more information, see the git-log(1) and git-diff(1) man pages'
+# discussions of the -O option, and the git-config(1) man page's
+# discussion of diff.orderFile option.
+
+TSPL.docc/GuidedTour/AboutSwift.md
+TSPL.docc/GuidedTour/Compatibility.md
+TSPL.docc/GuidedTour/GuidedTour.md
+
+TSPL.docc/LanguageGuide/TheBasics.md
+TSPL.docc/LanguageGuide/BasicOperators.md
+TSPL.docc/LanguageGuide/StringsAndCharacters.md
+TSPL.docc/LanguageGuide/CollectionTypes.md
+TSPL.docc/LanguageGuide/ControlFlow.md
+TSPL.docc/LanguageGuide/Functions.md
+TSPL.docc/LanguageGuide/Closures.md
+TSPL.docc/LanguageGuide/Enumerations.md
+TSPL.docc/LanguageGuide/ClassesAndStructures.md
+TSPL.docc/LanguageGuide/Properties.md
+TSPL.docc/LanguageGuide/Methods.md
+TSPL.docc/LanguageGuide/Subscripts.md
+TSPL.docc/LanguageGuide/Inheritance.md
+TSPL.docc/LanguageGuide/Initialization.md
+TSPL.docc/LanguageGuide/Deinitialization.md
+TSPL.docc/LanguageGuide/OptionalChaining.md
+TSPL.docc/LanguageGuide/ErrorHandling.md
+TSPL.docc/LanguageGuide/Concurrency.md
+TSPL.docc/LanguageGuide/Macros.md
+TSPL.docc/LanguageGuide/TypeCasting.md
+TSPL.docc/LanguageGuide/NestedTypes.md
+TSPL.docc/LanguageGuide/Extensions.md
+TSPL.docc/LanguageGuide/Protocols.md
+TSPL.docc/LanguageGuide/Generics.md
+TSPL.docc/LanguageGuide/OpaqueTypes.md
+TSPL.docc/LanguageGuide/AutomaticReferenceCounting.md
+TSPL.docc/LanguageGuide/MemorySafety.md
+TSPL.docc/LanguageGuide/AccessControl.md
+TSPL.docc/LanguageGuide/AdvancedOperators.md
+
+TSPL.docc/ReferenceManual/AboutTheLanguageReference.md
+TSPL.docc/ReferenceManual/LexicalStructure.md
+TSPL.docc/ReferenceManual/Types.md
+TSPL.docc/ReferenceManual/Expressions.md
+TSPL.docc/ReferenceManual/Statements.md
+TSPL.docc/ReferenceManual/Declarations.md
+TSPL.docc/ReferenceManual/Attributes.md
+TSPL.docc/ReferenceManual/Patterns.md
+TSPL.docc/ReferenceManual/GenericParametersAndArguments.md
+TSPL.docc/ReferenceManual/SummaryOfTheGrammar.md
+
+TSPL.docc/RevisionHistory/RevisionHistory.md
+
+# Files that don't match a pattern listed above appear at the end.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,19 +2,4 @@
 Replace this paragraph with your rationale and a brief summary of what changed.
 
 <!-- If this pull request fixes a bug tracked in GitHub issues, provide the link. -->
-Fixes https://github.com/apple/swift-book/issues/####
-
-
-<!--
-Before merging this pull request, you must run the continuous integration (CI) tests.
-When you're ready to start a CI build,
-write the following in a comment on the pull request:
-
-    @swift-ci Please test.
-
-For more information about triggering CI builds via @swift-ci, see:
-
-    https://github.com/apple/swift/blob/main/docs/ContinuousIntegration.md#swift-ci
-
-Thank you for your contribution!
--->
+Fixes: https://github.com/apple/swift-book/issues/####

README.md

@@ -1,13 +1,9 @@
 # The Swift Programming Language
 
-This repository contains a version of *The Swift Programming Language*
-that you can build using Swift-DocC.
-
-The version of *The Swift Programming Language* published on [docs.swift.org](https://docs.swift.org/swift-book/)
-is currently built using a legacy toolchain,
-not from this repository or its content.
-The goal is to replace that version with a version built from this repository,
-working with the community to extend Swift-DocC where needed.
+This repository contains the source for *The Swift Programming Language*
+(sometimes abbreviated as TSPL),
+which is published on [docs.swift.org][published]
+and built using [Swift-DocC][docc].
 
 ## Contributing
 
@@ -34,8 +30,10 @@ For more information, see [Contributing to The Swift Programming Language][contr
 [bugs]: https://github.com/apple/swift-book/issues
 [conduct]: https://www.swift.org/code-of-conduct
 [contributing]: /CONTRIBUTING.md
-[forum]: https://forums.swift.org/c/development/swift-docc/80
+[forum]: https://forums.swift.org/c/swift-documentation/92
 [tspl-style]: /Style.md
+[published]: https://docs.swift.org/swift-book/documentation/the-swift-programming-language/
+[docc]: https://github.com/apple/swift-docc
 
 ## Building
 
@@ -44,3 +42,15 @@ in this repository's root directory.
 
 After running DocC, open the link that `docc` outputs
 to display a local preview in your browser.
+
+> Note:
+>
+> If you installed DocC by downloading a toolchain from Swift.org,
+> `docc` is located in `usr/bin/`,
+> relative to the installation path of the toolchain.
+> Make sure your shell's `PATH` environment variable
+> includes that directory.
+>
+> If you installed DocC by downloading Xcode,
+> run `xcrun docc preview TSPL.docc` instead.
+

Style.md

@@ -26,7 +26,7 @@ just surface level syntax for concepts they already know from other languages.
 commonly referred to as “the guide”,
 leads you through the Swift language in a pedagogically useful, linear order.
 It doesn't promise to show you every feature of
-the language or the standard library,
+the language or the Swift standard library,
 and it hand-waves over the exact details
 of some of the more complicated underlying bits.
 The guide leans on the reference to resolve the nitty-gritty detail questions
@@ -44,12 +44,12 @@ are already discussed in previous chapters.
 that the early chapters of the guide need
 — many topics from “The Basics” are covered again later in the guide in more detail.
 
-The guide includes types from the standard library for two reasons:
+The guide includes types from the Swift standard library for two reasons:
 they’re needed by an explanation of a language concept,
 or they’re so common that readers wouldn’t
 be able to build anything useful without them.
 The latter reason includes a judgement call.
-When new types are introduced in the standard library,
+When new types are introduced in the Swift standard library,
 we usually need to discuss whether & where to add them to TSPL.
 
 The guide can be broken down into three major chunks:
@@ -98,6 +98,11 @@ which means it’s not always suitable for generating a parser for Swift code.
 
 # Terms and Rules
 
+## attribute names
+
+In the guide, write `@` before attribute names;
+in the reference, omit it.
+
 ## back deploy
 
 Spelled as two words, not closed up or hyphenated.
@@ -121,6 +126,11 @@ Use wording and markup like the following:
 > using this attribute will be an error.
 ```
 
+## definite initialization
+
+Not “definitive initialization”.
+Don‘t abbreviate as DI.
+
 ## function
 
 In the reference,
@@ -137,6 +147,13 @@ you should generally try to avoid them.
 Deeply nested headings often indicate
 that there’s a better way to organize the content.
 
+## macro names
+
+In the guide,
+write `@` before the name when referring to attached macros
+and `#` before the name when referring to freestanding macros.
+In the reference, omit it.
+
 ## memberwise initializer
 
 Not hyphenated as “member-wise”.
@@ -167,13 +184,17 @@ For example:
 > custom classes and structures don’t have an implementation of
 > the *equal to* operator (`==`) or *not equal to* operator (`!=`).
 > You usually implement the `==` operator,
-> and use the standard library’s default implementation of the `!=` operator
+> and use the Swift standard library’s default implementation of the `!=` operator
 > that negates the result of the `==` operator.
 > There are two ways to implement the `==` operator.
 
 If the operator doesn’t have an established English name,
 make sure you get tech review on the name you invent for it.
 
+## optional binding
+
+Omit the article: "use optional binding", not "use an optional binding".
+
 ## passive voice
 
 In general,
@@ -241,11 +262,22 @@ By design, actors specifically *avoid* having shared mutable state —
 their mutable state is private,
 and accessible only through the actor's (async) methods.
 
+## standard library
+
+Spell out in full as “the Swift standard library“ on the first use.
+If context already makes it clear
+and repeating the full name becomes wordy,
+you can shorted it to just “the standard library”
+in continued discussion.
+(We currently don‘t have any examples of doing that.)
+
+Not “stdlib“ or “the stdlib“.
+
 ## spawn, start
 
 Use “add” instead to refer to creating a new task,
 to match the API symbol name.
-(These names were used in an earlier version the SE proposal.)
+(These names were used in an earlier version of the SE proposal.)
 
 ## suspension point