Bringing in upstream changes

1 files changed, 5 insertions, 5 deletions

diff --git a/README.html b/README.html
index 690a90d..20276de 100644
--- a/README.html
+++ b/README.html
@@ -49,13 +49,13 @@ pre {
 <h1><img src="images/io2012_logo.png"> HTML5 Slide Template</h1>
 
 <h2>Configuring the slides</h2>
-<p>Much of the deck is customized by changing the settings in <a href="slide_config.json"><code>slide_config.json</code></a>.
+<p>Much of the deck is customized by changing the settings in <a href="slide_config.js"><code>slide_config.js</code></a>.
 Some of the customizations include the title, Analytics tracking ID, speaker
 information (name, social urls, blog), web fonts to load, themes, and other
 general behavior.</p>
-<h3>Customizing the <code>#io2012</code> hash</h3>
-<p>The bottom of the slides include <code>#io2012</code> by default. If you'd like to change
-this, please update the variable <code>$social-tags: '#io2012';</code> in
+<h3>Customizing the <code>#io12</code> hash</h3>
+<p>The bottom of the slides include <code>#io12</code> by default. If you'd like to change
+this, please update the variable <code>$social-tags: '#io12';</code> in
 <a href="theme/scss/default.scss"><code>/theme/scss/default.scss</code></a>.</p>
 <p>See the next section on "Editing CSS" before you go editing things.</p>
 <h2>Editing CSS</h2>
@@ -102,4 +102,4 @@ from a popup window.</p>
 <p>To disable presenter mode, hit <a href="http://localhost:8000/template.html?presentme=false">http://localhost:8000/template.html?presentme=false</a></p>
 <p>Presenter mode is sticky, so refreshing the page will persist your settings.</p>
 <hr />
-<p>That's all she wrote!</p>
\ No newline at end of file
+<p>That's all she wrote!</p>