*** empty log message ***

3 files changed, 335 insertions, 116 deletions

diff --git a/docs/reference/lasso-sections.txt b/docs/reference/lasso-sections.txt
index 563f4701..222f68e1 100644
--- a/docs/reference/lasso-sections.txt
+++ b/docs/reference/lasso-sections.txt
@@ -511,12 +511,18 @@ LASSO_SAMLP_STATUS_CODE_GET_CLASS
 <FILE>xml</FILE>
 LassoNodePrivate
 <TITLE>LassoNode</TITLE>
-lassoUrlEncodeSignMethod
+lassoSignatureMethod
 LassoNode
 LassoNodeClass
 lasso_node_new
-lasso_node_build_query
+lasso_node_new_from_dump
+lasso_node_new_from_xmlNode
+lasso_node_copy
 lasso_node_dump
+lasso_node_export
+lasso_node_export_to_base64
+lasso_node_export_to_query
+lasso_node_export_to_soap
 lasso_node_get_attr
 lasso_node_get_attr_value
 lasso_node_get_attrs
@@ -524,10 +530,8 @@ lasso_node_get_child
 lasso_node_get_children
 lasso_node_get_content
 lasso_node_get_name
-lasso_node_parse_memory
+lasso_node_import
 lasso_node_rename_prop
-lasso_node_serialize
-lasso_node_url_encode
 lasso_node_verify_signature
 <SUBSECTION Standard>
 LASSO_NODE
@@ -546,7 +550,7 @@ LassoLibLogoutRequest
 LassoLibLogoutRequestClass
 lasso_lib_logout_request_new
 lasso_lib_logout_request_set_consent
-lasso_lib_logout_request_set_providerId
+lasso_lib_logout_request_set_providerID
 lasso_lib_logout_request_set_relayState
 lasso_lib_logout_request_set_sessionIndex
 lasso_lib_logout_request_set_nameIdentifier
@@ -673,8 +677,6 @@ LassoLibRegisterNameIdentifierRequestClass
 lasso_lib_register_name_identifier_request_new
 lasso_lib_register_name_identifier_request_set_relayState
 lasso_lib_register_name_identifier_request_set_providerID
-lasso_lib_register_name_identifier_request_update_nameIdentifiers
-lasso_lib_register_name_identifier_request_restore_nameIdentifiers
 lasso_lib_register_name_identifier_request_set_idpProvidedNameIdentifier
 lasso_lib_register_name_identifier_request_set_oldProvidedNameIdentifier
 lasso_lib_register_name_identifier_request_set_spProvidedNameIdentifier
@@ -810,6 +812,40 @@ LASSO_LIB_AUTHENTICATION_STATEMENT_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>soap-env_body</FILE>
+<TITLE>LassoSoapEnvBody</TITLE>
+LassoSoapEnvBody
+LassoSoapEnvBodyClass
+lasso_soap_env_body_new
+lasso_soap_env_body_add_child
+<SUBSECTION Standard>
+LASSO_SOAP_ENV_BODY
+LASSO_IS_SOAP_ENV_BODY
+LASSO_TYPE_SOAP_ENV_BODY
+lasso_soap_env_body_get_type
+LASSO_SOAP_ENV_BODY_CLASS
+LASSO_IS_SOAP_ENV_BODY_CLASS
+LASSO_SOAP_ENV_BODY_GET_CLASS
+</SECTION>
+ 
+<SECTION>
+<FILE>soap-env_envelope</FILE>
+<TITLE>LassoSoapEnvEnvelope</TITLE>
+LassoSoapEnvEnvelope
+LassoSoapEnvEnvelopeClass
+lasso_soap_env_envelope_new
+lasso_soap_env_envelope_set_body
+<SUBSECTION Standard>
+LASSO_SOAP_ENV_ENVELOPE
+LASSO_IS_SOAP_ENV_ENVELOPE
+LASSO_TYPE_SOAP_ENV_ENVELOPE
+lasso_soap_env_envelope_get_type
+LASSO_SOAP_ENV_ENVELOPE_CLASS
+LASSO_IS_SOAP_ENV_ENVELOPE_CLASS
+LASSO_SOAP_ENV_ENVELOPE_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>export</FILE>
 extern
 </SECTION>
@@ -834,49 +870,216 @@ LASSO_VERSION_INFO
 </SECTION>
 
 <SECTION>
