diff --git a/404.md b/404.md index 557ad3db0ae..2225ab8d3d5 100644 --- a/404.md +++ b/404.md @@ -53,10 +53,10 @@ function doFwd() { if (gonnaFwd) { console.log("Forwarding to: " + newURL); //window.location.replace(newURL); - document.write('') + //document.write('') } else { //window.location.replace("/sorry/#" + forwardingURL); - document.write('') + //document.write('') } } window.onload = doFwd; diff --git a/_data/redirects.csv b/_data/redirects.csv index fcb44b0b90e..7d06e77a5b0 100644 --- a/_data/redirects.csv +++ b/_data/redirects.csv @@ -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/ diff --git a/engine/admin/runmetrics.md b/engine/admin/runmetrics.md index a5e466bd148..e2e98567270 100644 --- a/engine/admin/runmetrics.md +++ b/engine/admin/runmetrics.md @@ -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