diff --git a/docs/configuration.md b/docs/configuration.md index 0388d84c2..fa4d625af 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -266,74 +266,63 @@ The `log` subsection configures the behavior of the logging system. The logging system outputs everything to stdout. You can adjust the granularity and format with this configuration section. - log: - level: debug - formatter: text - fields: - service: registry - environment: staging +``` +log: + level: debug + formatter: text + fields: + service: registry + environment: staging +``` - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
ParameterRequiredDescription
- level - - no - - Sets the sensitivity of logging output. Permitted values are - error, warn, info and - debug. The default is info. -
- formatter - - no - - This selects the format of logging output. The format primarily affects how keyed - attributes for a log line are encoded. Options are text, json or - logstash. The default is text. -
- fields - - no - - A map of field names to values. These are added to every log line for - the context. This is useful for identifying log messages source after - being mixed in other systems. -
ParameterRequiredDescription
levelnoSets the sensitivity of logging output. Permitted values are +error, warn, info and +debug. The default is info. +
formatternoThis selects the format of logging output. The format primarily affects how keyed attributes for a log line are encoded. Options are text, json or +logstash. The default is text. +
+fields +noA map of field names to values. These are added to every log line for the context. This is useful for identifying log messages source after being mixed in other systems. +
## hooks - hooks: - - type: mail - levels: - - panic - options: - smtp: - addr: smtp.sendhost.com:25 - username: sendername - password: password - insecure: true - from: name@sendhost.com - to: - - name@receivehost.com +``` +hooks: + - type: mail + levels: + - panic + options: + smtp: + addr: smtp.sendhost.com:25 + username: sendername + password: password + insecure: true + from: name@sendhost.com + to: + - name@receivehost.com +``` The `hooks` subsection configures the logging hooks' behavior. This subsection includes a sequence handler which you can use for sending mail, for example. diff --git a/docs/spec/manifest-v2-2.md b/docs/spec/manifest-v2-2.md index 469e7017d..eaf9295c1 100644 --- a/docs/spec/manifest-v2-2.md +++ b/docs/spec/manifest-v2-2.md @@ -119,6 +119,7 @@ image manifest based on the Content-Type returned in the HTTP response. ## Example Manifest List *Example showing a simple manifest list pointing to image manifests for two platforms:* + ```json { "schemaVersion": 2, @@ -227,6 +228,7 @@ image. It's the direct replacement for the schema-1 manifest. ## Example Image Manifest *Example showing an image manifest:* + ```json { "schemaVersion": 2, diff --git a/docs/storage-drivers/s3.md b/docs/storage-drivers/s3.md index 7eef2ee0f..cf7294902 100644 --- a/docs/storage-drivers/s3.md +++ b/docs/storage-drivers/s3.md @@ -246,6 +246,7 @@ The CloudFront distribution must be created such that the `Origin Path` is set t Here the `middleware` option is used. It is still important to keep the `storage` option as CloudFront will only handle `pull` actions; `push` actions are still directly written to S3. The following example shows what you will need at minimum: + ``` ... storage: