Fix leaf typo, update version numbers, add warning about Command Line…

…s Tools, add tip about vapor github templates
vapor · May 26, 2023 · becd63f · becd63f
1 parent 772f816
commit becd63f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/docs/getting-started/hello-world.md b/docs/getting-started/hello-world.md
@@ -18,6 +18,9 @@ vapor new hello -n
 !!! tip
 	The `-n` flag gives you a bare bones template by automatically answering no to all questions.
 
+!!! tip
+    You can also get the latest template from GitHub without Vapor Toolbox by cloning the [template respository](https://github.com/vapor/template-bare)
+
 !!! tip
 	Vapor and the template now uses `async`/`await` by default.
 	If you cannot update to macOS 12 and/or need to continue to use `EventLoopFuture`s, 
@@ -28,7 +31,7 @@ Once the command finishes, change into the newly created folder:
 
 ```sh
 cd hello
-``` 
+```
 
 ## Build & Run
 
@@ -49,6 +52,14 @@ You should see the Console pop up at the bottom of the Xcode window.
 ```sh
 [ INFO ] Server starting on http://127.0.0.1:8080
 ```
+!!! warning
+	If you get an error along these lines:
+	```sh
+	error: terminated(72): xcrun --sdk macosx --find xctest output:
+	# or
+	Error: Could not generate Xcode project: error: terminated(72): xcrun --sdk macosx --find xctest output:
+	```
+	You need to run `sudo xcode-select -s /Applications/Xcode.app` to use the correct version of Xcode CLI tools.
 
 ### Linux
 

diff --git a/docs/install/macos.md b/docs/install/macos.md
@@ -1,10 +1,10 @@
 # Install on macOS
 
-To use Vapor on macOS, you will need Swift 5.2 or greater. Swift and all of its dependencies come bundled with Xcode.
+To use Vapor on macOS, you will need Swift 5.6 or greater. Swift and all of its dependencies come bundled with Xcode.
 
 ## Install Xcode
 
-Install [Xcode 11.4 or greater](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) from the Mac App Store.
+Install [Xcode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) from the Mac App Store.
 
 ![Xcode in Mac App Store](../images/xcode-mac-app-store.png)
 
@@ -19,11 +19,11 @@ swift --version
 You should see Swift's version information printed.
 
 ```sh
-Apple Swift version 5.2 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
-Target: x86_64-apple-darwin19.0.0
+swift-driver version: 1.75.2 Apple Swift version 5.8 (swiftlang-5.8.0.124.2 clang-1403.0.22.11.100)
+Target: x86_64-apple-macosx13.0
 ```
 
-Vapor 4 requires Swift 5.2 or greater.
+Vapor 4 requires Swift 5.6 or greater.
 
 ## Install Toolbox
 

diff --git a/docs/leaf/overview.md b/docs/leaf/overview.md
@@ -17,7 +17,7 @@ Leaf tags are made up of four elements:
 - Token `#`: This signals the leaf parser to begin looking for a tag.
 - Name `count`: that identifies the tag.
 - Parameter List `(users)`: May accept zero or more arguments.
-- Body: An optional body can be supplied to some tags using a semicolon and a closing tag
+- Body: An optional body can be supplied to some tags using a colon and a closing tag
 
 There can be many different usages of these four elements depending on the tag's implementation. Let's look at a few examples of how Leaf's built-in tags might be used: