diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go index 8013fa24..aa11ba08 100644 --- a/modules/caddyhttp/fileserver/caddyfile.go +++ b/modules/caddyhttp/fileserver/caddyfile.go @@ -102,12 +102,12 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) // // and is basically shorthand for: // -// matcher:try_files { +// @try_files { // file { // try_files // } // } -// rewrite match:try_files {http.matchers.file.relative}{http.request.uri.query_string} +// rewrite @try_files {http.matchers.file.relative}{http.request.uri.query_string} // // If any of the files in the list have a query string, the query string will // be ignored when checking for file existence, but will be augmented into diff --git a/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go b/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go index a9b02a91..f78a405d 100644 --- a/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go +++ b/modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go @@ -83,7 +83,7 @@ func (t *Transport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { // // is equivalent to: // -// matcher canonicalPath { +// @canonicalPath { // file { // try_files {path}/index.php // } @@ -91,14 +91,14 @@ func (t *Transport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { // path */ // } // } -// redir match:canonicalPath {path}/ 308 +// redir @canonicalPath {path}/ 308 // // try_files {path} {path}/index.php index.php // -// matcher phpFiles { +// @phpFiles { // path *.php // } -// reverse_proxy match:phpFiles localhost:7777 { +// reverse_proxy @phpFiles localhost:7777 { // transport fastcgi { // split .php // }