diff --git a/.travis.yml b/.travis.yml index c7a037c22..3fa580e11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: - VERSION: $TRAVIS_TAG - CODENAME: maroilles - N_MAKE_JOBS: 2 + - DOCS_VERIFY_SKIP: true script: - echo "Skipping tests... (Tests are executed on SemaphoreCI)" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 278ef1c76..484072b57 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -158,7 +158,7 @@ Integration tests must be run from the `integration/` directory and require the ## Documentation -The [documentation site](https://docs.traefik.io/) is built with [mkdocs](https://mkdocs.org/) +The [documentation site](https://docs.traefik.io/v1.7/) is built with [mkdocs](https://mkdocs.org/) ### Building Documentation diff --git a/README.md b/README.md index 3e815d619..8d862878d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

[![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik) -[![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io) +[![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io/v1.7) [![Go Report Card](https://goreportcard.com/badge/containous/traefik)](http://goreportcard.com/report/containous/traefik) [![](https://images.microbadger.com/badges/image/traefik.svg)](https://microbadger.com/images/traefik) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/containous/traefik/blob/master/LICENSE.md) @@ -70,22 +70,22 @@ _(But if you'd rather configure some of your routes manually, Traefik supports t ## Supported Backends -- [Docker](https://docs.traefik.io/configuration/backends/docker) / [Swarm mode](https://docs.traefik.io/configuration/backends/docker#docker-swarm-mode) -- [Kubernetes](https://docs.traefik.io/configuration/backends/kubernetes) -- [Mesos](https://docs.traefik.io/configuration/backends/mesos) / [Marathon](https://docs.traefik.io/configuration/backends/marathon) -- [Rancher](https://docs.traefik.io/configuration/backends/rancher) (API, Metadata) -- [Azure Service Fabric](https://docs.traefik.io/configuration/backends/servicefabric) -- [Consul Catalog](https://docs.traefik.io/configuration/backends/consulcatalog) -- [Consul](https://docs.traefik.io/configuration/backends/consul) / [Etcd](https://docs.traefik.io/configuration/backends/etcd) / [Zookeeper](https://docs.traefik.io/configuration/backends/zookeeper) / [BoltDB](https://docs.traefik.io/configuration/backends/boltdb) -- [Eureka](https://docs.traefik.io/configuration/backends/eureka) -- [Amazon ECS](https://docs.traefik.io/configuration/backends/ecs) -- [Amazon DynamoDB](https://docs.traefik.io/configuration/backends/dynamodb) -- [File](https://docs.traefik.io/configuration/backends/file) -- [Rest](https://docs.traefik.io/configuration/backends/rest) +- [Docker](https://docs.traefik.io/v1.7/configuration/backends/docker) / [Swarm mode](https://docs.traefik.io/v1.7/configuration/backends/docker#docker-swarm-mode) +- [Kubernetes](https://docs.traefik.io/v1.7/configuration/backends/kubernetes) +- [Mesos](https://docs.traefik.io/v1.7/configuration/backends/mesos) / [Marathon](https://docs.traefik.io/v1.7/configuration/backends/marathon) +- [Rancher](https://docs.traefik.io/v1.7/configuration/backends/rancher) (API, Metadata) +- [Azure Service Fabric](https://docs.traefik.io/v1.7/configuration/backends/servicefabric) +- [Consul Catalog](https://docs.traefik.io/v1.7/configuration/backends/consulcatalog) +- [Consul](https://docs.traefik.io/v1.7/configuration/backends/consul) / [Etcd](https://docs.traefik.io/v1.7/configuration/backends/etcd) / [Zookeeper](https://docs.traefik.io/v1.7/configuration/backends/zookeeper) / [BoltDB](https://docs.traefik.io/v1.7/configuration/backends/boltdb) +- [Eureka](https://docs.traefik.io/v1.7/configuration/backends/eureka) +- [Amazon ECS](https://docs.traefik.io/v1.7/configuration/backends/ecs) +- [Amazon DynamoDB](https://docs.traefik.io/v1.7/configuration/backends/dynamodb) +- [File](https://docs.traefik.io/v1.7/configuration/backends/file) +- [Rest](https://docs.traefik.io/v1.7/configuration/backends/rest) ## 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/v1.7/#the-traefik-quickstart-using-docker) in our documentation (you will need Docker). Alternatively, if you don't want to install anything on your computer, you can try Traefik online in this great [Katacoda tutorial](https://www.katacoda.com/courses/traefik/deploy-load-balancer) that shows how to load balance requests between multiple Docker containers. @@ -100,7 +100,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/v1.7](https://docs.traefik.io/v1.7). A collection of contributions around Traefik can be found at [https://awesome.traefik.io](https://awesome.traefik.io). ## Support diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index 92684be77..23dca9fb0 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -352,14 +352,14 @@ func stats(globalConfiguration *configuration.GlobalConfiguration) { Stats collection is enabled. Many thanks for contributing to Traefik's improvement by allowing us to receive anonymous information from your configuration. Help us improve Traefik by leaving this feature on :) -More details on: https://docs.traefik.io/basics/#collected-data +More details on: https://docs.traefik.io/v1.7/basics/#collected-data `) collect(globalConfiguration) } else { log.Info(` Stats collection is disabled. Help us improve Traefik by turning this feature on :) -More details on: https://docs.traefik.io/basics/#collected-data +More details on: https://docs.traefik.io/v1.7/basics/#collected-data `) } } diff --git a/contrib/systemd/traefik.service b/contrib/systemd/traefik.service index 5b1d04975..3cf42efb6 100644 --- a/contrib/systemd/traefik.service +++ b/contrib/systemd/traefik.service @@ -1,6 +1,6 @@ [Unit] Description=Traefik -Documentation=https://docs.traefik.io +Documentation=https://docs.traefik.io/v1.7 #After=network-online.target #AssertFileIsExecutable=/usr/bin/traefik #AssertPathExists=/etc/traefik/traefik.toml diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md index 82dc1321e..46dc7d596 100644 --- a/examples/quickstart/README.md +++ b/examples/quickstart/README.md @@ -101,7 +101,7 @@ IP: 172.27.0.4 ### 4 — Enjoy Traefik's Magic -Now that you have a basic understanding of how Traefik can automatically create the routes to your services and load balance them, it might be time to dive into [the documentation](https://docs.traefik.io/) and let Traefik work for you! -Whatever your infrastructure is, there is probably [an available Traefik backend](https://docs.traefik.io/#supported-backends) that will do the job. +Now that you have a basic understanding of how Traefik can automatically create the routes to your services and load balance them, it might be time to dive into [the documentation](https://docs.traefik.io/v1.7/) and let Traefik work for you! +Whatever your infrastructure is, there is probably [an available Traefik backend](https://docs.traefik.io/v1.7/#supported-backends) that will do the job. -Our recommendation would be to see for yourself how simple it is to enable HTTPS with [Traefik's let's encrypt integration](https://docs.traefik.io/user-guide/examples/#lets-encrypt-support) using the dedicated [user guide](https://docs.traefik.io/user-guide/docker-and-lets-encrypt/). +Our recommendation would be to see for yourself how simple it is to enable HTTPS with [Traefik's let's encrypt integration](https://docs.traefik.io/v1.7/user-guide/examples/#lets-encrypt-support) using the dedicated [user guide](https://docs.traefik.io/v1.7/user-guide/docker-and-lets-encrypt/). diff --git a/webui/src/app/components/header/header.component.html b/webui/src/app/components/header/header.component.html index 7254a8afb..7311c71a8 100644 --- a/webui/src/app/components/header/header.component.html +++ b/webui/src/app/components/header/header.component.html @@ -25,7 +25,7 @@ {{ version }} / {{ codename }} - + Documentation