Track 'main' to resolve merge conflict.

Author: amartini51

.git-blame-ignore-revs

@@ -16,3 +16,6 @@
 
 # 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

@@ -42,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

@@ -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.
@@ -122,6 +127,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”.