Skip to content

Commit

Permalink
Fix for relative-path redirects causing infinite loops
Browse files Browse the repository at this point in the history
  • Loading branch information
johndmulhausen committed Oct 7, 2016
1 parent a01754c commit a2ff02a
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 52 deletions.
4 changes: 2 additions & 2 deletions 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ function doFwd() {
if (gonnaFwd) {
console.log("Forwarding to: " + newURL);
//window.location.replace(newURL);
document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
//document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
} else {
//window.location.replace("/sorry/#" + forwardingURL);
document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
//document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
}
}
window.onload = doFwd;
Expand Down
100 changes: 50 additions & 50 deletions _data/redirects.csv
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
source,destination
engine/quickstart/,engine/getstarted/
engine/containers/,engine/tutorials/
win/,docker-for-windows/
mac/,docker-for-mac/
linux/,engine/
article-img/,engine/article-img/
articles/,engine/articles/
examples/,engine/examples/
extend/,engine/extend/
installation/,engine/installation/
introduction/,engine/introduction/
misc/,engine/misc/
project/,opensource/project/
reference/,engine/reference/
security/,engine/security/
static_files/,engine/static_files/
userguide/,engine/userguide/
en/latest/installation/,engine/installation/
docker-hub-enterprise/install/,docker-trusted-registry/install/
docker-io/builds/,docker-hub/builds/
docker-trusted-registry/license/install-csengine.md,docker-trusted-registry/install/install-csengine/
engine/articles/basics/,engine/userguide/basics/
engine/project/set-up-git/,opensource/project/set-up-git/
engine/reference/articles/basics.md,engine/userguide/basics/
engine/userguide/dockerlinks/,engine/userguide/networking/default_network/dockerlinks/
installation/,engine/installation/
networking/,engine/userguide/networking/
opensource/project/advanced-contributing/,opensource/workflow/advanced-contributing/
opensource/project/create-pr/,opensource/workflow/create-pr/
opensource/project/find-an-issue/,opensource/workflow/find-an-issue/
opensource/project/get-help/,opensource/get-help/
opensource/project/make-a-contribution/,opensource/workflow/make-a-contribution/
opensource/project/review-pr/,opensource/workflow/review-pr/
opensource/project/work-issue/,opensource/workflow/work-issue/
opensource/workflow/doc-style/,opensource/doc-style/
opensource/workflow/get-help/,opensource/get-help/
opensource/workflow/set-up-dev-env/,opensource/project/set-up-dev-env/
opensource/workflow/set-up-git/,opensource/project/set-up-git/
opensource/workflow/test-and-docs/,opensource/project/test-and-docs/
userguide/,engine/userguide/
docker-trusted-registry/adminguide/upgrade.md,docker-trusted-registry/install/upgrade/
docker-trusted-registry/quick-start/install.md,docker-trusted-registry/install/
docker-trusted-registry/adminguide/docker-trusted-registry/install.md,docker-trusted-registry/install/
v1.6/docker-hub/,docker-hub/
v1.7/docker-hub/,docker-hub/
v1.8/docker-hub/,docker-hub/
v1.9/docker-hub/,docker-hub/
v1.10/docker-hub/,docker-hub/
v1.11/docker-hub/,docker-hub/
/source,destination
/engine/quickstart/,/engine/getstarted/
/engine/containers/,/engine/tutorials/
/win/,/docker-for-windows/
/mac/,/docker-for-mac/
/linux/,/engine/
/article-img/,/engine/article-img/
/articles/,/engine/articles/
/examples/,/engine/examples/
/extend/,/engine/extend/
/installation/,/engine/installation/
/introduction/,/engine/introduction/
/misc/,/engine/misc/
/project/,/opensource/project/
/reference/,/engine/reference/
/security/,/engine/security/
/static_files/,/engine/static_files/
/userguide/,/engine/userguide/
/en/latest/installation/,/engine/installation/
/docker-hub-enterprise/install/,/docker-trusted-registry/install/
/docker-io/builds/,/docker-hub/builds/
/docker-trusted-registry/license/install-csengine.md,/docker-trusted-registry/install/install-csengine/
/engine/articles/basics/,/engine/userguide/basics/
/engine/project/set-up-git/,/opensource/project/set-up-git/
/engine/reference/articles/basics.md,/engine/userguide/basics/
/engine/userguide/dockerlinks/,/engine/userguide/networking/default_network/dockerlinks/
/installation/,/engine/installation/
/networking/,/engine/userguide/networking/
/opensource/project/advanced-contributing/,/opensource/workflow/advanced-contributing/
/opensource/project/create-pr/,/opensource/workflow/create-pr/
/opensource/project/find-an-issue/,/opensource/workflow/find-an-issue/
/opensource/project/get-help/,/opensource/get-help/
/opensource/project/make-a-contribution/,/opensource/workflow/make-a-contribution/
/opensource/project/review-pr/,/opensource/workflow/review-pr/
/opensource/project/work-issue/,/opensource/workflow/work-issue/
/opensource/workflow/doc-style/,/opensource/doc-style/
/opensource/workflow/get-help/,/opensource/get-help/
/opensource/workflow/set-up-dev-env/,/opensource/project/set-up-dev-env/
/opensource/workflow/set-up-git/,/opensource/project/set-up-git/
/opensource/workflow/test-and-docs/,/opensource/project/test-and-docs/
/userguide/,/engine/userguide/
/docker-trusted-registry/adminguide/upgrade.md,/docker-trusted-registry/install/upgrade/
/docker-trusted-registry/quick-start/install.md,/docker-trusted-registry/install/
/docker-trusted-registry/adminguide/docker-trusted-registry/install.md,/docker-trusted-registry/install/
/v1.6/docker-hub/,/docker-hub/
/v1.7/docker-hub/,/docker-hub/
/v1.8/docker-hub/,/docker-hub/
/v1.9/docker-hub/,/docker-hub/
/v1.10/docker-hub/,/docker-hub/
/v1.11/docker-hub/,/docker-hub/
1 change: 1 addition & 0 deletions engine/admin/runmetrics.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
aliases:
- /engine/articles/run_metrics
- /engine/articles/runmetrics
description: Measure the behavior of running containers
keywords:
- docker, metrics, CPU, memory, disk, IO, run, runtime, stats
Expand Down

0 comments on commit a2ff02a

Please sign in to comment.