--- a/docs/reference/tmpl/lm-error.sgml	Mon Oct 13 16:45:30 2003 +0000
+++ b/docs/reference/tmpl/lm-error.sgml	Tue Nov 11 12:20:16 2003 +0000
@@ -28,7 +28,7 @@
 </para>
 
 @LM_ERROR_CONNECTION_NOT_OPEN: Connection not open when trying to send a message
-@LM_ERROR_CONNECTION_OPEN: Connection is already open when trying to open it again. 
+@LM_ERROR_CONNECTION_OPEN: Connection is already open when trying to open it again.
 @LM_ERROR_AUTH_FAILED: Authentication failed while opening connection
 
 <!-- ##### MACRO LM_ERROR ##### -->

--- a/docs/reference/tmpl/lm-message.sgml	Mon Oct 13 16:45:30 2003 +0000
+++ b/docs/reference/tmpl/lm-message.sgml	Tue Nov 11 12:20:16 2003 +0000
@@ -15,11 +15,13 @@
 
 </para>
 
-<!-- ##### TYPEDEF LmMessage ##### -->
+<!-- ##### STRUCT LmMessage ##### -->
 <para>
 Struct 
 </para>
 
+@node: 
+@priv: 
 
 <!-- ##### ENUM LmMessageType ##### -->
 <para>
@@ -39,8 +41,8 @@
 </para>
 
 @LM_MESSAGE_SUB_TYPE_NOT_SET: the default. No "type" attribute will be sent.
+@LM_MESSAGE_SUB_TYPE_AVAILABLE: presence is available, applies to message type "presence"
 @LM_MESSAGE_SUB_TYPE_NORMAL: 
-@LM_MESSAGE_SUB_TYPE_AVAILABLE: presence is available, applies to message type "presence"
 @LM_MESSAGE_SUB_TYPE_CHAT: message is a chat message, applies to message type "message"
 @LM_MESSAGE_SUB_TYPE_GROUPCHAT: message is a group chat message, applies to message type "message"
 @LM_MESSAGE_SUB_TYPE_HEADLINE: message is a headline message, applies to message type "message"

--- a/python/loudmouth.pyx	Mon Oct 13 16:45:30 2003 +0000
+++ b/python/loudmouth.pyx	Tue Nov 11 12:20:16 2003 +0000
@@ -198,7 +198,7 @@
     else:
         function(conn, success)    
     
-cdef class Connection:
+cdef class _Connection:
     cdef LmConnection *conn
     
     def __init__(self, server=None, _create=1):
@@ -355,7 +355,7 @@
     def unregister_message_handler(self, handler, type, notify):
         pass
 
-cdef class Message:
+cdef class _Message:
     cdef LmMessage *msg
     def __init__ (self, to, type, sub_type=None, _create=1):