summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bower.json8
-rw-r--r--gulpfile.js21
-rw-r--r--package.json12
-rw-r--r--src/2015-08-pyconau/index.html215
-rw-r--r--src/a-vision-for-the-future/index.html498
-rw-r--r--src/index.hbs6
6 files changed, 521 insertions, 239 deletions
diff --git a/bower.json b/bower.json
index 090f7c2..fb73900 100644
--- a/bower.json
+++ b/bower.json
@@ -1,11 +1,11 @@
1{ 1{
2 "name": "presentations", 2 "name": "inaugust",
3 "version": "1.0.0", 3 "version": "1.0.0",
4 "homepage": "https://krotscheck.github.com/presentations", 4 "homepage": "https://inaugust.com",
5 "authors": [ 5 "authors": [
6 "Michael Krotscheck <krotscheck@gmail.com>" 6 "Monty Taylor <mordred@inaugust.com>"
7 ], 7 ],
8 "license": "Apache-2.0", 8 "license": "CC-BY 4.0",
9 "ignore": [ 9 "ignore": [
10 "**/.*", 10 "**/.*",
11 "node_modules", 11 "node_modules",
diff --git a/gulpfile.js b/gulpfile.js
index cffd79c..6884eae 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,9 +8,9 @@
8 8
9 var gulp = require('gulp'); 9 var gulp = require('gulp');
10 var git = require('gulp-git'); 10 var git = require('gulp-git');
11 var ghPages = require('gulp-gh-pages');
12 var filter = require('gulp-filter'); 11 var filter = require('gulp-filter');
13 var less = require('gulp-less'); 12 var less = require('gulp-less');
13 var rsync = require('gulp-rsync');
14 var webserver = require('gulp-webserver'); 14 var webserver = require('gulp-webserver');
15 var streamqueue = require('streamqueue'); 15 var streamqueue = require('streamqueue');
16 var ignore = require('gulp-ignore'); 16 var ignore = require('gulp-ignore');
@@ -62,7 +62,6 @@
62 var $ = cheerio.load(fs.readFileSync(file)); 62 var $ = cheerio.load(fs.readFileSync(file));
63 presentations.push({ 63 presentations.push({
64 'title': $("head title").text(), 64 'title': $("head title").text(),
65 'description': $("head meta[name='description']").attr('content'),
66 'author': $('head meta[name="author"]').attr('content'), 65 'author': $('head meta[name="author"]').attr('content'),
67 'mtime': stat.mtime, 66 'mtime': stat.mtime,
68 'path': files[i] + '/index.html' 67 'path': files[i] + '/index.html'
@@ -216,18 +215,18 @@
216 */ 215 */
217 gulp.task('package', ['package:html', 'package:hbs', 'package:libs']); 216 gulp.task('package', ['package:html', 'package:hbs', 'package:libs']);
218 217
219 /** 218 gulp.task('rsync', function () {
220 * Push the contents of the dist directory to gh-pages. 219 gulp.src('dest/**')
221 */ 220 .pipe(rsync({
222 gulp.task('gh-pages', function () { 221 root: 'dest',
223 return gulp.src(dir.dist + '/**/*') 222 hostname: 'kleos.inaugust.com',
224 .pipe(ghPages()); 223 destination: '/var/www/inaugust.com/talks'
224 }));
225 }); 225 });
226
227 /** 226 /**
228 * Build the current release package and push it to gh-pages. 227 * Build the current release package and push it
229 */ 228 */
230 gulp.task('release', ['package', 'gh-pages']); 229 gulp.task('release', ['package', 'rsync']);
231 230
232 /** 231 /**
233 * Start a local server and serve the application code. This is 232 * Start a local server and serve the application code. This is
diff --git a/package.json b/package.json
index cdafc8d..de762dc 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
12 "release": "gulp release" 12 "release": "gulp release"
13 }, 13 },
14 "author": { 14 "author": {
15 "name": "Michael Krotscheck", 15 "name": "Monty Taylor",
16 "email": "krotscheck@gmail.com", 16 "email": "mordred@inaugust.com",
17 "url": "http://www.krotscheck.net/" 17 "url": "http://inaugust.com"
18 }, 18 },
19 "license": "Apache-2.0", 19 "license": "CC-BY 4.0",
20 "dependencies": {}, 20 "dependencies": {},
21 "devDependencies": { 21 "devDependencies": {
22 "bower": "^1.4.1", 22 "bower": "^1.4.1",
@@ -24,17 +24,17 @@
24 "gulp": "^3.9.0", 24 "gulp": "^3.9.0",
25 "gulp-compile-handlebars": "^0.5.0", 25 "gulp-compile-handlebars": "^0.5.0",
26 "gulp-filter": "^3.0.0", 26 "gulp-filter": "^3.0.0",
27 "gulp-gh-pages": "^0.5.2",
28 "gulp-git": "^1.2.4", 27 "gulp-git": "^1.2.4",
29 "gulp-ignore": "^1.2.1", 28 "gulp-ignore": "^1.2.1",
30 "gulp-less": "^3.0.3", 29 "gulp-less": "^3.0.3",
31 "gulp-prompt": "^0.1.2", 30 "gulp-prompt": "^0.1.2",
32 "gulp-rename": "^1.2.2", 31 "gulp-rename": "^1.2.2",
32 "gulp-rsync": "^0.0.5",
33 "gulp-util": "^3.0.6", 33 "gulp-util": "^3.0.6",
34 "gulp-webserver": "^0.9.1", 34 "gulp-webserver": "^0.9.1",
35 "main-bower-files": "^2.9.0", 35 "main-bower-files": "^2.9.0",
36 "rimraf": "^2.4.2", 36 "rimraf": "^2.4.2",
37 "streamqueue": "^1.1.0" 37 "streamqueue": "^1.1.0"
38 }, 38 },
39 "repository": "git@github.com:krotscheck/presentations.git" 39 "repository": "http://git.inaugust.com/cgit/inaugust.com"
40} 40}
diff --git a/src/2015-08-pyconau/index.html b/src/2015-08-pyconau/index.html
deleted file mode 100644
index dca0882..0000000
--- a/src/2015-08-pyconau/index.html
+++ /dev/null
@@ -1,215 +0,0 @@
1<!doctype html>
2<html lang="en">
3
4<head>
5 <meta charset="utf-8">
6
7 <title>PyCon AU- Talking to Browsers with CORS</title>
8
9 <meta name="description"
10 content="This session will demonstrate how to break the browser's single origin policy, and permit true separability between a Python API and a browser-based client.">
11 <meta name="author" content="Michael Krotscheck">
12
13 <meta name="apple-mobile-web-app-capable" content="yes"/>
14 <meta name="apple-mobile-web-app-status-bar-style"
15 content="black-translucent"/>
16
17 <meta name="viewport"
18 content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
19
20 <link rel="stylesheet" href="../css/reveal.css">
21 <link rel="stylesheet" href="../css/font-awesome.css">
22 <link rel="stylesheet" href="../css/font-mfizz.css">
23 <link rel="stylesheet" href="../css/theme/serif.css" id="theme">
24
25 <!-- Code syntax highlighting -->
26 <link rel="stylesheet" href="../lib/css/zenburn.css">
27
28 <!-- Printing and PDF exports -->
29 <script>
30 var link = document.createElement('link');
31 link.rel = 'stylesheet';
32 link.type = 'text/css';
33 link.href =
34 window.location.search.match(/print-pdf/gi) ? '../css/print/pdf.css' :
35 '../css/print/paper.css';
36 document.getElementsByTagName('head')[0].appendChild(link);
37 </script>
38
39 <!--[if lt IE 9]>
40 <script src="../lib/js/html5shiv.js"></script>
41 <![endif]-->
42</head>
43
44<body>
45
46<div class="reveal" data-transition="slide">
47
48 <!-- Any section element inside of this container is displayed as a slide -->
49 <div class="slides">
50 <section>
51 <h2>Talking to Browsers with CORS</h2>
52
53 <h4>Breaking the single origin policy</h4>
54 </section>
55
56 <section>
57 <dl>
58 <dt>Author:</dt>
59 <dd>
60 <a href="http://www.krotscheck.net">Michael Krotscheck</a>
61 <br/>
62 <a href="http://twitter.com/krotscheck" target="_blank">
63 <i class="fa fa-twitter"></i> krotscheck
64 </a>
65 <br/>
66 <a href="http://www.krotscheck.net" target="_blank">
67 <i class="fa fa-wordpress"></i> http://www.krotscheck.net
68 </a>
69 </dd>
70 <dt>Source:</dt>
71 <dd><a href="https://github.com/krotscheck/presentations">
72 https://github.com/krotscheck/presentations
73 </a></dd>
74 <dt>License:</dt>
75 <dd><a rel="license"
76 href="http://creativecommons.org/licenses/by/4.0/">Creative
77 Commons Attribution 4.0 International</a></dd>
78 </dl>
79 </section>
80
81 <section>
82 <h2>Topics Covered</h2>
83 </section>
84
85 <section>
86 <section>
87 <h2>Single Origin Policy</h2>
88 </section>
89 <section>
90 <h2>Security Concerns</h2>
91 </section>
92 </section>
93
94 <section>
95 <section>
96 <h2>Web Application Design Patterns</h2>
97 </section>
98 <section>
99 <h2>All-in-one</h2>
100 </section>
101 <section>
102 <h2>API + UI</h2>
103 </section>
104 <section>
105 <h2>API(s) + UI + UI-Server</h2>
106
107 <p>
108 <i class="icon-python"></i>
109 </p>
110 </section>
111 </section>
112
113 <section>
114 <section>
115 <h2>CORS</h2>
116 </section>
117 <section>
118 <h2>CORS Preflight request</h2>
119 </section>
120 <section>
121 <h2>CORS Preflight response</h2>
122 </section>
123 <section>
124 <h2>CORS Http Request</h2>
125 </section>
126 <section>
127 <h2>CORS Http Response</h2>
128 </section>
129 </section>
130
131 <section>
132 <section>
133 <h2>Implementing CORS</h2>
134 <dl>
135 <dt>Apache 2</dt>
136 <dd>mod_headers</dd>
137 <dt>Nginx</dt>
138 <dd>add_headers</dd>
139 <dt>Python WSGI</dt>
140 <dd>mod_headers</dd>
141 </dl>
142 <ul>
143 <li>Apache2: mod_headers</li>
144 <li>Nginx: add_headers</li>
145 <li>Python: Middleware</li>
146 </ul>
147 </section>
148 <section>
149 <h2>mod_headers</h2>
150 </section>
151 <section>
152 <h2>CORS via WSGI</h2>
153 </section>
154 <section>
155 <h2>oslo_middleware</h2>
156 </section>
157 <section>
158 <h2>other middleware</h2>
159 </section>
160 </section>
161
162
163 </div>
164
165 <script src="../lib/js/head.min.js"></script>
166 <script src="../js/reveal.js"></script>
167
168 <script>
169
170 // Full list of configuration options available at:
171 // https://github.com/hakimel/reveal.js#configuration
172 Reveal.initialize({
173 controls: true,
174 progress: true,
175 history: true,
176 center: true,
177
178 transition: 'slide', // none/fade/slide/convex/concave/zoom
179
180 // Optional reveal.js plugins
181 dependencies: [
182 {
183 src: '../lib/js/classList.js', condition: function () {
184 return !document.body.classList;
185 }
186 },
187 {
188 src: '../plugin/markdown/marked.js', condition: function () {
189 return !!document.querySelector('[data-markdown]');
190 }
191 },
192 {
193 src: '../plugin/markdown/markdown.js', condition: function () {
194 return !!document.querySelector('[data-markdown]');
195 }
196 },
197 {
198 src: '../plugin/highlight/highlight.js',
199 async: true,
200 condition: function () {
201 return !!document.querySelector('pre code');
202 },
203 callback: function () {
204 hljs.initHighlightingOnLoad();
205 }
206 },
207 {src: '../plugin/zoom-js/zoom.js', async: true},
208 {src: '../plugin/notes/notes.js', async: true}
209 ]
210 });
211
212 </script>
213
214</body>
215</html>
diff --git a/src/a-vision-for-the-future/index.html b/src/a-vision-for-the-future/index.html
new file mode 100644
index 0000000..cc5280b
--- /dev/null
+++ b/src/a-vision-for-the-future/index.html
@@ -0,0 +1,498 @@
1<!doctype html>
2<html lang="en">
3
4 <head>
5 <meta charset="utf-8">
6
7 <title>OpenStack: a vision for the future</title>
8
9 <meta name="author" content="Monty Taylor" />
10
11 <meta name="apple-mobile-web-app-capable" content="yes" />
12 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
13
14 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
15
16 <link rel="stylesheet" href="../css/reveal.min.css">
17 <link rel="stylesheet" href="../css/theme/openstack.css" id="theme">
18
19 <!-- For syntax highlighting -->
20 <link rel="stylesheet" href="../lib/css/zenburn.css">
21
22 <!-- If the query includes 'print-pdf', include the PDF print sheet -->
23 <script>
24 var link = document.createElement('link');
25 link.rel = 'stylesheet';
26 link.type = 'text/css';
27 link.href =
28 window.location.search.match(/print-pdf/gi) ? '../css/print/pdf.css' :
29 '../css/print/paper.css';
30 document.getElementsByTagName('head')[0].appendChild(link);
31 </script>
32 </head>
33 <body>
34
35 <div class="reveal"><div class="slides">
36
37 <section data-state="cover">
38
39 <h1><span xmlns:dct="http://purl.org/dc/terms/"
40 href="http://purl.org/dc/dcmitype/InteractiveResource"
41 property="dct:title"
42 rel="dct:type">
43 OpenStack: a vision for the future
44 </span></h1>
45 <h3 xmlns:cc="http://creativecommons.org/ns#"
46 property="cc:attributionName">Monty Taylor</h3>
47 <h4><a xmlns:cc="http://creativecommons.org/ns#"
48 rel="cc:attributionURL"
49 href='http://inaugust.com/talks/a-vision-for-the-future.html'>http://inaugust.com/talks/a-vision-for-the-future.html</a> </h4>
50 <h3> twitter: @e_monty </h3>
51 </section>
52
53 <section>
54 <h1>Stanislavski</h1>
55 </section>
56
57
58 <section>
59 <img src="images/openstack-cloud-software-vertical-large.png" />
60 </section>
61
62 <section id="who-am-i-openstack" class="slide level2">
63 <h1>Who am I?</h1>
64 <img style="float:right; margin-right:24pt" src="images/openstack-cloud-software-vertical-large.png" />
65 <p>Technical Committee</p>
66 <p>Foundation Board of Directors</p>
67 <p>Developer Infrastructure Core Team</p>
68 </section>
69
70
71 <section id="who-am-i-openstack" class="slide level2">
72 <h1>Who am I?</h1>
73 <img style="float:right; margin-right:24pt" src="images/image39.JPG" />
74 <p>Undergrad Degree in Theatre Directing</p>
75 <p>Grad School at CalArts for Lighting Design</p>
76 <p>Member of the Satori Group</p>
77 </section>
78
79
80 <section>
81 <h1>Konstantin Sergeyevich Stanislavsky</h1>
82
83 <h3>Константи́н Серге́евич Станисла́вский</h3>
84 <p class="fragment">Founder of the Moscow Art Theatre</p>
85
86 <p class="fragment">"The task of our generation is to liberate art from outmoded tradition, from tired cliché and to give greater freedom to imagination and creative ability."</p>
87
88 <p class="fragment">Psychological Realism</p>
89 </section>
90
91
92 <section>
93 <h1>Anton Chekhov</h1>
94 <p>The Seagull (1898)</p>
95 <p>Uncle Vanya (1899)</p>
96 <p>The Three Sisters (1901)</p>
97 <p>The Cherry Orchard (1904)</p>
98 </section>
99
100
101 <section>
102 <h1>Moscow Art Theatre</h1>
103
104 <p>Founded in 1897</p>
105
106 <p>popular seat prices</p>
107
108 <p>ensemble ethos</p>
109
110 <p>realistic theatre</p>
111
112
113 </section>
114
115
116 <section>
117 <h1>Verisimilitude</h1>
118
119 <p>the appearance of being true or real</p>
120
121
122 </section>
123
124
125 <section>
126 <h1>Psychology, Physiology and Neurology</h1>
127
128 <p class="fragment">First meeting of International Congress of Psychology - Paris, 1889</p>
129
130 <p class="fragment">Pavlov - Institute of Experimenal Medicine, St. Petersburg, 1891</p>
131
132 <p class="fragment">(the dogs were in 1901)</p>
133
134 <p class="fragment">Freud - Interpretation of Dreams 1899</p>
135
136
137 </section>
138
139
140 <section>
141 <h1>Stanislavski's system</h1>
142
143 <p>psychophisology</p>
144
145 <p>interrelation between mind and body</p>
146
147 <p>Physical Actions and Internal Life are linked</p>
148
149 <p>Most modern theatre, tv and film actors</p>
150
151
152 </section>
153
154
155 <section>
156 <h1>Key ideas</h1>
157
158 <p class="fragment">"What if" (what if I were in the same situtaion as my character)</p>
159
160 <p class="fragment">Motivation (why)</p>
161
162 <p class="fragment">Objectives (what do I want)</p>
163
164 </section>
165
166 <section data-transition="zoom">
167 <h1>Chekhov and Psychological action</h1>
168 </section>
169
170
171 <section data-transition="zoom">
172 <h1>Emotional Memory</h1>
173 </section>
174
175
176 <section data-transition="zoom">
177 <h1>Sense Memory</h1>
178 </section>
179
180
181 <section>
182 <h1>Inside out</h1>
183
184 <p>like using a programming framework</p>
185
186 <p>Express the key points - let the framework handle the details</p>
187
188 <p>Manipulate the emotional life - the body will handle a lot of the details</p>
189
190
191 </section>
192
193
194 <section>
195 <h1><em>An Actor Prepares</em></h1>
196
197 <p>For further reading</p>
198
199
200 </section>
201
202
203 <section>
204 <h1>Lee Strasberg</h1>
205
206 <p class="fragment">Moscow Art Theatre visited the US in 1923</p>
207
208 <p class="fragment">Strasberg == Mind Blown</p>
209
210 <p class="fragment">Dropped out of school and went to study with the Russians</p>
211
212
213 </section>
214
215
216 <section>
217 <h1>The Group Theatre</h1>
218
219 <p>New York - 1931</p>
220
221 <p>Founded by Lee Strassberg, Harold Clurman and Cheryl Crawford</p>
222
223 <p>Not the same as the Group Theatre in London</p>
224
225 <p>Believed in Leaderless Operation and Collaborative Work</p>
226
227
228 </section>
229
230
231 <section>
232 <h1>Sound familiar?</h1>
233 </section>
234
235
236 <section>
237 <h1>The Method</h1>
238
239 <p class="fragment">Strasberg took Stanislavski's system and made a training system</p>
240
241 <p class="fragment">You've probably heard of it</p>
242
243 <p class="fragment">Marlon Brando, Heath Ledger, Philip Seymor Hoffman, Robert DeNiro, Daniel Day-Lewis, Christian Bale, Al Pacino</p>
244
245
246 </section>
247
248
249 <section>
250 <h1>Big differences from Stanislavski</h1>
251
252 <p class="fragment">Emotional Memory becomes Affective Memory</p>
253
254 <p class="fragment">Substitution - What would make me, the actor, behave in the way the character does</p>
255
256
257 </section>
258
259
260 <section>
261 <h1>So I was at this bar ...</h1>
262 </section>
263
264
265 <section>
266 <h1>Clear danger, right?</h1>
267
268 <p>Notice that Heath Ledger and Philip Seymour Hoffman were in the list</p>
269
270 <p>Everyone other than Strasberg walked away from pure-emotional immersion</p>
271
272
273 </section>
274
275
276 <section>
277 <h1>Stanford Meisner</h1>
278
279 <p>Split from Strasberg - thought emotional memory caused actors to focus on themselves and not the character</p>
280
281 <p>Concentration on the parter instead</p>
282
283 <p>live truthfully under imaginary circumstances</p>
284
285 </section>
286
287
288 <section>
289 <h1>Stella Adler</h1>
290
291 <p>Broke with Strasberg after studying with Stanislavski</p>
292
293 <p>Emotion should come from imagination based on given circumstance</p>
294
295
296 </section>
297
298
299 <section>
300 <h1>Uta Hagen</h1>
301
302 <p>Another split</p>
303
304 <p>Basic Object Exercises</p>
305
306 <p>Start by doing mundane things in front of people</p>
307
308
309 </section>
310
311
312 <section>
313 <h1>What the heck does this have to do with OpenStack?</h1>
314 </section>
315
316
317 <section>
318 <h1>All of these people shared a purpose</h1>
319
320 <p class="fragment">To create truth in realistic acting</p>
321
322
323 </section>
324
325
326 <section>
327 <h1>All of these people both shared approaches and diverged substantially</h1>
328
329 <p class="fragment">"What would I do if I were in this circumstance"</p>
330
331 <p class="fragment">"What would motivate me, the actor, to behave in the way the character does?"</p>
332
333
334 </section>
335
336
337 <section>
338 <h1>Tadashi Suzuki</h1>
339 </section>
340
341
342 <section>
343 <h1>The Feet</h1>
344
345 <p class="fragment">connection to the ground</p>
346 <p class="fragment">outside in</p>
347 <p class="fragment">Truth from Physicality, not from Psychological realism</p>
348 </section>
349
350
351 <section>
352 <h1>The Trojan Women</h1>
353
354 <p>Drew from Noh, Kabuki and Shingeki tranditions</p>
355
356 <p>Produce a thing that is "true" to a modern Japanese sensibility</p>
357
358 <p>Training arose from the need to train replacement actors for the show</p>
359
360
361 </section>
362
363
364 <section>
365 <h1>SITI Company</h1>
366
367 <p>Suzuki collaborated with Anne Bogart</p>
368
369 <p>Added Anne Bogart's Viewpoints to Suzuki's techniques</p>
370
371
372 </section>
373
374
375 <section>
376 <h1>P3</h1>
377
378 <p>Robyn Hunt and Steve Pearson studied for 12 year in Japan with Suzuki</p>
379
380 <p>Moved back to US to teach the techniques</p>
381
382 <p>Added Shogo Ohta's slow-tempo techniques</p>
383
384
385 </section>
386
387
388 <section>
389 <h1>Frank</h1>
390
391 <p>Here in Brisbane</p>
392
393 <p>Studied with Suzuki - Added Australian content and form</p>
394
395 <p>Exercies to Nick Cave instead of Japanese Flute</p>
396
397 </section>
398
399
400 <section>
401 <h1>The training is a tool</h1>
402
403 <p>An actor might study all of them</p>
404 <p>Each technique can be useful for different things</p>
405
406
407 </section>
408
409 <section>
410 <h1>Shakespeare</h1>
411 <p>Each of these directors has applied their techniques to Shakespeare</p>
412 </section>
413
414 <section>
415 <h1>They're all useful tools for different hings</h1>
416 </section>
417
418
419 <section>
420 <h1>Why all this talk about acting techniques?</h1>
421 </section>
422
423
424 <section>
425 <h1>Four takeaways from the actors</h1>
426 <p class="fragment">Know what problem they're trying to solve</p>
427 <p class="fragment">Develop techniques to solve the problem</p>
428 <p class="fragment">Don't confuse technique with results</p>
429 <p class="fragment">Be willing to adapt based on new data</p>
430 </section>
431
432
433 <section>
434 <h1>The problem</h1>
435 <p class="fragment">Are we chasing psycological realism?</p>
436 <p class="fragment">Are we chasing physical truth?</p>
437 </section>
438
439
440 <section>
441 <h1>The problem for us</h1>
442 <p class="fragment">Are we making a toolkit for people to use to build clouds?</p>
443 <p class="fragment">Are we making a cloud that can be deployed in multiple places?</p>
444 <p class="fragment">Are we providing computers?</p>
445 </section>
446
447 <section>
448 <h1>What I want</h1>
449 </section>
450
451 <section data-transition='zoom'>
452 <h1>OpenStack should provide computers and networks that work</h1>
453 </section>
454
455 <section data-transition='zoom'>
456 <h1>OpenStack should not chase 12-factor apps</h1>
457 </section>
458
459 <section data-transition='zoom'>
460 <h1>OpenStack should provide a happy home for app frameworks</h1>
461 </section>
462
463 <section data-transition='zoom'>
464 <h1>OpenStack should, by default, give me a directly routable IP</h1>
465 </section>
466
467 <section>
468 <h1> Thank you! </h1>
469 <h4> <a href='http://inaugust.com/talks/a-vision-for-the-future.html'>http://inaugust.com/talks/a-vision-for-the-future.html</a> </h4>
470 <h3> twitter: @e_monty </h3>
471 </section>
472
473 </div>
474 <div class="footer">
475 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
476 <img alt="Creative Commons License"
477 style="border-width:0"
478 src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
479 </a><br />
480 Licensed under a
481 <a rel="license"
482 href="http://creativecommons.org/licenses/by/4.0/">
483 Creative Commons Attribution 4.0 International License
484 </a>.
485 <br />
486 Source code available at <a href='http://git.inaugust.com/cgit/mordred-talks'>http://git.inaugust.com/cgit/mordred-talks</a>
487 </div>
488
489 </div>
490
491 <script src="../lib/js/head.min.js"></script>
492 <script src="../js/reveal.min.js"></script>
493
494 <script src="../js/this.js"></script>
495
496 </body>
497</html>
498
diff --git a/src/index.hbs b/src/index.hbs
index c5cbc93..97114c7 100644
--- a/src/index.hbs
+++ b/src/index.hbs
@@ -3,11 +3,11 @@
3 3
4<head> 4<head>
5 <meta charset="utf-8"> 5 <meta charset="utf-8">
6 <title>Convention Presentations</title> 6 <title>Conference Talks</title>
7 <link rel="stylesheet" 7 <link rel="stylesheet"
8 href="css/bootstrap.css"> 8 href="css/bootstrap.css">
9 <meta name="description" 9 <meta name="description"
10 content="Convention Presentations by {{author.name}}"> 10 content="Conference Talks by {{author.name}}">
11 <meta name="author" content="{{author.name}}"> 11 <meta name="author" content="{{author.name}}">
12 <meta name="viewport" 12 <meta name="viewport"
13 content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui"> 13 content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
@@ -16,7 +16,7 @@
16<body style="margin-top: 70px; margin-bottom: 70px"> 16<body style="margin-top: 70px; margin-bottom: 70px">
17<nav class="navbar navbar-default navbar-fixed-top"> 17<nav class="navbar navbar-default navbar-fixed-top">
18 <div class="container-fluid"> 18 <div class="container-fluid">
19 <span class="navbar-brand">Convention Presentations</span> 19 <span class="navbar-brand">Conference Talks</span>
20 </div> 20 </div>
21</nav> 21</nav>
22<div class="container-fluid"> 22<div class="container-fluid">
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 04:46:12 +0000