Updated online help
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 e62cb06..ba120bf 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,9 +1,8 @@
-#Tue Dec 01 21:26:54 CET 2009
+#Fri Dec 11 19:28:37 CET 2009
eclipse.preferences.version=1
encoding//html/canonicalization/canonicalize.html=utf-8
encoding//html/contents.html=utf-8
encoding//html/decryption/decrypt.html=utf-8
-encoding//html/decryption/page_key.html=utf-8
encoding//html/decryption/page_resource.html=utf-8
encoding//html/encryption/encrypt.html=utf-8
encoding//html/encryption/page_algorithms.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 6ba318c..0c0fe11 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></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/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
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_key.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_key.html
deleted file mode 100644
index 60beaee..0000000
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_key.html
+++ /dev/null
@@ -1 +0,0 @@
-<?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="Key">Key</h1></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html
index 58070c4..d863a69 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/page_resource.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/decryption/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">Resource</h1></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_Key_Information">Resource and Key Information</h1><p>This is the first and only page of the XML Decryption Wizard. You'll have to provide the keystore and key information used to encrypt the XML document (-fragment) and to choose the encryption you want to decrypt.</p><p><img align="middle" title="Resource and Key Information" alt="Resource and Key Information" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/decrypt/page_1.png"/></p><p><b>Keystore and Key</b></p><p>Simply choose the keystore containing the used key and enter the keystore password. Type in the key name and its password.</p><p><b>Encryption ID</b></p><p>An XML document can contain multiple encryptions with different encryption IDs. You do not have to decrypt them in document order. Instead, you can choose which one you want to decrypt (make sure to provide the corresponding keystore and key information, otherwise decryption will fail). However, this requires an ID for the XML encryption. Since IDs are optional you can choose to decrypt the first encrypted part in the XML document instead. In case the XML document contains multiple encryptions without IDs you'll have to decrypt them step by step. In order to avoid that always provide encryption IDs when encrypting XML data.</p><p>The wizard automatically stores the entered data for the keystore name and the key name between sessions. Passwords are never stored and have to be entered every time.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html
index 4b4d238..89474db 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_algorithms.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="Algorithms_and_Encryption_Properties">Algorithms and Encryption Properties</h1><p>This is the last page of the XML Encryption Wizard. You must select the Encryption and the Key Wrap Algorithms. Optional, you can select to keep the root element as plain text and you can enter an encryption ID (strongly recommended). The <b>Start Signature Wizard afterwards</b> checkbox enables you to start the signature wizard after successfully encrypting the selected XML document.</p><p><img align="middle" title="Algorithms and Encryption Properties" alt="Algorithms and Encryption Properties" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_3.png"/></p><p><b>Encryption and Key Wrap Algorithm</b></p><p>Choose the algorithms you want to use to encrypt the XML document (fragment) and to wrap the key. You have to select algorithms that do match with the selected key on the previous wizard page.</p><p><b>Properties</b></p><p>There is only one property available: Keep root element as plain text. This creates an encrypted XML document (fragment) with a root element in plain text. In case you selected to encrypt the whole document the documents root element will be kept as plain text. In case you selected to encrypt a document fragment only (via a text selection or an XPath expression) this will result in a plain text root element of this document fragment.</p><p><b>Encryption ID</b></p><p>The encryption ID is optional, but it is strongly required to enter one. This ID must be unique in the whole document and may not contain <, >, &, ' or " characters. Without an encryption ID it is only possible to decrypt the XML document step by step.</p><p><b>Signature Wizard</b></p><p>Select the checkbox in case you want to start the <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/signature/sign.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/signature/sign.html">XML Signature Wizard</a> directly after the encryption process was successfully finished.</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="Algorithms_and_Encryption_Properties">Algorithms and Encryption Properties</h1><p>This is the last page of the XML Encryption Wizard. You must select the Encryption and the Key Wrap Algorithms. Optional, you can select to keep the root element as plain text and you can enter an encryption ID (strongly recommended). The <b>Start Signature Wizard afterwards</b> checkbox enables you to start the signature wizard after successfully encrypting the selected XML document.</p><p><img align="middle" title="Algorithms and Encryption Properties" alt="Algorithms and Encryption Properties" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_3.png"/></p><p><b>Encryption and Key Wrap Algorithm</b></p><p>Choose the algorithms you want to use to encrypt the XML document (fragment) and to wrap the key. You have to select algorithms that do match with the selected key on the previous wizard page.</p><p><b>Properties</b></p><p>There is only one property available: Keep root element as plain text. This creates an encrypted XML document (fragment) with a root element in plain text. In case you selected to encrypt the whole document the documents root element will be kept as plain text. In case you selected to encrypt a document fragment only (via a text selection or an XPath expression) this will result in a plain text root element of this document fragment.</p><p><b>Encryption ID</b></p><p>The encryption ID is optional, but it is strongly required to enter one. This ID must be unique in the whole document and may not contain <, >, &, ' or " characters. Without an encryption ID it is only possible to decrypt the XML document step by step.</p><p><b>Signature Wizard</b></p><p>Select the checkbox in case you want to start the <a href="/help/topic/org.eclipse.wst.xml.security.doc/html/signature/sign.html" title="help/topic/org.eclipse.wst.xml.security.doc/html/signature/sign.html">XML Signature Wizard</a> directly after the encryption process was successfully finished.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html
index 44bbf2e..43ad1e0 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_key.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="Insert_a_new_Key_in_an_existing_Keystore">Insert a new Key in an existing Keystore</h1><p><b>Insert a new Key in an existing Keystore</b> is one of the alternatives as the second wizard page. Select an existing keystore (probably one you created before with the help of the <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> wizard) and enter the keystore password. After that simply select the desired algorithm and the algorithm size for the new key and enter a name and a password for it. Click the <b>Generate</b> button when you are done to create the new key. A short message informs you about the generation result and the <b>Next</b> button will be enabled. The key generated here will be used in the active encryption process.</p><p><img align="middle" title="Insert a new Key in an existing Keystore" alt="Insert a new Key in an existing Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2b.png"/></p><p>Keys must be unique inside a keystore, so the wizard verifies that the entered key name does not exist in the selected keystore.</p><p>The wizard automatically stores the entered data for the keystore path and name between sessions. Passwords are never stored and have to be entered every time.</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="Insert_a_new_Key_in_an_existing_Keystore">Insert a new Key in an existing Keystore</h1><p><b>Insert a new Key in an existing Keystore</b> is one of the alternatives as the second wizard page. Select an existing keystore (probably one you created before with the help of the <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> wizard) and enter the keystore password. After that simply select the desired algorithm and the algorithm size for the new key and enter a name and a password for it. Click the <b>Generate</b> button when you are done to create the new key. A short message informs you about the generation result and the <b>Next</b> button will be enabled. The key generated here will be used in the active encryption process.</p><p><img align="middle" title="Insert a new Key in an existing Keystore" alt="Insert a new Key in an existing Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2b.png"/></p><p>Keys must be unique inside a keystore, so the wizard verifies that the entered key name does not exist in the selected keystore.</p><p>The wizard automatically stores the entered data for the keystore path and name between sessions. Passwords are never stored and have to be entered every time.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html
index bb1b535..58493ea 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.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="Create_a_new_Key_and_a_new_Keystore">Create a new Key and a new Keystore</h1><p><b>Create a new Key and a new Keystore</b> is one of the alternatives as the second wizard page. This page lets you create a new keystore together with a new key. Enter the name for the keystore and the password to protect it. After that choose an algorithm and its size and enter an alias name together with a password for the key. The keystore password is used to protect the whole keystore, the key password to protect the key. Both passwords are required.</p><p>Click the <b>Generate</b> button when you are done to create the new keystore together with the key. A short message informs you about the generation result and the <b>Next</b> button will be enabled. The keystore is stored with the entered name in the active folder (normally the active project). The key generated here will be used in the active encryption process.</p><p><img align="middle" title="Create a new Key and a new Keystore" alt="Create a new Key and a new Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2c.png"/></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="Create_a_new_Key_and_a_new_Keystore">Create a new Key and a new Keystore</h1><p><b>Create a new Key and a new Keystore</b> is one of the alternatives as the second wizard page. This page lets you create a new keystore together with a new key. Enter the name for the keystore and the password to protect it. After that choose an algorithm and its size and enter an alias name together with a password for the key. The keystore password is used to protect the whole keystore, the key password to protect the key. Both passwords are required.</p><p>Click the <b>Generate</b> button when you are done to create the new keystore together with the key. A short message informs you about the generation result and the <b>Next</b> button will be enabled. The keystore is stored with the entered name in the active folder (normally the active project). The key generated here will be used in the active encryption process.</p><p><img align="middle" title="Create a new Key and a new Keystore" alt="Create a new Key and a new Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2c.png"/></p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html
index fa1bb7a..f1169eb 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.html
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/encryption/page_open_key.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="Use_a_Key_from_an_existing_Keystore">Use a Key from an existing Keystore</h1><p><b>Use a Key from an existing Keystore</b> is one of the alternatives as the second wizard page. Simply select the keystore containing the key you want to use in the current encryption process. All data is verified, you can only switch to the next case with a correct keystore and key password as well as an existing key alias.</p><p><img align="middle" title="Use a Key from an existing Keystore" alt="Use a Key from an existing Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2a.png"/></p><p>The wizard automatically stores the entered data for the keystore name and the key name between sessions. Passwords are never stored and have to be entered every time.</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="Use_a_Key_from_an_existing_Keystore">Use a Key from an existing Keystore</h1><p><b>Use a Key from an existing Keystore</b> is one of the alternatives as the second wizard page. Simply select the keystore containing the key you want to use in the current encryption process. All data is verified, you can only switch to the next case with a correct keystore and key password as well as an existing key alias.</p><p><img align="middle" title="Use a Key from an existing Keystore" alt="Use a Key from an existing Keystore" border="0" src="PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2a.png"/></p><p>The wizard automatically stores the entered data for the keystore name and the key name between sessions. Passwords are never stored and have to be entered every time.</p></body></html>
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_1.png b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_1.png
similarity index 100%
rename from sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_1.png
rename to sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_1.png
Binary files differ
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2a.png b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2a.png
similarity index 100%
rename from sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2a.png
rename to sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2a.png
Binary files differ
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2b.png b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2b.png
similarity index 100%
rename from sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2b.png
rename to sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2b.png
Binary files differ
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2c.png b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2c.png
similarity index 100%
rename from sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2c.png
rename to sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2c.png
Binary files differ
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_3.png b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_3.png
similarity index 100%
rename from sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encryption/page_3.png
rename to sourceediting/documentation/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_3.png
Binary files differ
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 a1e8107..3b1d7e0 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/toc.xml
@@ -1,41 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="XML Security Tools User Guide" topic="html/contents.html">
- <topic href="html/overview/overview.html" label="Overview">
- </topic>
- <topic href="html/overview/tasks.html" label="Tasks">
- <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>
- <topic label="Algorithms and Signature Properties" href="html/signature/page_algorithms.html"/>
- </topic>
- <topic label="Signatures View" href="html/verification/verify.html"/>
- <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>
- <topic label="Algorithms and Encryption Properties" href="html/encryption/page_algorithms.html"/>
- </topic>
- <topic label="Decryption Wizard" href="html/decryption/decrypt.html">
- <topic label="Resource" href="html/decryption/page_resource.html"/>
- <topic href="html/decryption/page_key.html" label="Key">
- </topic>
- </topic>
- <topic label="Canonicalization" href="html/canonicalization/canonicalize.html"/>
- <topic label="Quick Functions" href="html/quickfunctions/quickfunctions.html"/>
- </topic>
- <topic label="Preferences" href="html/preferences/general.html">
- <topic label="Encryption" href="html/preferences/encryption.html"/>
- <topic label="Signature" href="html/preferences/signature.html"/>
- </topic>
- <topic href="html/legal.html" label="Notices">
- </topic>
-</toc>
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="XML Security Tools User Guide" topic="html/contents.html">
+ <topic href="html/overview/overview.html" label="Overview">
+ </topic>
+ <topic href="html/overview/tasks.html" label="Tasks">
+ <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>
+ <topic label="Algorithms and Signature Properties" href="html/signature/page_algorithms.html"/>
+ </topic>
+ <topic label="Signatures View" href="html/verification/verify.html"/>
+ <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>
+ <topic label="Algorithms and Encryption Properties" href="html/encryption/page_algorithms.html"/>
+ </topic>
+ <topic label="Decryption Wizard" href="html/decryption/decrypt.html">
+ <topic label="Resource and Key Information" href="html/decryption/page_resource.html"/>
+ </topic>
+ <topic label="Canonicalization" href="html/canonicalization/canonicalize.html"/>
+ <topic label="Quick Functions" href="html/quickfunctions/quickfunctions.html"/>
+ </topic>
+ <topic label="Preferences" href="html/preferences/general.html">
+ <topic label="Encryption" href="html/preferences/encryption.html"/>
+ <topic label="Signature" href="html/preferences/signature.html"/>
+ </topic>
+ <topic href="html/legal.html" label="Notices">
+ </topic>
+</toc>
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 84cebb1..7070379 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 +1,5 @@
-= XML Decryption Wizard =
\ No newline at end of file
+= 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]].
+
+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/decryption/page_key.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_key.textile
deleted file mode 100644
index de3e46f..0000000
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_key.textile
+++ /dev/null
@@ -1 +0,0 @@
-= Key =
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_resource.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_resource.textile
index b22a93f..c3a9f4e 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_resource.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/decryption/page_resource.textile
@@ -1 +1,15 @@
-= Resource =
\ No newline at end of file
+= Resource and Key Information =
+
+This is the first and only page of the XML Decryption Wizard. You'll have to provide the keystore and key information used to encrypt the XML document (-fragment) and to choose the encryption you want to decrypt.
+
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/decrypt/page_1.png|Resource and Key Information|center]]
+
+'''Keystore and Key'''
+
+Simply choose the keystore containing the used key and enter the keystore password. Type in the key name and its password.
+
+'''Encryption ID'''
+
+An XML document can contain multiple encryptions with different encryption IDs. You do not have to decrypt them in document order. Instead, you can choose which one you want to decrypt (make sure to provide the corresponding keystore and key information, otherwise decryption will fail). However, this requires an ID for the XML encryption. Since IDs are optional you can choose to decrypt the first encrypted part in the XML document instead. In case the XML document contains multiple encryptions without IDs you'll have to decrypt them step by step. In order to avoid that always provide encryption IDs when encrypting XML data.
+
+The wizard automatically stores the entered data for the keystore name and the key name between sessions. Passwords are never stored and have to be entered every time.
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_algorithms.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_algorithms.textile
index 84ef9b7..ba4d526 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_algorithms.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_algorithms.textile
@@ -2,7 +2,7 @@
This is the last page of the XML Encryption Wizard. You must select the Encryption and the Key Wrap Algorithms. Optional, you can select to keep the root element as plain text and you can enter an encryption ID (strongly recommended). The '''Start Signature Wizard afterwards''' checkbox enables you to start the signature wizard after successfully encrypting the selected XML document.
-[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_3.png|Algorithms and Encryption Properties|center]]
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_3.png|Algorithms and Encryption Properties|center]]
'''Encryption and Key Wrap Algorithm'''
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_key.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_key.textile
index 34c1d71..96bb6f0 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_key.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_key.textile
@@ -2,7 +2,7 @@
'''Insert a new Key in an existing Keystore''' is one of the alternatives as the second wizard page. Select an existing keystore (probably one you created before with the help of the [[help/topic/org.eclipse.wst.xml.security.doc/html/encryption/page_create_keystore.html | Create a new Key and a new Keystore]] wizard) and enter the keystore password. After that simply select the desired algorithm and the algorithm size for the new key and enter a name and a password for it. Click the '''Generate''' button when you are done to create the new key. A short message informs you about the generation result and the '''Next''' button will be enabled. The key generated here will be used in the active encryption process.
-[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2b.png|Insert a new Key in an existing Keystore|center]]
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2b.png|Insert a new Key in an existing Keystore|center]]
Keys must be unique inside a keystore, so the wizard verifies that the entered key name does not exist in the selected keystore.
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_keystore.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_keystore.textile
index 677df10..b4a4948 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_keystore.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_create_keystore.textile
@@ -4,4 +4,4 @@
Click the '''Generate''' button when you are done to create the new keystore together with the key. A short message informs you about the generation result and the '''Next''' button will be enabled. The keystore is stored with the entered name in the active folder (normally the active project). The key generated here will be used in the active encryption process.
-[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2c.png|Create a new Key and a new Keystore|center]]
\ No newline at end of file
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2c.png|Create a new Key and a new Keystore|center]]
\ No newline at end of file
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_open_key.textile b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_open_key.textile
index 979857e..4aba039 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_open_key.textile
+++ b/sourceediting/documentation/org.eclipse.wst.xml.security.doc/wiki/encryption/page_open_key.textile
@@ -2,6 +2,6 @@
'''Use a Key from an existing Keystore''' is one of the alternatives as the second wizard page. Simply select the keystore containing the key you want to use in the current encryption process. All data is verified, you can only switch to the next case with a correct keystore and key password as well as an existing key alias.
-[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encryption/page_2a.png|Use a Key from an existing Keystore|center]]
+[[Image:PLUGINS_ROOT/org.eclipse.wst.xml.security.doc/html/images/encrypt/page_2a.png|Use a Key from an existing Keystore|center]]
The wizard automatically stores the entered data for the keystore name and the key name between sessions. Passwords are never stored and have to be entered every time.
\ No newline at end of file
