# HG changeset patch
# User cat@eee
# Date 1266516495 18000
# Node ID 18e8487be0957f23ffe6296ece66b3c291af3c1e
# Parent  3d74a2887a86ce24422c17c98eeccedfae6a7ddd
try again to upload docs

diff -r 3d74a2887a86 -r 18e8487be095 docs/pycon2010/pycon2010.rst
--- a/docs/pycon2010/pycon2010.rst	Thu Feb 18 01:32:56 2010 -0500
+++ b/docs/pycon2010/pycon2010.rst	Thu Feb 18 13:08:15 2010 -0500
@@ -15,16 +15,16 @@
 =======
 
 .. image:: web-2-0-logos.gif
-   :height: 300px
+   :height: 250px
    
 But first...
 ============
 
 .. image:: sargon.jpg
-   :height: 300px
+   :height: 250px
 
 .. image:: akkad.png
-   :height: 300px
+   :height: 250px
    
 Sargon the Great
   Founder of Akkadian Empire
@@ -35,7 +35,7 @@
 ==========
 
 .. image:: apple.jpg
-   :height: 300px
+   :height: 250px
  
 Command-Line Interface
   Unlike the Akkadian Empire, 
@@ -67,16 +67,12 @@
 != Command Line Utilities
 =========================
 
+(``ls``, ``grep``, ``ping``, etc.)
+
 1. Accepts arguments at invocation
 2. executes
 3. terminates
 
-Examples
---------
-* ls
-* grep
-* ping
-
 Use ``sys.argv``, ``optparse``
 
 != "Text User Interfaces", "Consoles"
@@ -86,7 +82,7 @@
 * I/O is *not* line-by-line
 
 .. image:: urwid.png
-   :height: 300px
+   :height: 250px
    
 Use ``curses``, ``urwid``
 
@@ -94,7 +90,7 @@
 ==========
 
 .. image:: strategy.png
-   :height: 300px
+   :height: 250px
    
 A ``cmd`` app: pirate.py
 ========================
@@ -146,7 +142,7 @@
 =====
 
 .. image:: hook.jpeg
-   :height: 300px
+   :height: 250px
 
 Hooks: pirate3.py
 =================
@@ -213,7 +209,7 @@
 ====
 
 .. image:: schematic.png
-   :height: 300px
+   :height: 250px
 
 Absolutely free
 ===============
@@ -280,15 +276,25 @@
             separator = ' '
         chant = separator.join(chant)
         print('{0} and a bottle of {1}'.format(chant, arg))
-        
-sqlpython
-=========
+
+Serious example: sqlpython
+==========================
+
+``cmd``-based app by Luca Canali @ CERN
+
+Replacement for Oracle SQL/*Plus
+
+Now ``cmd2``-based; postgreSQL; MySQL
 
-Created by Luca Canali @ CERN
+sqlpython features
+==================
+
+Everything in ``cmd2``
 
-``cmd``-based Replacement for Oracle SQL/*Plus
+Multi connections
+
+ls, grep
+
+Output to html, csv, inserts, bar graphs
 
 
-
-
-