-<FILE>single_sign_on_and_federation</FILE>
+<FILE>protocols</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>federation_termination_notification</FILE>
+<TITLE>LassoFederationTerminationNotification</TITLE>
+LassoFederationTerminationNotification
+LassoFederationTerminationNotificationClass
+lasso_federation_termination_notification_new
+lasso_federation_termination_notification_new_from_query
+lasso_federation_termination_notification_new_from_soap
+<SUBSECTION Standard>
+LASSO_FEDERATION_TERMINATION_NOTIFICATION
+LASSO_IS_FEDERATION_TERMINATION_NOTIFICATION
+LASSO_TYPE_FEDERATION_TERMINATION_NOTIFICATION
+lasso_federation_termination_notification_get_type
+LASSO_FEDERATION_TERMINATION_NOTIFICATION_CLASS
+LASSP_IS_FEDERATION_TERMINATION_NOTIFICATION_CLASS
+LASSO_FEDERATION_TERMINATION_NOTIFICATION_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>authn_request</FILE>
+<TITLE>LassoAuthnRequest</TITLE>
+lasso_authn_request_get_protocolProfile
 lassoAuthnRequest
+LassoAuthnRequestClass
+lasso_authn_request_new
+lasso_authn_request_new_from_query
+lasso_authn_request_set_requestAuthnContext
+lasso_authn_request_set_scoping
+<SUBSECTION Standard>
+LASSO_AUTHN_REQUEST
+LASSO_IS_AUTHN_REQUEST
+LASSO_TYPE_AUTHN_REQUEST
+lasso_authn_request_get_type
+LASSO_AUTHN_REQUEST_CLASS
+LASSP_IS_AUTHN_REQUEST_CLASS
+LASSO_AUTHN_REQUEST_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>authn_response</FILE>
+<TITLE>LassoAuthnResponse</TITLE>
 lassoAuthnResponse
