Merging in ipython-ipython1b branch. This branch was used to merge in the docs from ipython1-dev,

as well as the stuff from the ipython1-sconfig branch.  In addition to simply merging the docs
from ipython1-dev, I have completely reorganized the docs to make the easier to read and write.

setup.py

@@ -88,18 +88,23 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
                   "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
                  ]
 
+    # Only build the docs is sphinx is present
     try:
         import sphinx
     except ImportError:
         pass
     else:
+        pass
+        # BEG: This is disabled as I am not sure what to depend on.
+        # I actually don't think we should be automatically building
+        # the docs for people.
         # The do_sphinx scripts builds html and pdf, so just one
         # target is enough to cover all manual generation
-        to_update.append(
-            ('doc/manual/ipython.pdf',
-            ['IPython/Release.py','doc/source/ipython.rst'],
-            "cd doc && python do_sphinx.py")
-        )
+        # to_update.append(
+        #     ('doc/manual/ipython.pdf',
+        #     ['IPython/Release.py','doc/source/ipython.rst'],
+        #     "cd docs && python do_sphinx.py")
+        # )
     [ target_update(*t) for t in to_update ]
 
 #---------------------------------------------------------------------------

setupbase.py

@@ -148,19 +148,15 @@ def find_data_files():
     # We only need to exclude from this things NOT already excluded in the
     # MANIFEST.in file.
     exclude     = ('.sh','.1.gz')
-    docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
-    examfiles   = filter(isfile, glob('doc/examples/*.py'))
-    manfiles    = filter(isfile, glob('doc/manual/*'))
-    manstatic   = filter(isfile, glob('doc/manual/_static/*'))
-    manpages    = filter(isfile, glob('doc/*.1.gz'))
-    scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
-                                  'scripts/irunner'])
+    # We need to figure out how we want to package all of our rst docs?
+    # docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('docs/*'))
+    examfiles   = filter(isfile, glob('docs/examples/core/*.py'))
+    examfiles.append(filter(isfile, glob('docs/examples/kernel/*.py')))
+    manpages    = filter(isfile, glob('docs/man/*.1.gz'))
     igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
     
-    data_files = [('data', docdirbase, docfiles),
+    data_files = [#('data', docdirbase, docfiles),
                  ('data', pjoin(docdirbase, 'examples'),examfiles),
-                 ('data', pjoin(docdirbase, 'manual'),manfiles),
-                 ('data', pjoin(docdirbase, 'manual/_static'),manstatic),
                  ('data', manpagebase, manpages),
                  ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
                  ]