Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update restrictions in the documentation. #5270

Merged
merged 1 commit into from
Sep 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/content/contributing/data-collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Understanding how you use Traefik is very important to us: it helps us improve t
For this very reason, the sendAnonymousUsage option is mandatory: we want you to take time to consider whether or not you wish to share anonymous data with us so we can benefit from your experience and use cases.

!!! warning
During the beta stage only, leaving this option unset will not prevent Traefik from running but will generate an error log indicating that it enables data collection by default.
Before the GA, leaving this option unset will not prevent Traefik from running but will generate an error log indicating that it enables data collection by default.

!!! example "Enabling Data Collection"

Expand Down
10 changes: 5 additions & 5 deletions docs/content/https/tls.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tls:
!!! important "File Provider Only"

In the above example, we've used the [file provider](../providers/file.md) to handle these definitions.
In its current beta version, it is the only available method to configure the certificates (as well as the options and the stores).
It is the only available method to configure the certificates (as well as the options and the stores).

## Certificates Stores

Expand All @@ -52,9 +52,9 @@ tls:
default: {}
```

!!! important "Beta restriction"
!!! important "Restriction"

During the beta version, any store definition other than the default one (named `default`) will be ignored,
Any store definition other than the default one (named `default`) will be ignored,
and there is thefore only one globally available TLS store.

In the `tls.certificates` section, a list of stores can then be specified to indicate where the certificates should be stored:
Expand Down Expand Up @@ -85,9 +85,9 @@ tls:
keyFile: /path/to/other-domain.key
```

!!! important "Beta restriction"
!!! important "Restriction"

During the beta version, the `stores` list will actually be ignored and automatically set to `["default"]`.
The `stores` list will actually be ignored and automatically set to `["default"]`.

### Default Certificate

Expand Down
2 changes: 1 addition & 1 deletion docs/content/operations/api.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# API

!!! important
In the beta version, you can't configure middlewares (basic authentication or white listing) anymore, but as security is important, this will change before the RC version.
In the RC version, you can't configure middlewares (basic authentication or white listing) anymore, but as security is important, this will change before the GA version.

Traefik exposes a number of information through an API handler, such as the configuration of all routers, services, middlewares, etc.

Expand Down