-lassoRequest
-lassoResponse
-lasso_authn_request_create
-lasso_authn_response_create
-lasso_authn_response_init
-lasso_authn_response_add_assertion
-lasso_assertion_build
-lasso_assertion_add_authenticationStatement
-lasso_authentication_statement_build
-lasso_request_create
-lasso_response_create
-lasso_response_add_assertion
-lasso_response_init
+LassoAuthnResponseClass
+lasso_authn_response_new_from_dump
+lasso_authn_response_new_from_export
+lasso_authn_response_new_from_request_query
+lasso_authn_response_must_authenticate
+lasso_authn_response_process_authentication_result
+lasso_authn_response_verify_signature
+<SUBSECTION Standard>
+LASSO_AUTHN_RESPONSE
+LASSO_IS_AUTHN_RESPONSE
+LASSO_TYPE_AUTHN_RESPONSE
+lasso_authn_response_get_type
+LASSO_AUTHN_RESPONSE_CLASS
+LASSP_IS_AUTHN_RESPONSE_CLASS
+LASSO_AUTHN_RESPONSE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>protocols</FILE>
+<FILE>logout_request</FILE>
+<TITLE>LassoLogoutRequest</TITLE>
+LassoLogoutRequest
+LassoLogoutRequestClass
+lasso_logout_request_new
+lasso_logout_request_new_from_query
+lasso_logout_request_new_from_soap
+<SUBSECTION Standard>
+LASSO_LOGOUT_REQUEST
+LASSO_IS_LOGOUT_REQUEST
+LASSO_TYPE_LOGOUT_REQUEST
+lasso_logout_request_get_type
+LASSO_LOGOUT_REQUEST_CLASS
+LASSP_IS_LOGOUT_REQUEST_CLASS
+LASSO_LOGOUT_REQUEST_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>federation_termination_notification</FILE>
-lasso_build_full_federationTerminationNotification
-lasso_build_federationTerminationNotification
+<FILE>logout_response</FILE>
+<TITLE>LassoLogoutResponse</TITLE>
+LassoLogoutResponse
+LassoLogoutResponseClass
+lasso_logout_response_new
+lasso_logout_response_new_from_dump
+lasso_logout_response_new_from_query
+lasso_logout_response_new_from_request_query
+lasso_logout_response_new_from_request_soap
+lasso_logout_response_new_from_soap
+<SUBSECTION Standard>
+LASSO_LOGOUT_RESPONSE
+LASSO_IS_LOGOUT_RESPONSE
+LASSO_TYPE_LOGOUT_RESPONSE
+lasso_logout_response_get_type
+LASSO_LOGOUT_RESPONSE_CLASS
+LASSP_IS_LOGOUT_RESPONSE_CLASS
+LASSO_LOGOUT_RESPONSE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>logout</FILE>
-lassoLogoutRequest
-lassoLogoutResponse
-lasso_logout_request_create
-lasso_logout_response_create
-lasso_logout_response_init
+<FILE>name_identifier_mapping_request</FILE>
+<TITLE>LassoNameIdentifierMappingRequest</TITLE>
+LassoNameIdentifierMappingRequest
+LassoNameIdentifierMappingRequestClass
+lasso_name_identifier_mapping_request_new
+lasso_name_identifier_mapping_request_new_from_query
+lasso_name_identifier_mapping_request_new_from_soap
+<SUBSECTION Standard>
+LASSO_NAME_IDENTIFIER_MAPPING_REQUEST
+LASSO_IS_NAME_IDENTIFIER_MAPPING_REQUEST
+LASSO_TYPE_NAME_IDENTIFIER_MAPPING_REQUEST
+lasso_name_identifier_mapping_request_get_type
+LASSO_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS
+LASSP_IS_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS
+LASSO_NAME_IDENTIFIER_MAPPING_REQUEST_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>register_name_identifier</FILE>
-lasso_build_full_registerNameIdentifierRequest
-lasso_build_registerNameIdentifierRequest
-lasso_build_full_registerNameIdentifierResponse
-lasso_build_registerNameIdentifierResponse
+<FILE>name_identifier_mapping_response</FILE>
+<TITLE>LassoNameIdentifierMappingResponse</TITLE>
+LassoNameIdentifierMappingResponse
+LassoNameIdentifierMappingResponseClass
+lasso_name_identifier_mapping_response_new
+lasso_name_identifier_mapping_response_new_from_dump
+lasso_name_identifier_mapping_response_new_from_query
+lasso_name_identifier_mapping_response_new_from_request_soap
+lasso_name_identifier_mapping_response_new_from_soap
+lasso_name_identifier_mapping_response_new_from_request_query
+<SUBSECTION Standard>
+LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE
+LASSO_IS_NAME_IDENTIFIER_MAPPING_RESPONSE
+LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE
+lasso_name_identifier_mapping_response_get_type
+LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS
+LASSP_IS_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS
+LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>register_name_identifier_request</FILE>
+<TITLE>LassoRegisterNameIdentifierRequest</TITLE>
+LassoRegisterNameIdentifierRequest
+LassoRegisterNameIdentifierRequestClass
+lasso_register_name_identifier_request_new
+lasso_register_name_identifier_request_new_from_query
+lasso_register_name_identifier_request_new_from_soap
+lasso_register_name_identifier_rename_attributes_for_query
+<SUBSECTION Standard>
+LASSO_REGISTER_NAME_IDENTIFIER_REQUEST
+LASSO_IS_REGISTER_NAME_IDENTIFIER_REQUEST
+LASSO_TYPE_REGISTER_NAME_IDENTIFIER_REQUEST
+lasso_register_name_identifier_request_get_type
+LASSO_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS
+LASSP_IS_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS
+LASSO_REGISTER_NAME_IDENTIFIER_REQUEST_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>register_name_identifier_response</FILE>
+<TITLE>LassoRegisterNameIdentifierResponse</TITLE>
+LassoRegisterNameIdentifierResponse
+LassoRegisterNameIdentifierResponseClass
+lasso_register_name_identifier_response_new
+lasso_register_name_identifier_response_new_from_dump
+lasso_register_name_identifier_response_new_from_query
+lasso_register_name_identifier_response_new_from_request_query
+lasso_register_name_identifier_response_new_from_request_soap
+lasso_register_name_identifier_response_new_from_soap
+<SUBSECTION Standard>
+LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE
+LASSO_IS_REGISTER_NAME_IDENTIFIER_RESPONSE
+LASSO_TYPE_REGISTER_NAME_IDENTIFIER_RESPONSE
+lasso_register_name_identifier_response_get_type
+LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS
+LASSP_IS_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS
+LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>assertion</FILE>
+<TITLE>LassoAssertion</TITLE>
+LassoAssertion
+LassoAssertionClass
+lasso_assertion_new
+<SUBSECTION Standard>
+LASSO_ASSERTION
+LASSO_IS_ASSERTION
+LASSO_TYPE_ASSERTION
+lasso_assertion_get_type
+LASSO_ASSERTION_CLASS
+LASSP_IS_ASSERTION_CLASS
+LASSO_ASSERTION_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>authentication_statement</FILE>
+<TITLE>LassoAuthenticationStatement</TITLE>
+LassoAuthenticationStatement
+LassoAuthenticationStatementClass
+lasso_authentication_statement_new
+<SUBSECTION Standard>
+LASSO_AUTHENTICATION_STATEMENT
+LASSO_IS_AUTHENTICATION_STATEMENT
+LASSO_TYPE_AUTHENTICATION_STATEMENT
+lasso_authentication_statement_get_type
+LASSO_AUTHENTICATION_STATEMENT_CLASS
+LASSP_IS_AUTHENTICATION_STATEMENT_CLASS
+LASSO_AUTHENTICATION_STATEMENT_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -897,10 +1100,10 @@ lasso_build_unique_id
 lasso_doc_get_node_content
 lasso_g_ptr_array_index
 lasso_get_current_time
