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.

Sign up for GitHub

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

Jump to bottom

Update to v2.0 readme links #4700

Merged
merged 8 commits into from
Apr 1, 2019
Merged

Update to v2.0 readme links #4700

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0070ae7
Updates to readme to reference correct docs. Added video version warning
karnthis Mar 31, 2019
fbe2fe2
Fixed typo
karnthis Mar 31, 2019
9460bac
Merge branch 'readme-tweaks' into v2.0
karnthis Mar 31, 2019
872c44c
Update README.md per PR#4700
dtomcej Mar 31, 2019
6089b69
Revert "Updates to readme to reference correct docs. Added video vers…
karnthis Apr 1, 2019
d1a0b39
Added line directing v2 users to v2 docs
karnthis Apr 1, 2019
84e0fe5
review: minor chnages.
ldez Apr 1, 2019
4d405a1
Merge remote-tracking branch 'upstream/v2.0' into v2.0
traefiker Apr 1, 2019
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
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ _(But if you'd rather configure some of your routes manually, Traefik supports t

## Quickstart

To get your hands on Traefik, you can use the [5-Minute Quickstart](http://docs.traefik.io/#the-traefik-quickstart-using-docker) in our documentation (you will need Docker).
To get your hands on Traefik, you can use the [5-Minute Quickstart](http://docs.traefik.io/v2.0/#the-traefik-quickstart-using-docker) in our documentation (you will need Docker).

## Web UI

Expand All @@ -95,7 +95,7 @@ You can access the simple HTML frontend of Traefik.

## Documentation

You can find the complete documentation at [https://docs.traefik.io](https://docs.traefik.io).
You can find the complete documentation at [https://docs.traefik.io/v2.0/](https://docs.traefik.io/v2.0/).
A collection of contributions around Traefik can be found at [https://awesome.traefik.io](https://awesome.traefik.io).

## Support
Expand Down Expand Up @@ -128,6 +128,8 @@ git clone https://github.com/containous/traefik

## Introductory Videos

:warning: Please be aware that these videos are for v1.X. The old configurations for Traefik v1.X are NOT compatible with the v2.X config as of now. If you're testing out v2, please ensure you are using a [v2 configuration](https://docs.traefik.io/v2.0/).
karnthis marked this conversation as resolved.
Show resolved Hide resolved

Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at GopherCon 2017.
You will learn Traefik basics in less than 10 minutes.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/getting-started/configuration-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This configuration can change and is seamlessly hot-reloaded, without any reques

## The Dynamic Configuration

Traefik gets its _dynamic configuration_ from [providers](../providers/overview.md): wether an orchestrator, a service registry, or a plain old configuration file. Since this configuration is specific to your infrastructure choices, we invite you to refer to the [dedicated section of this documentation](../providers/overview.md).
Traefik gets its _dynamic configuration_ from [providers](../providers/overview.md): whether an orchestrator, a service registry, or a plain old configuration file. Since this configuration is specific to your infrastructure choices, we invite you to refer to the [dedicated section of this documentation](../providers/overview.md).

!!! Note

Expand Down