From b95745040b9d3b3110e647c14015fc4c339653a8 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Tue, 24 Nov 2020 17:28:31 -0500 Subject: [PATCH] docs: Update adapters list, directive order note in caddyfile concepts (#97) --- src/docs/markdown/caddyfile/concepts.md | 2 ++ src/docs/markdown/config-adapters.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/docs/markdown/caddyfile/concepts.md b/src/docs/markdown/caddyfile/concepts.md index ef125f2..971dc2d 100644 --- a/src/docs/markdown/caddyfile/concepts.md +++ b/src/docs/markdown/caddyfile/concepts.md @@ -102,6 +102,8 @@ In these examples, [`file_server`](/docs/caddyfile/directives/file_server) and [ In the second example, `localhost:9000` is an **argument** because it appears on the same line after the directive. +Note that when the Caddyfile is adapted, directives are sorted according to a specific default [directive order](/docs/caddyfile/directives#directive-order). + **Subdirectives** can appear in directive blocks: ```caddy diff --git a/src/docs/markdown/config-adapters.md b/src/docs/markdown/config-adapters.md index f44d8ff..8f189ae 100644 --- a/src/docs/markdown/config-adapters.md +++ b/src/docs/markdown/config-adapters.md @@ -16,9 +16,10 @@ The following config adapters are currently available (some are third-party proj - [**nginx**](https://github.com/caddyserver/nginx-adapter) - [**jsonc**](https://github.com/caddyserver/jsonc-adapter) - [**json5**](https://github.com/caddyserver/json5-adapter) -- [**yaml**](https://github.com/iamd3vil/caddy_yaml_adapter) +- [**yaml**](https://github.com/abiosoft/caddy-yaml) - [**cue**](https://github.com/caddyserver/cue-adapter) - [**toml**](https://github.com/awoodbeck/caddy-toml-adapter) +- [**hcl**](https://github.com/francislavoie/caddy-hcl) (This list is the temporary home for known adapters until our new website is finished.)