+lasso_query_get_value
 lasso_query_to_dict
 lasso_str_escape
 lasso_str_sign
 lasso_str_unescape
-lasso_str_verify
 </SECTION>
 
diff --git a/docs/reference/lasso.sgml b/docs/reference/lasso.sgml
index 36bb60cc..681d6929 100644
--- a/docs/reference/lasso.sgml
+++ b/docs/reference/lasso.sgml
@@ -1,25 +1,25 @@
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!ENTITY lasso-LassoDsSignature SYSTEM "sgml/ds_signature.sgml">
+<!ENTITY LassoDsSignature SYSTEM "sgml/ds_signature.sgml">
 <!ENTITY LassoLibAssertion SYSTEM "sgml/lib_assertion.sgml">
 <!ENTITY LassoLibAuthnRequest SYSTEM "sgml/lib_authn_request.sgml">
 <!ENTITY LassoLibAuthnResponse SYSTEM "sgml/lib_authn_response.sgml">
-<!ENTITY lasso-LassoLibIDPEntries SYSTEM "sgml/lib_idp_entries.sgml">
-<!ENTITY lasso-LassoLibIDPEntry SYSTEM "sgml/lib_idp_entry.sgml">
-<!ENTITY lasso-LassoLibIDPList SYSTEM "sgml/lib_idp_list.sgml">
+<!ENTITY LassoLibIDPEntries SYSTEM "sgml/lib_idp_entries.sgml">
+<!ENTITY LassoLibIDPEntry SYSTEM "sgml/lib_idp_entry.sgml">
+<!ENTITY LassoLibIDPList SYSTEM "sgml/lib_idp_list.sgml">
 <!ENTITY LassoLibRequestAuthnContext SYSTEM "sgml/lib_request_authn_context.sgml">
 <!ENTITY LassoLibScoping SYSTEM "sgml/lib_scoping.sgml">
 <!ENTITY LassoSamlAdvice SYSTEM "sgml/saml_advice.sgml">
 <!ENTITY LassoSamlAssertion SYSTEM "sgml/saml_assertion.sgml">
-<!ENTITY lasso-LassoSamlAudienceRestrictionCondition SYSTEM "sgml/saml_audience_restriction_condition.sgml">
-<!ENTITY lasso-LassoSamlAuthenticationStatement SYSTEM "sgml/saml_authentication_statement.sgml">
-<!ENTITY lasso-LassoSamlAuthorityBinding SYSTEM "sgml/saml_authority_binding.sgml">
-<!ENTITY lasso-LassoSamlConditionAbstract SYSTEM "sgml/saml_condition_abstract.sgml">
-<!ENTITY lasso-LassoSamlConditions SYSTEM "sgml/saml_conditions.sgml">
+<!ENTITY LassoSamlAudienceRestrictionCondition SYSTEM "sgml/saml_audience_restriction_condition.sgml">
+<!ENTITY LassoSamlAuthenticationStatement SYSTEM "sgml/saml_authentication_statement.sgml">
+<!ENTITY LassoSamlAuthorityBinding SYSTEM "sgml/saml_authority_binding.sgml">
+<!ENTITY LassoSamlConditionAbstract SYSTEM "sgml/saml_condition_abstract.sgml">
+<!ENTITY LassoSamlConditions SYSTEM "sgml/saml_conditions.sgml">
 <!ENTITY LassoSamlNameIdentifier SYSTEM "sgml/saml_name_identifier.sgml">
 <!ENTITY LassoSamlStatementAbstract SYSTEM "sgml/saml_statement_abstract.sgml">
 <!ENTITY LassoSamlSubject SYSTEM "sgml/saml_subject.sgml">
 <!ENTITY LassoSamlSubjectConfirmation SYSTEM "sgml/saml_subject_confirmation.sgml">
