Minor updates for RC1

src/docs/markdown/caddyfile/directives/tls.md

@@ -30,31 +30,31 @@ tls [internal|<email>] | [<cert_file> <key_file>] {
 - **&lt;email&gt;** is the email address to use for the ACME account managing the site's certificates.
 - **&lt;cert_file&gt;** and **&lt;key_file&gt;** are the paths to the certificate and private key PEM files. Specifying just one is invalid; specifying both will disable automatic HTTPS.
 - **protocols** specifies the minimum and maximum protocol versions. Default min: `tls1.2`. Default max: `tls1.3`
-- **ciphers** specifies the list of cipher suites in descending preference order. Note that cipher suites are not customizable with TLS 1.3. Supported values are:
+- **ciphers** specifies the list of cipher suite names in descending preference order. Note that cipher suites are not customizable with TLS 1.3. The supported names are (in no particular order here):
-	- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+	- TLS_RSA_WITH_3DES_EDE_CBC_SHA
-	- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+	- TLS_RSA_WITH_AES_128_CBC_SHA
-	- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+	- TLS_RSA_WITH_AES_256_CBC_SHA
-	- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-	- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-	- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-	- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
-	- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
-	- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
-	- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
-	- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
-	- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
 	- TLS_RSA_WITH_AES_128_GCM_SHA256
 	- TLS_RSA_WITH_AES_256_GCM_SHA384
-	- TLS_RSA_WITH_AES_256_CBC_SHA
+	- TLS_AES_128_GCM_SHA256
-	- TLS_RSA_WITH_AES_128_CBC_SHA256
+	- TLS_AES_256_GCM_SHA384
-	- TLS_RSA_WITH_AES_128_CBC_SHA
+	- TLS_CHACHA20_POLY1305_SHA256
+	- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+	- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
 	- TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
-	- TLS_RSA_WITH_3DES_EDE_CBC_SHA
+	- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+	- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+	- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+	- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+	- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+	- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+	- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+	- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
 - **curves** specifies the list of EC curves to support. Supported values are:
 	- x25519
-	- p256
+	- secp256r1
-	- p384
+	- secp384r1
-	- p521
+	- secp521r1
 - **alpn** is the list of values to advertise in the ALPN extension of the TLS handshake.
 - **load** specifies a list of folders from which to load PEM files that are certificate+key bundles.
 - **ca** changes the ACME CA endpoint. This is most often used to use [Let's Encrypt's staging endpoint](https://letsencrypt.org/docs/staging-environment/) or an internal ACME server. (To change this value for the whole Caddyfile, use the `acme_ca` [global option](/docs/caddyfile/options) instead.)

src/docs/markdown/v2-upgrade.md

@@ -306,7 +306,7 @@ If you want to write a plugin for Caddy 2, [learn how to write a Caddy module](/
 
 ### Building Caddy 2 with plugins
 
-Caddy 2 does not (yet) have a public build server and interactive download page like v1 did. We're working on it. In the meantime, our [builder tool](https://github.com/caddyserver/builder) may be helpful. It simply automates the instructions in Caddy's [main.go](https://github.com/caddyserver/caddy/blob/v2/cmd/caddy/main.go) file.
+Caddy 2 does not (yet) have a public build server and interactive download page like v1 did. We're working on it. In the meantime, our [builder tool](https://github.com/caddyserver/xcaddy) may be helpful. It simply automates the instructions in Caddy's [main.go](https://github.com/caddyserver/caddy/blob/v2/cmd/caddy/main.go) file.
 
 We'll also be working on the new website some more so that plugins can be registered and indexed and easily found.
 

src/includes/v1-banner.html

@@ -1 +1 @@
-<a href="/v1/" id="v1-banner">This page is about Caddy 2, which is currently in beta. Click here for the old Caddy 1 site. Thank you for your patience as we transition!</a>
+<a href="/v1/" id="v1-banner"><b>This page is about Caddy 2.</b> If you still need v1 docs for a limited time, click here.</b></a>

src/index.html

@@ -24,7 +24,7 @@
 				</h2>
 
 				<div class="download-container">
-					<a href="https://github.com/caddyserver/caddy/releases" class="big blue button">Download 2.0 Beta</a>
+					<a href="https://github.com/caddyserver/caddy/releases" class="big blue button">Download 2.0 RC</a>
 					<br>
 					then <a href="/docs/getting-started">learn how to get started</a>
 					<br><br>