Misc cleanup/fixes.

README.md

@@ -50,12 +50,13 @@ There are three ways to start the cogserver: from a bash shell prompt
 (as a stand-alone process), from the guile command line, or from the
 python command line.
 
-* From bash, just start the process: `$ build/opencog/cogserver/server`
+* From bash, just start the process:
+  `$ build/opencog/cogserver/server/cogserver`
 
 * From guile: `(use-modules (opencopg cogserver)) (start-cogserver)`
 
 * From python: `import opencog.cogserver` and then
-   `??? start cogserver ???` (where's the documentation for this?)
+   `??? start_cogserver() ???` (where's the documentation for this?)
 
 Once started, one can obtain a shell by saying `rlwrap telnet localhost
 17001`, and then `py` or `scm` to obtain a python or scheme shell.  This
@@ -117,7 +118,7 @@ Architecture
 ------------
 See also these README's:
 
-* [network/README](opencog/cogserver/network/README.md)
+* [network/README](opencog/network/README.md)
 * [cogserver/README](opencog/cogserver/server/README.md)
 * [builtin-module/README](opencog/cogserver/modules/commands/README.md)
 * [cython/README](opencog/cython/README.md)

opencog/cython/README.md

@@ -1,5 +1,5 @@
-Python bindings for OpenCog
----------------------------
+Cogserver Python Interface
+--------------------------
 
 ## Requirements ##
 
@@ -23,6 +23,15 @@ Currently the package structure looks like this:
  opencog.cogserver
 ```
 
+Start the cogserver by saying:
+```
+ import opencog.cogserver
+ something...something (???)
+ start_cogserver() (???)
+```
+Something is wrong with the above documentation. Can an experienced
+python user help figure out the stuff above?
+
 ## Tutorial ##
 
 The OpenCog wiki contains the Python tutorial:

opencog/cython/setup.py

@@ -14,7 +14,7 @@
 # for OSX:
 #opencog_library_dir = "/opt/local/lib/opencog"
 # for non-installed build:
-#opencog_library_dir = "../../bin/opencog/atomspace",
+#opencog_library_dir = "../../build/opencog/cogserver/server",
 
 # Utility function to read the README file.
 # Used for the long_description.  It's nice, because now 1) we have a top level
@@ -27,16 +27,16 @@ def read(fname):
 
 # This extension stuff should use info from CMake somehow...
 ext = Extension(
-    "opencog",                 # name of extension
+    "cogserver",                 # name of extension
     define_macros = [('MAJOR_VERSION', '0'),
                      ('MINOR_VERSION', '1')],
-    sources=["opencog.pyx"],     # filename of our Cython source
+    sources=["cogserver.pyx"],   # filename of our Cython source
     language="c++",              # this causes Cython to create C++ source
 
     include_dirs=[".", # needed to find local pyx/pxd files
         "../..",       # to support building in source directory
         "/usr/local/include", # For local includes
-        "/opt/local/include" # For MacPorts
+        "/opt/local/include"  # For MacPorts
         ],
     libraries=["stdc++",
         "boost_system-mt","boost_thread-mt", # boost dependencies
@@ -71,20 +71,17 @@ def read(fname):
     )
 
 setup(name = 'pyopencog',
-    description = 'OpenCog Python bindings',
+    description = 'Python Cogserver',
     author = 'Joel Pitt',
     author_email = 'joel@opencog.org',
     url = 'http://wiki.opencog.org/w/Python',
     long_description = read('README'),
     version = '0.1',
     classifiers=[
-        "Development Status :: 3 - Alpha",
-        #"Development Status :: 4 - Beta",
+        "Development Status :: 5 - Release",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
         "License :: OSI Approved :: GNU Affero General Public License v3",
     ],
     cmdclass = {'build_ext': build_ext},
     ext_modules = [ext, helper_ext]
     )
-
-