Merge branch 'whats_new'

Greg Turnquist · Greg Turnquist · commit 7cf603f7d2bc · 2010-11-03T17:15:53.000-05:00
diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2'
+release = '1.2.0.RC1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst
@@ -13,6 +13,7 @@ Contents:
    :maxdepth: 10
 
    overview
+   whats-new
    objects
    aop
    dao
diff --git a/docs/sphinx/source/remoting.rst b/docs/sphinx/source/remoting.rst
@@ -204,7 +204,7 @@ To do the same configuration as shown above looks like this::
   # Call the service just you did in the original, simplified version.
   print service.get_data("Hello")
 
-Against, you can override the hostname/port values as well::
+Again, you can override the hostname/port values as well::
 
   # ...
   # Export it via Pyro using Spring Python's utility classes
@@ -369,14 +369,16 @@ This shows one instance of Python running the client, connecting to the instance
 of Python hosting the server module. After that, moving these scripts to other
 machines only requires changing the hostname in the XML files.
 
+.. _pyro4:
+
 New support for Pyro 4
 ++++++++++++++++++++++
 
 Pyro has recently released a beta version of its overhauled API labeled *Pyro 4*. This release of Spring Python includes support for it. The only changes you will need to make are:
 
-- replace *springpython.remoting.pyro.PyroProxyFactory* with *springpython.remoting.pyro.Pyro4ProxyFactory*
-- replace *springpython.remoting.pyro.PyroServiceExporter* with *springpython.remoting.pyro.Pyro4ServiceExporter*
-- replace any URI entries of *PYROLOC:<hostname>:<port>/<service_name>* with *PYRO:<service_name>@<host>:<port>*
+- replace **springpython.remoting.pyro.PyroProxyFactory** with **springpython.remoting.pyro.Pyro4ProxyFactory**
+- replace **springpython.remoting.pyro.PyroServiceExporter** with **springpython.remoting.pyro.Pyro4ServiceExporter**
+- replace any URI entries of **PYROLOC:<hostname>:<port>/<service_name>** with **PYRO:<service_name>@<host>:<port>**
 
 .. note::
 
diff --git a/docs/sphinx/source/whats-new.rst b/docs/sphinx/source/whats-new.rst
@@ -0,0 +1,14 @@
+What's new in Spring Python |version|
+=====================================
+
+Spring Python |version| has some new features.
+
+New Features
+++++++++++++
+
+Spring Python |version| has added support for:
+
+* :ref:`New support for Pyro 4 <pyro4>` - Since the beginning, Spring Python has provided seamless remoting by integration with Pyro. We now have support for Pyro 4.
+* :ref:`Secure XML-RPC <remoting-secure-xml-rpc>` - Python provides out-of-the-box XML-RPC capabilities. This extra module makes it easy to export existing services using this capability while also enabling you to encrypt the tunnel.
+
+There have also been bug fixes. For the most part there is little impact to the core API of Spring Python. This means that the material in the book Spring Python 1.1 is valid. It just doesn't document the new features listed above.
diff --git a/springpython.properties b/springpython.properties
@@ -1,5 +1,6 @@
 # Collection of properties involved in managing Spring Python testing and packaging.
 
+# Don't forget to update docs/sphinx/source/conf.py's version properties.
 version=1.2.0
 natural.name=se-springpython-py
 project.key=EXTPY