-<!ENTITY lasso-LassoSamlSubjectLocality SYSTEM "sgml/saml_subject_locality.sgml">
+<!ENTITY LassoSamlSubjectLocality SYSTEM "sgml/saml_subject_locality.sgml">
 <!ENTITY LassoSamlSubjectStatementAbstract SYSTEM "sgml/saml_subject_statement_abstract.sgml">
 <!ENTITY LassoSamlpRequestAbstract SYSTEM "sgml/samlp_request_abstract.sgml">
 <!ENTITY LassoSamlpResponse SYSTEM "sgml/samlp_response.sgml">
@@ -27,103 +27,105 @@
 <!ENTITY LassoSamlpStatus SYSTEM "sgml/samlp_status.sgml">
 <!ENTITY LassoSamlpStatusCode SYSTEM "sgml/samlp_status_code.sgml">
 <!ENTITY LassoNode SYSTEM "sgml/xml.sgml">
-<!ENTITY lasso-LassoLibLogoutRequest SYSTEM "sgml/lib_logout_request.sgml">
-<!ENTITY lasso-LassoLibFederationTerminationNotification SYSTEM "sgml/lib_federation_termination_notification.sgml">
-<!ENTITY lasso-LassoLibIDPProvidedNameIdentifier SYSTEM "sgml/lib_idp_provided_name_identifier.sgml">
-<!ENTITY lasso-LassoLibLogoutResponse SYSTEM "sgml/lib_logout_response.sgml">
-<!ENTITY lasso-LassoLibNameIdentifierMappingRequest SYSTEM "sgml/lib_name_identifier_mapping_request.sgml">
-<!ENTITY lasso-LassoLibNameIdentifierMappingResponse SYSTEM "sgml/lib_name_identifier_mapping_response.sgml">
-<!ENTITY lasso-LassoLibOLDProvidedNameIdentifier SYSTEM "sgml/lib_old_provided_name_identifier.sgml">
-<!ENTITY lasso-LassoLibRegisterNameIdentifierRequest SYSTEM "sgml/lib_register_name_identifier_request.sgml">
-<!ENTITY lasso-LassoLibRegisterNameIdentifierResponse SYSTEM "sgml/lib_register_name_identifier_response.sgml">
+<!ENTITY LassoLibLogoutRequest SYSTEM "sgml/lib_logout_request.sgml">
+<!ENTITY LassoLibFederationTerminationNotification SYSTEM "sgml/lib_federation_termination_notification.sgml">
+<!ENTITY LassoLibIDPProvidedNameIdentifier SYSTEM "sgml/lib_idp_provided_name_identifier.sgml">
+<!ENTITY LassoLibLogoutResponse SYSTEM "sgml/lib_logout_response.sgml">
+<!ENTITY LassoLibNameIdentifierMappingRequest SYSTEM "sgml/lib_name_identifier_mapping_request.sgml">
+<!ENTITY LassoLibNameIdentifierMappingResponse SYSTEM "sgml/lib_name_identifier_mapping_response.sgml">
+<!ENTITY LassoLibOLDProvidedNameIdentifier SYSTEM "sgml/lib_old_provided_name_identifier.sgml">
+<!ENTITY LassoLibRegisterNameIdentifierRequest SYSTEM "sgml/lib_register_name_identifier_request.sgml">
+<!ENTITY LassoLibRegisterNameIdentifierResponse SYSTEM "sgml/lib_register_name_identifier_response.sgml">
 <!ENTITY lasso-LassoLibSPProvidedNameIdentifier SYSTEM "sgml/lib_sp_provided_name_identifier.sgml">
