Prechádzať zdrojové kódy

Merge pull request #1028 from dhrp/bugfixes-on-docs

Bugfixes on documentation code
Thatcher 12 rokov pred
rodič
commit
e12a204bcc

+ 1 - 0
docs/sources/conf.py

@@ -30,6 +30,7 @@ import sys, os
 html_additional_pages = {
 html_additional_pages = {
     'concepts/containers': 'redirect_home.html',
     'concepts/containers': 'redirect_home.html',
     'concepts/introduction': 'redirect_home.html',
     'concepts/introduction': 'redirect_home.html',
+    'builder/basics': 'redirect_build.html',
     }
     }
 
 
 
 

+ 4 - 1
docs/theme/docker/layout.html

@@ -40,8 +40,11 @@
 
 
     {%- set script_files = script_files + ['_static/js/docs.js'] %}
     {%- set script_files = script_files + ['_static/js/docs.js'] %}
 
 
+    {%- if pagename == 'index' %}
+    <link rel="canonical" href="http://docs.docker.io/en/latest/">
+    {% else %}
     <link rel="canonical" href="http://docs.docker.io/en/latest/{{ pagename }}/">
     <link rel="canonical" href="http://docs.docker.io/en/latest/{{ pagename }}/">
-
+    {% endif %}
     {%- for cssfile in css_files %}
     {%- for cssfile in css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
     {%- endfor %}
     {%- endfor %}

+ 12 - 0
docs/theme/docker/redirect_build.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Page Moved</title>
+    <meta http-equiv="refresh" content="0; url=http://docs.docker.io/en/latest/use/builder/">
+</head>
+<body>
+
+This page has moved. Perhaps you should visit the <a href="http://docs.docker.io/en/latest/use/builder/" title="builder page">Builder page</a>
+
+</body>
+</html>

+ 1 - 1
docs/theme/docker/redirect_home.html

@@ -2,7 +2,7 @@
 <html>
 <html>
 <head>
 <head>
     <title>Page Moved</title>
     <title>Page Moved</title>
-    <meta http-equiv="refresh" content="0; url=http://docks.docker.io/en/latest/">
+    <meta http-equiv="refresh" content="0; url=http://docs.docker.io/en/latest/">
 </head>
 </head>
 <body>
 <body>