Browse code

Made all paths "pretty url's" including gettingstarted.

Thatcher Peskens authored on 2013/03/28 09:01:50
Showing 5 changed files
... ...
@@ -47,7 +47,7 @@ docs:
47 47
 	-rm -rf $(BUILDDIR)/*
48 48
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/html
49 49
 	cp sources/index.html $(BUILDDIR)/html/
50
-	cp sources/gettingstarted.html $(BUILDDIR)/html/
50
+	cp -r sources/gettingstarted $(BUILDDIR)/html/
51 51
 	cp sources/dotcloud.yml $(BUILDDIR)/html/
52 52
 	cp sources/CNAME $(BUILDDIR)/html/
53 53
 	cp sources/.nojekyll $(BUILDDIR)/html/
54 54
deleted file mode 100644
... ...
@@ -1,204 +0,0 @@
1
-<!DOCTYPE html>
2
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
3
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
4
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
5
-<!--[if gt IE 8]><!-->
6
-<html class="no-js" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
7
-<head>
8
-    <meta charset="utf-8">
9
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
10
-    <title>Docker - the Linux container runtime</title>
11
-
12
-    <meta name="description" content="Docker encapsulates heterogeneous payloads in standard containers">
13
-    <meta name="viewport" content="width=device-width">
14
-
15
-    <!-- twitter bootstrap -->
16
-    <link rel="stylesheet" href="_static/css/bootstrap.min.css">
17
-    <link rel="stylesheet" href="_static/css/bootstrap-responsive.min.css">
18
-
19
-    <!-- main style file -->
20
-    <link rel="stylesheet" href="_static/css/main.css">
21
-
22
-    <!-- vendor scripts -->
23
-    <script src="_static/js/vendor/jquery-1.9.1.min.js" type="text/javascript" ></script>
24
-    <script src="_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>
25
-
26
-</head>
27
-
28
-
29
-<body>
30
-
31
-<div class="navbar navbar-fixed-top">
32
-    <div class="navbar-dotcloud">
33
-        <div class="container" style="text-align: center;">
34
-
35
-            <div style="float: right" class="pull-right">
36
-                <ul class="nav">
37
-                    <li><a href="index.html">Introduction</a></li>
38
-                    <li class="active"><a href="gettingstarted.html">Getting started</a></li>
39
-                    <li class=""><a href="http://docs.docker.io/en/latest/concepts/containers/">Documentation</a></li>
40
-                </ul>
41
-
42
-                <div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
43
-                    <a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
44
-                    <a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
45
-                </div>
46
-            </div>
47
-
48
-            <div style="margin-left: -12px; float: left;">
49
-                <a href="index.html"><img style="margin-top: 12px; height: 38px" src="_static/img/docker-letters-logo.gif"></a>
50
-            </div>
51
-        </div>
52
-    </div>
53
-</div>
54
-
55
-
56
-<div class="container">
57
-    <div class="row">
58
-        <div class="span12 titlebar"><h1 class="pageheader">GETTING STARTED</h1>
59
-        </div>
60
-    </div>
61
-
62
-</div>
63
-
64
-<div class="container">
65
-    <div class="alert alert-info">
66
-	    <strong>Docker is still under heavy development.</strong> It should not yet be used in production. Check <a href="http://github.com/dotcloud/docker">the repo</a> for recent progress.
67
-    </div>
68
-    <div class="row">
69
-        <div class="span6">
70
-            <section class="contentblock">
71
-                <h2>
72
-                    <a name="installing-on-ubuntu-1204-and-1210" class="anchor" href="#installing-on-ubuntu-1204-and-1210"><span class="mini-icon mini-icon-link"></span>
73
-                    </a>Installing on Ubuntu</h2>
74
-                <ol>
75
-                    <li>
76
-                        <p>Install dependencies:</p>
77
-
78
-                        <div class="highlight">
79
-                        <pre>sudo apt-get install lxc wget bsdtar curl</pre>
80
-                        <pre>sudo apt-get install linux-image-extra-<span class="sb">`</span>uname -r<span class="sb">`</span></pre></div>
81
-
82
-                        <p>The <code>linux-image-extra</code> package is needed on standard Ubuntu EC2 AMIs in order to install the aufs kernel module.</p>
83
-                    </li>
84
-                    <li>
85
-                        <p>Install the latest docker binary:</p>
86
-
87
-                        <div class="highlight">
88
-                        <pre>wget http://get.docker.io/builds/<span class="k">$(</span>uname -s<span class="k">)</span>/<span class="k">$(</span>uname -m<span class="k">)</span>/docker-master.tgz</pre>
89
-                        <pre>tar -xf docker-master.tgz</pre>
90
-                        </div>
91
-                    </li>
92
-                    <li>
93
-                        <p>Run your first container!</p>
94
-
95
-                        <div class="highlight"><pre><span class="nb">cd </span>docker-master</pre>
96
-                        <pre>sudo ./docker run -i -t base /bin/bash</pre>
97
-                        </div>
98
-                        <p>Done!</p>
99
-                        <p>Consider adding docker to your <code>PATH</code> for simplicity.</p>
100
-                    </li>
101
-
102
-                    Continue with the <a href="examples/hello_world.html#hello-world">Hello world</a> example.
103
-                </ol>
104
-            </section>
105
-
106
-            <section class="contentblock">
107
-                <h2>Contributing to Docker</h2>
108
-
109
-                <p>Want to hack on Docker? Awesome! We have some <a href="/documentation/contributing/contributing.html">instructions to get you started</a>. They are probably not perfect, please let us know if anything feels wrong or incomplete.</p>
110
-            </section>
111
-
112
-        </div>
113
-        <div class="span6">
114
-            <section class="contentblock">
115
-                <h2>Quick install on other operating systems</h2>
116
-                <p><strong>For other operating systems we recommend and provide a streamlined install with virtualbox,
117
-                    vagrant and an Ubuntu virtual machine.</strong></p>
118
-
119
-                <ul>
120
-                    <li><a href="installation/macos.html">Mac OS X and other linuxes</a></li>
121
-                    <li><a href="installation/windows.html">Windows</a></li>
122
-                </ul>
123
-
124
-            </section>
125
-
126
-            <section class="contentblock">
127
-                <h2>More resources</h2>
128
-                <ul>
129
-                    <li><a href="irc://chat.freenode.net#docker">IRC: docker on freenode</a></li>
130
-                    <li><a href="http://www.github.com/dotcloud/docker">Github</a></li>
131
-                    <li><a href="http://stackoverflow.com/tags/docker/">Ask questions on Stackoverflow</a></li>
132
-                    <li><a href="http://twitter.com/getdocker/">Join the conversation on Twitter</a></li>
133
-                </ul>
134
-            </section>
135
-
136
-
137
-            <section class="contentblock">
138
-                <div id="wufoo-z7x3p3">
139
-                    Fill out my <a href="http://dotclouddocker.wufoo.com/forms/z7x3p3">online form</a>.
140
-                </div>
141
-                <script type="text/javascript">var z7x3p3;(function(d, t) {
142
-                    var s = d.createElement(t), options = {
143
-                        'userName':'dotclouddocker',
144
-                        'formHash':'z7x3p3',
145
-                        'autoResize':true,
146
-                        'height':'577',
147
-                        'async':true,
148
-                        'header':'show'};
149
-                    s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
150
-                    s.onload = s.onreadystatechange = function() {
151
-                        var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
152
-                        try { z7x3p3 = new WufooForm();z7x3p3.initialize(options);z7x3p3.display(); } catch (e) {}};
153
-                    var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
154
-                })(document, 'script');</script>
155
-            </section>
156
-
157
-        </div>
158
-    </div>
159
-</div>
160
-
161
-
162
-<div class="container">
163
-    <footer id="footer" class="footer">
164
-        <div class="row">
165
-            <div class="span12 social">
166
-
167
-                Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
168
-
169
-            </div>
170
-        </div>
171
-
172
-        <div class="row">
173
-            <div class="emptyspace" style="height: 40px">
174
-
175
-            </div>
176
-        </div>
177
-
178
-    </footer>
179
-</div>
180
-
181
-
182
-<!-- bootstrap javascipts -->
183
-<script src="_static/js/vendor/bootstrap.min.js" type="text/javascript"></script>
184
-
185
-<!-- Google analytics -->
186
-<script type="text/javascript">
187
-
188
-    var _gaq = _gaq || [];
189
-    _gaq.push(['_setAccount', 'UA-6096819-11']);
190
-    _gaq.push(['_setDomainName', 'docker.io']);
191
-    _gaq.push(['_setAllowLinker', true]);
192
-    _gaq.push(['_trackPageview']);
193
-
194
-    (function() {
195
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
196
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
197
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
198
-    })();
199
-
200
-</script>
201
-
202
-
203
-</body>
204
-</html>
205 1
new file mode 100644
... ...
@@ -0,0 +1,204 @@
0
+<!DOCTYPE html>
1
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
2
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
3
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
4
+<!--[if gt IE 8]><!-->
5
+<html class="no-js" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
6
+<head>
7
+    <meta charset="utf-8">
8
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9
+    <title>Docker - the Linux container runtime</title>
10
+
11
+    <meta name="description" content="Docker encapsulates heterogeneous payloads in standard containers">
12
+    <meta name="viewport" content="width=device-width">
13
+
14
+    <!-- twitter bootstrap -->
15
+    <link rel="stylesheet" href="../_static/css/bootstrap.min.css">
16
+    <link rel="stylesheet" href="../_static/css/bootstrap-responsive.min.css">
17
+
18
+    <!-- main style file -->
19
+    <link rel="stylesheet" href="../_static/css/main.css">
20
+
21
+    <!-- vendor scripts -->
22
+    <script src="../_static/js/vendor/jquery-1.9.1.min.js" type="text/javascript" ></script>
23
+    <script src="../_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>
24
+
25
+</head>
26
+
27
+
28
+<body>
29
+
30
+<div class="navbar navbar-fixed-top">
31
+    <div class="navbar-dotcloud">
32
+        <div class="container" style="text-align: center;">
33
+
34
+            <div style="float: right" class="pull-right">
35
+                <ul class="nav">
36
+                    <li><a href="../">Introduction</a></li>
37
+                    <li class="active"><a href="./">Getting started</a></li>
38
+                    <li class=""><a href="http://docs.docker.io/en/latest/concepts/containers/">Documentation</a></li>
39
+                </ul>
40
+
41
+                <div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
42
+                    <a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
43
+                    <a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
44
+                </div>
45
+            </div>
46
+
47
+            <div style="margin-left: -12px; float: left;">
48
+                <a href="../index.html"><img style="margin-top: 12px; height: 38px" src="../_static/img/docker-letters-logo.gif"></a>
49
+            </div>
50
+        </div>
51
+    </div>
52
+</div>
53
+
54
+
55
+<div class="container">
56
+    <div class="row">
57
+        <div class="span12 titlebar"><h1 class="pageheader">GETTING STARTED</h1>
58
+        </div>
59
+    </div>
60
+
61
+</div>
62
+
63
+<div class="container">
64
+    <div class="alert alert-info">
65
+	    <strong>Docker is still under heavy development.</strong> It should not yet be used in production. Check <a href="http://github.com/dotcloud/docker">the repo</a> for recent progress.
66
+    </div>
67
+    <div class="row">
68
+        <div class="span6">
69
+            <section class="contentblock">
70
+                <h2>
71
+                    <a name="installing-on-ubuntu-1204-and-1210" class="anchor" href="#installing-on-ubuntu-1204-and-1210"><span class="mini-icon mini-icon-link"></span>
72
+                    </a>Installing on Ubuntu</h2>
73
+                <ol>
74
+                    <li>
75
+                        <p>Install dependencies:</p>
76
+
77
+                        <div class="highlight">
78
+                        <pre>sudo apt-get install lxc wget bsdtar curl</pre>
79
+                        <pre>sudo apt-get install linux-image-extra-<span class="sb">`</span>uname -r<span class="sb">`</span></pre></div>
80
+
81
+                        <p>The <code>linux-image-extra</code> package is needed on standard Ubuntu EC2 AMIs in order to install the aufs kernel module.</p>
82
+                    </li>
83
+                    <li>
84
+                        <p>Install the latest docker binary:</p>
85
+
86
+                        <div class="highlight">
87
+                        <pre>wget http://get.docker.io/builds/<span class="k">$(</span>uname -s<span class="k">)</span>/<span class="k">$(</span>uname -m<span class="k">)</span>/docker-master.tgz</pre>
88
+                        <pre>tar -xf docker-master.tgz</pre>
89
+                        </div>
90
+                    </li>
91
+                    <li>
92
+                        <p>Run your first container!</p>
93
+
94
+                        <div class="highlight"><pre><span class="nb">cd </span>docker-master</pre>
95
+                        <pre>sudo ./docker run -i -t base /bin/bash</pre>
96
+                        </div>
97
+                        <p>Done!</p>
98
+                        <p>Consider adding docker to your <code>PATH</code> for simplicity.</p>
99
+                    </li>
100
+
101
+                    Continue with the <a href="examples/hello_world.html#hello-world">Hello world</a> example.
102
+                </ol>
103
+            </section>
104
+
105
+            <section class="contentblock">
106
+                <h2>Contributing to Docker</h2>
107
+
108
+                <p>Want to hack on Docker? Awesome! We have some <a href="/documentation/contributing/contributing.html">instructions to get you started</a>. They are probably not perfect, please let us know if anything feels wrong or incomplete.</p>
109
+            </section>
110
+
111
+        </div>
112
+        <div class="span6">
113
+            <section class="contentblock">
114
+                <h2>Quick install on other operating systems</h2>
115
+                <p><strong>For other operating systems we recommend and provide a streamlined install with virtualbox,
116
+                    vagrant and an Ubuntu virtual machine.</strong></p>
117
+
118
+                <ul>
119
+                    <li><a href="installation/macos.html">Mac OS X and other linuxes</a></li>
120
+                    <li><a href="installation/windows.html">Windows</a></li>
121
+                </ul>
122
+
123
+            </section>
124
+
125
+            <section class="contentblock">
126
+                <h2>More resources</h2>
127
+                <ul>
128
+                    <li><a href="irc://chat.freenode.net#docker">IRC: docker on freenode</a></li>
129
+                    <li><a href="http://www.github.com/dotcloud/docker">Github</a></li>
130
+                    <li><a href="http://stackoverflow.com/tags/docker/">Ask questions on Stackoverflow</a></li>
131
+                    <li><a href="http://twitter.com/getdocker/">Join the conversation on Twitter</a></li>
132
+                </ul>
133
+            </section>
134
+
135
+
136
+            <section class="contentblock">
137
+                <div id="wufoo-z7x3p3">
138
+                    Fill out my <a href="http://dotclouddocker.wufoo.com/forms/z7x3p3">online form</a>.
139
+                </div>
140
+                <script type="text/javascript">var z7x3p3;(function(d, t) {
141
+                    var s = d.createElement(t), options = {
142
+                        'userName':'dotclouddocker',
143
+                        'formHash':'z7x3p3',
144
+                        'autoResize':true,
145
+                        'height':'577',
146
+                        'async':true,
147
+                        'header':'show'};
148
+                    s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
149
+                    s.onload = s.onreadystatechange = function() {
150
+                        var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
151
+                        try { z7x3p3 = new WufooForm();z7x3p3.initialize(options);z7x3p3.display(); } catch (e) {}};
152
+                    var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
153
+                })(document, 'script');</script>
154
+            </section>
155
+
156
+        </div>
157
+    </div>
158
+</div>
159
+
160
+
161
+<div class="container">
162
+    <footer id="footer" class="footer">
163
+        <div class="row">
164
+            <div class="span12 social">
165
+
166
+                Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
167
+
168
+            </div>
169
+        </div>
170
+
171
+        <div class="row">
172
+            <div class="emptyspace" style="height: 40px">
173
+
174
+            </div>
175
+        </div>
176
+
177
+    </footer>
178
+</div>
179
+
180
+
181
+<!-- bootstrap javascipts -->
182
+<script src="../_static/js/vendor/bootstrap.min.js" type="text/javascript"></script>
183
+
184
+<!-- Google analytics -->
185
+<script type="text/javascript">
186
+
187
+    var _gaq = _gaq || [];
188
+    _gaq.push(['_setAccount', 'UA-6096819-11']);
189
+    _gaq.push(['_setDomainName', 'docker.io']);
190
+    _gaq.push(['_setAllowLinker', true]);
191
+    _gaq.push(['_trackPageview']);
192
+
193
+    (function() {
194
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
195
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
196
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
197
+    })();
198
+
199
+</script>
200
+
201
+
202
+</body>
203
+</html>
... ...
@@ -34,8 +34,8 @@
34 34
 
35 35
             <div class="pull-right" >
36 36
                 <ul class="nav">
37
-                    <li class="active"><a href="index.html">Introduction</a></li>
38
-                    <li ><a href="gettingstarted.html">Getting started</a></li>
37
+                    <li class="active"><a href="./">Introduction</a></li>
38
+                    <li ><a href="gettingstarted/">Getting started</a></li>
39 39
                     <li class=""><a href="http://docs.docker.io/en/latest/concepts/containers/">Documentation</a></li>
40 40
                 </ul>
41 41
 
... ...
@@ -87,7 +87,7 @@
87 87
 
88 88
 
89 89
                 <div style="display: block; text-align: center;">
90
-                    <a class="btn btn-custom btn-large" href="gettingstarted.html">Let's get started</a>
90
+                    <a class="btn btn-custom btn-large" href="gettingstarted/index.html">Let's get started</a>
91 91
                 </div>
92 92
 
93 93
 
... ...
@@ -64,8 +64,8 @@
64 64
             <div style="float: right" class="pull-right">
65 65
                 <ul class="nav">
66 66
                     <li><a href="http://www.docker.io/">Introduction</a></li>
67
-                    <li><a href="http://www.docker.io/gettingstarted.html">Getting started</a></li>
68
-                    <li class="active"><a href="{{ pathto('documentation/concepts/containers/', 1) }}">Documentation</a></li>
67
+                    <li><a href="http://www.docker.io/gettingstarted/">Getting started</a></li>
68
+                    <li class="active"><a href="{{ pathto('concepts/containers/', 1) }}">Documentation</a></li>
69 69
                 </ul>
70 70
                 <div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
71 71
                     <a class="twitter" href="http://twitter.com/getdocker">Twitter</a>