-<!ENTITY lasso-LassoLibStatusResponse SYSTEM "sgml/lib_status_response.sgml">
-<!ENTITY lasso-LassoLibSubject SYSTEM "sgml/lib_subject.sgml">
-<!ENTITY lasso-LassoSamlpRequest SYSTEM "sgml/samlp_request.sgml">
-<!ENTITY lasso-LassoLibAuthnContext SYSTEM "sgml/lib_authn_context.sgml">
-<!ENTITY lasso-LassoLibAuthenticationStatement SYSTEM "sgml/lib_authentication_statement.sgml">
+<!ENTITY LassoLibStatusResponse SYSTEM "sgml/lib_status_response.sgml">
+<!ENTITY LassoLibSubject SYSTEM "sgml/lib_subject.sgml">
+<!ENTITY LassoSamlpRequest SYSTEM "sgml/samlp_request.sgml">
+<!ENTITY LassoLibAuthnContext SYSTEM "sgml/lib_authn_context.sgml">
+<!ENTITY LassoLibAuthenticationStatement SYSTEM "sgml/lib_authentication_statement.sgml">
+<!ENTITY LassoSoapEnvBody SYSTEM "sgml/soap-env_body.sgml">
+<!ENTITY LassoSoapEnvEnvelope SYSTEM "sgml/soap-env_envelope.sgml">
 <!ENTITY lasso-export SYSTEM "sgml/export.sgml">
 <!ENTITY lasso-lasso SYSTEM "sgml/lasso.sgml">
 <!ENTITY lasso-version SYSTEM "sgml/version.sgml">
-<!ENTITY lasso-single-sign-on-and-federation SYSTEM "sgml/single_sign_on_and_federation.sgml">
-<!ENTITY lasso-federation-termination-notification SYSTEM "sgml/federation_termination_notification.sgml">
-<!ENTITY lasso-logout SYSTEM "sgml/logout.sgml">
-<!ENTITY lasso-register-name-identifier SYSTEM "sgml/register_name_identifier.sgml">
+<!ENTITY LassoFederationTerminationNotification SYSTEM "sgml/federation_termination_notification.sgml">
+<!ENTITY LassoAuthnRequest SYSTEM "sgml/authn_request.sgml">
+<!ENTITY LassoAuthnResponse SYSTEM "sgml/authn_response.sgml">
+<!ENTITY LassoLogoutRequest SYSTEM "sgml/logout_request.sgml">
+<!ENTITY LassoLogoutResponse SYSTEM "sgml/logout_response.sgml">
+<!ENTITY LassoNameIdentifierMappingRequest SYSTEM "sgml/name_identifier_mapping_request.sgml">
+<!ENTITY LassoNameIdentifierMappingResponse SYSTEM "sgml/name_identifier_mapping_response.sgml">
+<!ENTITY LassoRegisterNameIdentifierRequest SYSTEM "sgml/register_name_identifier_request.sgml">
+<!ENTITY LassoRegisterNameIdentifierResponse SYSTEM "sgml/register_name_identifier_response.sgml">
+<!ENTITY LassoAssertion SYSTEM "sgml/assertion.sgml">
+<!ENTITY LassoAuthenticationStatement SYSTEM "sgml/authentication_statement.sgml">
 <!ENTITY lasso-tools SYSTEM "sgml/tools.sgml">
 ]>
 <book id="index">
   <bookinfo>
-    <title>Lasso Reference Manual</title>
+    <title>[Insert name here] Reference Manual</title>
   </bookinfo>
 
   <chapter>
-    <title>XML</title>
-        <chapter>
-	    <title>DSig</title>
-	      &lasso-LassoDsSignature;
-	</chapter>
-  <chapter>
-  <title>Liberty alliance</title>
+    <title>[Insert title here]</title>
+    &LassoDsSignature;
     &LassoLibAssertion;
-    &lasso-LassoLibAuthenticationStatement;
-    &lasso-LassoLibAuthnContext;
     &LassoLibAuthnRequest;
     &LassoLibAuthnResponse;
-    &lasso-LassoLibFederationTerminationNotification;
-    &lasso-LassoLibIDPEntries;
-    &lasso-LassoLibIDPEntry;
-    &lasso-LassoLibIDPList;
-    &lasso-LassoLibIDPProvidedNameIdentifier;
-    &lasso-LassoLibLogoutRequest;
-    &lasso-LassoLibLogoutResponse;
-    &lasso-LassoLibNameIdentifierMappingRequest;
-    &lasso-LassoLibNameIdentifierMappingResponse;
-    &lasso-LassoLibOLDProvidedNameIdentifier;
-    &lasso-LassoLibRegisterNameIdentifierRequest;
-    &lasso-LassoLibRegisterNameIdentifierResponse;
+    &LassoLibIDPEntries;
+    &LassoLibIDPEntry;
+    &LassoLibIDPList;
     &LassoLibRequestAuthnContext;
     &LassoLibScoping;
