diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/.settings/org.eclipse.core.resources.prefs b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/.settings/org.eclipse.core.resources.prefs
index ba120bf..040f845 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/.settings/org.eclipse.core.resources.prefs
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 11 19:28:37 CET 2009
+#Fri Dec 11 19:53:07 CET 2009
 eclipse.preferences.version=1
 encoding//html/canonicalization/canonicalize.html=utf-8
 encoding//html/contents.html=utf-8
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/decrypt.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/decrypt.html
index 0c0fe11..fa8873f 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/decrypt.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/decrypt.html
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="XML_Decryption_Wizard">XML Decryption Wizard</h1><p>The <b>XML Decryption Wizard</b> consists of only one  page: <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/decyption/page_resourcen.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/decyption/page_resourcen.html">Resource and Key Information</a>.</p><p>To launch the wizard you either have to select an encrypted XML document  in one of the supported views in the XML perspective or open an XML document in the WTP XML editor (in any perspective). Open the context menu, choose <b>XML Security</b> and click on <b>New Decryption...</b>.</p></body></html>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="XML_Decryption_Wizard">XML Decryption Wizard</h1><p>The <b>XML Decryption Wizard</b> consists of only one  page: <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html">Resource and Key Information</a>.</p><p>To launch the wizard you either have to select an encrypted XML document  in one of the supported views in the XML perspective or open an XML document in the WTP XML editor (in any perspective). Open the context menu, choose <b>XML Security</b> and click on <b>New Decryption...</b>.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_resource.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_resource.html
index ab24e12..82382c1 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_resource.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_resource.html
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Resource_and_Encryption_Type">Resource and Encryption Type</h1><p>This is the first page of the XML Encryption Wizard. You'll have to select the resource you want to encrypt, the encryption type, the keystore/ key option and the Basic Security Profile option.</p><p><img align="middle" title="Resource and Encryption Type" alt="Resource and Encryption Type" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_1.png‎"/></p><p><b>Resource</b></p><p>It is possible to encrypt the complete document, the selected text or a document fragment specified by an XPath expression. The complete document is always possible. For a text selection this selection has to exist before launching the wizard and it has to be well-formed. XPath is always possible too. You can either enter an XPath expression in the textfield or you can select one in the dialog after clicking on the <b>Browse...</b> button. The XPath expression has to return exactly one element or element content. Encrypting attributes is not supported.</p><p><b>Encryption Type</b></p><p>The normal encryption type is a so called enveloping encryption, where the encrypted data is contained in the original document (it replaces the plain XML). A detached encryption doesn't encrypt the XML document you have chosen. Instead the data in the specified additional file here gets encrypted. Both documents will be changed. File A remains in plain XML, but does contain the encryption information for file B that gets encrypted (a detached encryption requires the whole document to be encrypted).</p><p><b>Keystore and Key</b></p><p>The chosen option here sets the following wizard page. You can either select to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html">Use a key from an existing keystore</a>, to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html">Insert a new key in an existing keystore</a> or to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html">Create a new key and a new keystore</a>.</p><p><b>Basic Security Profile</b></p><p>A Basic Security Profile compliant XML Encryption has some restrictions in comparison to a regular XML Encryption. By activating this checkbox all options in the XML Encryption Wizard will be limited to options that are compliant to this profile. In case of the XML Encryption Wizard this only limits the available algorithms on the <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html">Algorithms and Encryption Properties</a> page.</p></body></html>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Resource_and_Encryption_Type">Resource and Encryption Type</h1><p>This is the first page of the XML Encryption Wizard. You'll have to select the resource you want to encrypt, the encryption type, the keystore/ key option and the Basic Security Profile option.</p><p><img align="middle" title="Resource and Encryption Type" alt="Resource and Encryption Type" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_1.png‎"/></p><p><b>Resource</b></p><p>It is possible to encrypt the complete document, the selected text or a document fragment specified by an XPath expression. The complete document is always possible. For a text selection this selection has to exist before launching the wizard and it has to be well-formed. XPath is always possible too. You can either enter an XPath expression in the textfield or you can select one in the dialog after clicking on the <b>Browse...</b> button. The XPath expression has to return exactly one element or element content. Encrypting attributes is not supported.</p><p><b>Encryption Type</b></p><p>The normal encryption type is a so called enveloping encryption, where the encrypted data is contained in the original document (it replaces the plain XML). A detached encryption doesn't encrypt the XML document you have chosen. Instead the data in the specified additional file here gets encrypted. Both documents will be changed. File A remains in plain XML, but does contain the encryption information for file B that gets encrypted (a detached encryption requires the whole document to be encrypted).</p><p><b>Keystore and Key</b></p><p>The chosen option here sets the following wizard page. You can either select to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html">Use a key from an existing keystore</a>, to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html">Insert a new key in an existing keystore</a> or to <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html">Create a new key and a new keystore</a>.</p><p><b>Basic Security Profile</b></p><p>A Basic Security Profile compliant XML Encryption has some restrictions in comparison to a regular XML Encryption. By activating this checkbox all options in the XML Encryption Wizard will be limited to options that are compliant to this profile. In case of the XML Encryption Wizard this only limits the available algorithms on the <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html">Algorithms and Encryption Properties</a> page.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml
index 3b1d7e0..02faf4b 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml
@@ -8,9 +8,9 @@
 		<topic label="Signature Wizard" href="html/signature/sign.html">
 	        <topic label="Resource and Signature Type" href="html/signature/page_resource.html"/>
 	        <topic label="Keystores and Keys" href="html/signature/page_keys.html">
