diff --git a/docs/buildkitd.toml.md b/docs/buildkitd.toml.md index eee6c2a760d5..665d97f93605 100644 --- a/docs/buildkitd.toml.md +++ b/docs/buildkitd.toml.md @@ -7,9 +7,8 @@ of daemon configuration. The file path is `/etc/buildkit/buildkitd.toml` for rootful mode, `~/.config/buildkit/buildkitd.toml` for rootless mode. -The following is a complete `buildkitd.toml` configuration example, please -note some configuration is only good for edge cases, please take care of it -carefully. +The following is a complete `buildkitd.toml` configuration example. +Note that some configuration options are only useful in edge cases. ```toml # debug enables additional debug logging diff --git a/frontend/dockerfile/docs/reference.md b/frontend/dockerfile/docs/reference.md index 6d0447df750f..f7cb953c8938 100644 --- a/frontend/dockerfile/docs/reference.md +++ b/frontend/dockerfile/docs/reference.md @@ -1260,13 +1260,10 @@ doesn't support authentication. `ADD` obeys the following rules: - The `` path must be inside the build context; - you can't use `COPY ../something /something`, because the builder can only + you can't use `ADD ../something /something`, because the builder can only access files from the context, and `../something` specifies a parent file or directory of the build context root. -- If `` is a directory, the entire contents of the directory are copied, - including filesystem metadata. - - If `` is a URL and `` does end with a trailing slash, then the filename is inferred from the URL and the file is downloaded to `/`. For instance, `ADD http://example.com/foobar /` would @@ -1308,8 +1305,8 @@ doesn't support authentication. use of a wildcard, then `` must be a directory, and it must end with a slash `/`. -- If `` doesn't end with a trailing slash, it will be considered a - regular file and the contents of `` will be written at ``. +- If `` is a file, and `` doesn't end with a trailing slash, + the contents of `` will be written as filename ``. - If `` doesn't exist, it's created, along with all missing directories in its path. @@ -1487,8 +1484,8 @@ attempted to be used instead. use of a wildcard, then `` must be a directory, and it must end with a slash `/`. -- If `` doesn't end with a trailing slash, it will be considered a - regular file and the contents of `` will be written at ``. +- If `` is a file, and `` doesn't end with a trailing slash, + the contents of `` will be written as filename ``. - If `` doesn't exist, it's created, along with all missing directories in its path.