-    &lasso-LassoLibSPProvidedNameIdentifier;
-    &lasso-LassoLibStatusResponse;
-    &lasso-LassoLibSubject;
-    </chapter>
-    <chapter>
-    <title>SAML</title>
     &LassoSamlAdvice;
     &LassoSamlAssertion;
-    &lasso-LassoSamlAudienceRestrictionCondition;
-    &lasso-LassoSamlAuthenticationStatement;
-    &lasso-LassoSamlAuthorityBinding;
-    &lasso-LassoSamlConditionAbstract;
-    &lasso-LassoSamlConditions;
+    &LassoSamlAudienceRestrictionCondition;
+    &LassoSamlAuthenticationStatement;
+    &LassoSamlAuthorityBinding;
+    &LassoSamlConditionAbstract;
+    &LassoSamlConditions;
     &LassoSamlNameIdentifier;
     &LassoSamlStatementAbstract;
     &LassoSamlSubject;
     &LassoSamlSubjectConfirmation;
-    &lasso-LassoSamlSubjectLocality;
+    &LassoSamlSubjectLocality;
     &LassoSamlSubjectStatementAbstract;
-
-    &lasso-LassoSamlpRequest;
     &LassoSamlpRequestAbstract;
     &LassoSamlpResponse;
     &LassoSamlpResponseAbstract;
     &LassoSamlpStatus;
     &LassoSamlpStatusCode;
-    </chapter>
-  <chapter>
-    <title>Core</title>
-    &lasso-lasso;
     &LassoNode;
-    &lasso-tools;
-    &lasso-version;
+    &LassoLibLogoutRequest;
+    &LassoLibFederationTerminationNotification;
+    &LassoLibIDPProvidedNameIdentifier;
+    &LassoLibLogoutResponse;
+    &LassoLibNameIdentifierMappingRequest;
+    &LassoLibNameIdentifierMappingResponse;
+    &LassoLibOLDProvidedNameIdentifier;
+    &LassoLibRegisterNameIdentifierRequest;
+    &LassoLibRegisterNameIdentifierResponse;
+    &lasso-LassoLibSPProvidedNameIdentifier;
+    &LassoLibStatusResponse;
+    &LassoLibSubject;
+    &LassoSamlpRequest;
+    &LassoLibAuthnContext;
+    &LassoLibAuthenticationStatement;
+    &LassoSoapEnvBody;
+    &LassoSoapEnvEnvelope;
     &lasso-export;
-    </chapter>
-  </chapter>
-  <chapter>
-    <title>High level</title>
-    &lasso-single-sign-on-and-federation;
-    &lasso-logout;
-    &lasso-federation-termination-notification;
-    &lasso-register-name-identifier;
+    &lasso-lasso;
+    &lasso-version;
+    &LassoFederationTerminationNotification;
+    &LassoAuthnRequest;
+    &LassoAuthnResponse;
+    &LassoLogoutRequest;
+    &LassoLogoutResponse;
+    &LassoNameIdentifierMappingRequest;
+    &LassoNameIdentifierMappingResponse;
+    &LassoRegisterNameIdentifierRequest;
+    &LassoRegisterNameIdentifierResponse;
+    &LassoAssertion;
+    &LassoAuthenticationStatement;
+    &lasso-tools;
   </chapter>
 </book>
diff --git a/docs/reference/lasso.types b/docs/reference/lasso.types
index 3dc2e2ae..9888ad64 100644
--- a/docs/reference/lasso.types
+++ b/docs/reference/lasso.types
@@ -42,3 +42,17 @@ lasso_samlp_response_get_type
 lasso_samlp_response_abstract_get_type
 lasso_samlp_status_get_type
 lasso_samlp_status_code_get_type
+lasso_soap_env_body_get_type
+lasso_soap_env_envelope_get_type
+
+lasso_federation_termination_notification_get_type
+lasso_authn_request_get_type
+lasso_authn_response_get_type
+lasso_logout_request_get_type
+lasso_logout_response_get_type
+lasso_name_identifier_mapping_request_get_type
+lasso_name_identifier_mapping_response_get_type
+lasso_register_name_identifier_request_get_type
+lasso_register_name_identifier_response_get_type
+lasso_assertion_get_type
+lasso_authentication_statement_get_type