-	            <topic label="Open an existing Key" href="html/signature/page_open_key.html"/>
-	            <topic label="Create a new Key" href="html/signature/page_create_key.html"/>
-	            <topic label="Create a new Keystore and Key" href="html/signature/page_create_keystore.html"/>
+	            <topic label="Use a Key from an existing Keystore" href="html/signature/page_open_key.html"/>
+	            <topic label="Insert a new Key in an existing Keystore" href="html/signature/page_create_key.html"/>
+	            <topic label="Create a new Key and a new Keystore" href="html/signature/page_create_keystore.html"/>
 	        </topic>
 	        <topic label="Algorithms and Signature Properties" href="html/signature/page_algorithms.html"/>
 	    </topic>
@@ -18,9 +18,9 @@
 	    <topic label="Encryption Wizard" href="html/encryption/encrypt.html">
 	        <topic label="Resource and Encryption Type" href="html/encryption/page_resource.html"/>
 	        <topic label="Keystores and Keys" href="html/encryption/page_keys.html">
-	            <topic label="Open an existing Key" href="html/encryption/page_open_key.html"/>
-	            <topic label="Create a new Key" href="html/encryption/page_create_key.html"/>
-	            <topic label="Create a new Keystore and Key" href="html/encryption/page_create_keystore.html"/>
+	            <topic label="Use a Key from an existing Keystore" href="html/encryption/page_open_key.html"/>
+	            <topic label="Insert a new Key in an existing Keystore" href="html/encryption/page_create_key.html"/>
+	            <topic label="Create a new Key and a new Keystore" href="html/encryption/page_create_keystore.html"/>
 	        </topic>
 	        <topic label="Algorithms and Encryption Properties" href="html/encryption/page_algorithms.html"/>
 	    </topic>
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/decrypt.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/decrypt.textile
index 7070379..9db77f7 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/decrypt.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/decrypt.textile
@@ -1,5 +1,5 @@
 = XML Decryption Wizard =
 
-The '''XML Decryption Wizard''' consists of only one  page: [[help/topic/org.eclipse.wst.xml.security.doc/html/decyption/page_resourcen.html | Resource and Key Information]].
+The '''XML Decryption Wizard''' consists of only one  page: [[help/topic/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html | Resource and Key Information]].
 
 To launch the wizard you either have to select an encrypted XML document  in one of the supported views in the XML perspective or open an XML document in the WTP XML editor (in any perspective). Open the context menu, choose '''XML Security''' and click on '''New Decryption...'''.
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_resource.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_resource.textile
index 60a964e..7458626 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_resource.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_resource.textile
@@ -2,7 +2,7 @@
 
 This is the first page of the XML Encryption Wizard. You'll have to select the resource you want to encrypt, the encryption type, the keystore/ key option and the Basic Security Profile option.
 
-[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_1.png‎|Resource and Encryption Type|center]]
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_1.png‎|Resource and Encryption Type|center]]
 
 '''Resource'''