Merge pull request #56 from reebalazs/gh-pages

Presentation title change of Chris McDonogh
rupyconf · Oct 6, 2013 · c33043e · c33043e
2 parents 7a50a8e + ab345f7
commit c33043e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -898,7 +898,7 @@ <h3>
                   <td>14.10</td>
                   <td>
                     <p>
-                    Pyramid
+                    Substance D: Build Civilized Web Applications
                     </p>
                     <p class="author">
                     Chris McDonough
@@ -2894,13 +2894,15 @@ <h3>Chris McDonough</h3>
         <div class="tab-pane talk">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal">&times;</button>
-            <h3>Pyramid</h3>
+            <h3>Substance D: Build Civilized Web Applications</h3>
             <div class="tagline">Chris McDonough</div>
           </div>
 
           <div class="modal-body">
             <p>
-            This talk with likely be about some aspect of the Pyramid web framework.
+              Substance D is a new Python web application server that can be used to 
+              build content management systems, intranets, and bespoke applications.
+              It features a management UI, undo, and other useful doodads.
             </p>
           </div>
         </div>