Merge pull request #621 from allevato/5.9-cherrypicks

Cherrypick everything since release/5.9 was cut.

Author: allevato

Documentation/Configuration.md

@@ -82,6 +82,9 @@ top-level keys and values:
 *  `spacesAroundRangeFormationOperators` _(boolean)_: Determines whether whitespace should be forced
    before and after the range formation operators `...` and `..<`.
 
+*  `multiElementCollectionTrailingCommas` _(boolean)_: Determines whether multi-element collection literals should have trailing commas.
+    Defaults to `true`.
+
 > TODO: Add support for enabling/disabling specific syntax transformations in
 > the pipeline.
 
@@ -103,6 +106,18 @@ An example `.swift-format` configuration file is shown below.
 }
 ```
 
+## Linter and Formatter Rules Configuration
+
+In the `rules` block of `.swift-format`, you can specify which rules to apply
+when linting and formatting your project. Read the
+[rules documentation](Documentation/RuleDocumentation.md) to see the list of all
+supported linter and formatter rules, and their overview.
+
+You can also run this command to see the list of rules in the default
+`swift-format` configuration:
+
+    $ swift-format dump-configuration
+
 ## API Configuration
 
 The `SwiftConfiguration` module contains a `Configuration` type that is

Documentation/Development.md

@@ -4,7 +4,7 @@
 
 Since Swift does not yet have a runtime reflection system, we use code
 generation to keep the linting/formatting pipeline up-to-date. If you add or
-remove any rules from the `SwiftFormatRules` module, or if you add or remove
+remove any rules from the `SwiftFormat` module, or if you add or remove
 any `visit` methods from an existing rule in that module, you must run the
 `generate-pipeline` tool update the pipeline and configuration sources.
 
@@ -14,17 +14,9 @@ The easiest way to do this is to run the following command in your terminal:
 swift run generate-pipeline
 ```
 
-If successful, this tool will update
-`Sources/SwiftFormatConfiguration/RuleRegistry+Generated.swift` and
-`Sources/SwiftFormat/Pipelines+Generated.swift`.
-
-Likewise, you should keep the Linux XCTest manifests updated if you add or
-remove any tests from `swift-format` by running the following command in your
-terminal:
-
-```shell
-swift test --generate-linuxmain
-```
+If successful, this tool will update the files `Pipelines+Generated.swift`,
+`RuleNameCache+Generated.swift`, and `RuleRegistry+Generated.swift` in
+the `Sources/SwiftFormat/Core` directory.
 
 ## Command Line Options for Debugging