You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/08/26 17:38:05 UTC

svn commit: r689113 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ ldapbrowser-help/src/main/docbook/ ldapbrowser-help/src/main/resources/html/images/ ldapbrowser-ui/src/main/java/org/apache/dir...

Author: seelmann
Date: Tue Aug 26 08:38:04 2008
New Revision: 689113

URL: http://svn.apache.org/viewvc?rev=689113&view=rev
Log:
Update user doc: search logs view and edit entry wizard

Added:
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.25.1_tools_search_logs_view.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.41.1_tools_editentry_wizard.xml
    directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_search_logs_1.png   (with props)
    directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_value_editors_10a.png   (with props)
Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.10_tools_ldap_perspective.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.20_tools_connections_view.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.21.0_tools_browser_view_overview.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.1_tools_entry_editor_features.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.9_tools_entry_editor_contextmenu.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.70_tools_value_editors.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/2_tools.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/3_tasks.xml
    directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_browser_view_2.png
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Tue Aug 26 08:38:04 2008
@@ -123,13 +123,13 @@
 
         // special case: multivalued editor
         multiValuedValueEditor = new MultivaluedValueEditor( this.parent, this );
-        multiValuedValueEditor.setValueEditorName( "Mulitvalued Editor" );
+        multiValuedValueEditor.setValueEditorName( "Mulitvalued Editor..." );
         multiValuedValueEditor.setValueEditorImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
             BrowserCommonConstants.IMG_MULTIVALUEDEDITOR ) );
 
         // special case: entry editor
         entryValueEditor = new EntryValueEditor( this.parent, this );
-        entryValueEditor.setValueEditorName( "Entry Editor" );
+        entryValueEditor.setValueEditorName( "Entry Editor..." );
         entryValueEditor.setValueEditorImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
             BrowserCommonConstants.IMG_ENTRY ) );
 

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml Tue Aug 26 08:38:04 2008
@@ -29,11 +29,13 @@
   <!ENTITY tools_schema_browser SYSTEM "2.24_tools_schema_browser.xml">
 
   <!ENTITY tools_modification_logs_view SYSTEM "2.25_tools_modification_logs_view.xml">
+  <!ENTITY tools_search_logs_view SYSTEM "2.25.1_tools_search_logs_view.xml">
 
   <!ENTITY tools_progress_view SYSTEM "2.26_tools_progress_view.xml">
 
   <!ENTITY tools_newconnection_wizard SYSTEM "2.40_tools_newconnection_wizard.xml">
   <!ENTITY tools_newentry_wizard SYSTEM "2.41_tools_newentry_wizard.xml">
+  <!ENTITY tools_editentry_wizard SYSTEM "2.41.1_tools_editentry_wizard.xml">
   <!ENTITY tools_attribute_wizard SYSTEM "2.42_tools_attribute_wizard.xml">
   <!ENTITY tools_search_dialog SYSTEM "2.43_tools_search_dialog.xml">
   <!ENTITY tools_batchoperation_wizard SYSTEM "2.44_tools_batchoperation_wizard.xml">

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.10_tools_ldap_perspective.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.10_tools_ldap_perspective.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.10_tools_ldap_perspective.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.10_tools_ldap_perspective.xml Tue Aug 26 08:38:04 2008
@@ -83,7 +83,9 @@
 	</para>
 	<para>
 		The bottom centered view displays all <emphasis role="strong">Modifications</emphasis>
-		made on the currently selected connections as LIDF change records.
+		made on the currently selected connections as LDIF change records and all
+		<emphasis role="strong">Searches</emphasis> performed on the on the currently 
+		selected connections as LDIF records.
 	</para>
 	<para>
 		The bottom right <emphasis role="strong">Progress view</emphasis> displays 

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.20_tools_connections_view.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.20_tools_connections_view.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.20_tools_connections_view.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.20_tools_connections_view.xml Tue Aug 26 08:38:04 2008
@@ -31,11 +31,20 @@
 				</imageobject>
 			</mediaobject>
 		</screenshot>
-	</para>
-	<para>
-	    It is possible to organize connections in folders.   
-	 	Use drag-and-drop to re-organize connections and folders.
-	</para>
+	</para>
+	
+	<simplesect id="tools_connections_view_organize">
+		<title>Organize Connections</title>
+		<para>
+		    It is possible to organize connections in folders and sub-folders.   
+		 	Use drag-and-drop to re-organize connections and folders.
+		</para>
+		<para>
+		    You could copy and paste the connection parameters as LDAP URL 
+		    to/from the clipboard. This makes it very easy to share connection parameters
+		    with other users.
+		</para>
+	</simplesect>
 	
 	<simplesect id="tools_connections_view_icons">
 		<title>Icons</title>
@@ -174,7 +183,7 @@
 					<row>
 					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/copy.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
 					  <entry>Copy Connection</entry>
-					  <entry>Copies the selected connections(s) to the clipboard. To duplicate an existing connection please combine copy and paste.</entry>
+					  <entry>Copies the selected connection(s) as LDAP URL(s) to the clipboard. To duplicate an existing connection please combine copy and paste.</entry>
 					  <entry>
 					  	<shortcut><keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo></shortcut>
 					  	or
@@ -184,7 +193,7 @@
 					<row>
 					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/paste.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
 					  <entry>Paste Connection</entry>
-					  <entry>Pastes the copied connections(s) from clipboard. Only enabled if there are connections in clipboard.</entry>
+					  <entry>Pastes the copied connection(s) or LDAP URL(s) from clipboard. Only enabled if there are connections or LDAP URLs in clipboard.</entry>
 					  <entry>
 					  	<shortcut><keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></shortcut>
 					  	or

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.21.0_tools_browser_view_overview.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.21.0_tools_browser_view_overview.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.21.0_tools_browser_view_overview.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.21.0_tools_browser_view_overview.xml Tue Aug 26 08:38:04 2008
@@ -408,6 +408,22 @@
 						<entry>on</entry>
 					</row>
 					<row>
+						<entry>Container entries first</entry>
+						<entry>
+							If enabled, entries with children are
+							grouped before the entries without children.
+						</entry>
+						<entry>on</entry>
+					</row>
+					<row>
+						<entry>Mixed</entry>
+						<entry>
+							If enabled, entries with and without children
+							are not group before each other.
+						</entry>
+						<entry>on</entry>
+					</row>
+					<row>
 						<entry>Meta entries last</entry>
 						<entry>
 							If enabled, meta entries (e.g. root DSE or

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.1_tools_entry_editor_features.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.1_tools_entry_editor_features.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.1_tools_entry_editor_features.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.1_tools_entry_editor_features.xml Tue Aug 26 08:38:04 2008
@@ -268,9 +268,8 @@
 		</para>
 	</simplesect>
 	
-	<simplesect id="tools_entry_editor_editing">
-		<title>Editing</title>
-	
+	<simplesect id="tools_entry_editor_edit_attributes">
+		<title>Edit Attributes and Values</title>
 		<para>
 			It is possible to add, edit or delete attributes and values of
 			an entry in the Entry editor.
@@ -290,9 +289,30 @@
 			</emphasis>.
 		</para>
 		<para>
-			To finish editing press Enter or click to another value or click
-			the OK button in a value editor dialog. To cancel editing press
-			ESC or click the Cancel button in a value editor dialog.
+			To finish editing press <emphasis role="strong">Enter</emphasis>
+			or click to another value or click the OK button in a 
+			value editor dialog. To cancel editing press 
+			<emphasis role="strong">ESC</emphasis> or click the Cancel button 
+			in a value editor dialog.
+		</para>
+		<para>
+			Using this method each modification will be immediately sent to
+			the directory. 
+		</para>
+	</simplesect>	
+	
+	<simplesect id="tools_entry_editor_edit_offline">
+		<title>Edit Entry Offline</title>
+		<para>
+			You could edit an entry offline to make multiple modifications on 
+			an entry and to send these modifications as one request to the server.
+			This is necessary e.g. when adding an additional object class
+			which requires addional attributes.
+		</para>
+		<para>
+			To start the offlien entry editor press <emphasis role="strong">F8</emphasis>
+			or choose <emphasis role="strong">Edit Entry...</emphasis> from the
+			context menu.
 		</para>
 	</simplesect>	
 

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.9_tools_entry_editor_contextmenu.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.9_tools_entry_editor_contextmenu.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.9_tools_entry_editor_contextmenu.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.22.9_tools_entry_editor_contextmenu.xml Tue Aug 26 08:38:04 2008
@@ -28,26 +28,26 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Opens the
+						<link linkend="tools_attribute_wizard">
+							New Attribute wizard
+						</link>
+						. When finishing the wizard a new attribute is
+						created and the edit mode is started to enter a
+						value.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/attribute_add.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
-						<link linkend="tools_attribute_wizard">
-							New Attribute wizard
-						</link>
-						. When finishing the wizard a new attribute is
-						created and the edit mode is started to enter a
-						value.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -77,21 +77,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Adds a new value to the selected
+						attribute and starts the edit mode.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/value_add.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Adds a new value to the selected
-						attribute and starts the edit mode.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -121,25 +121,25 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Opens the
+						<link linkend="tools_search_dialog">
+							Search dialog
+						</link>
+						. The selected attributes and values are used to
+						build the search filter (Query by example).
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/search_new.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
-						<link linkend="tools_search_dialog">
-							Search dialog
-						</link>
-						. The selected attributes and values are used to
-						build the search filter (Query by example).
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -168,20 +168,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em" fileref="icons/batch.gif"
-										format="GIF" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						Opens the
 						<link
 							linkend="tools_batchoperation_wizard">
 							Batch Operation wizard
@@ -195,6 +182,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em" fileref="icons/batch.gif"
+										format="GIF" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If attributes or values are selected.
 					</para>
 				</listitem>
@@ -208,21 +208,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Locates the entry of the selected
+						DN in DIT.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/locate_dn_in_dit.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Locates the entry of the selected
-						DN in DIT.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -250,20 +250,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em" fileref="icons/ocd.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						Opens the
 						<link linkend="tools_schema_browser_ocd">
 							Object Class page
 						</link>
@@ -277,6 +264,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em" fileref="icons/ocd.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one objectClass value is selected
 						and the schema contains this object class.
 					</para>
@@ -291,20 +291,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em" fileref="icons/atd.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						Opens the
 						<link linkend="tools_schema_browser_atd">
 							Attribute Type page
 						</link>
@@ -318,6 +305,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em" fileref="icons/atd.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one attribute or value is selected
 						and the schema contains this attribute type.
 					</para>
@@ -335,21 +335,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em"
-										fileref="icons/mrd_equality.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						Opens the
 						<link linkend="tools_schema_browser_mrd">
 							Matching Rule page
 						</link>
@@ -363,6 +349,20 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em"
+										fileref="icons/mrd_equality.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one attribute or value is selected,
 						the attribute provides an equality matching rule
 						and the schema contains this matching rule.
@@ -381,21 +381,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em"
-										fileref="icons/mrd_substring.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						Opens the
 						<link linkend="tools_schema_browser_mrd">
 							Matching Rule page
 						</link>
@@ -409,6 +395,20 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em"
+										fileref="icons/mrd_substring.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one attribute or value is selected,
 						the attribute provides a substring matching rule
 						and the schema contains this matching rule.
@@ -427,21 +427,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em"
-										fileref="icons/mrd_ordering.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						 Opens the
 						<link linkend="tools_schema_browser_mrd">
 							Matching Rule page
 						</link>
@@ -455,6 +441,20 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em"
+										fileref="icons/mrd_ordering.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one attribute or value is selected,
 						the attribute provides an ordering matching rule
 						and the schema contains this matching rule.
@@ -470,20 +470,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em" fileref="icons/lsd.png"
-										format="PNG" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Opens the
+						 Opens the
 						<link linkend="tools_schema_browser_lsd">
 							Syntax page
 						</link>
@@ -497,6 +484,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em" fileref="icons/lsd.png"
+										format="PNG" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If one attribute or value is selected,
 						the attribute provides an syntax and the schema
 						contains this syntax.
@@ -512,20 +512,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em" fileref="icons/copy.gif"
-										format="GIF" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Copies the selected values. The
+						 Copies the selected values. The
 						values are copied to clipboard in an internal
 						format so they could be pasted to another entry
 						even in the search result editor. Additional
@@ -538,6 +525,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em" fileref="icons/copy.gif"
+										format="GIF" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Shortcut:
 						<shortcut>
 							<keycombo>
@@ -564,24 +564,24 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						 Pasted the previously copied values
+						to the current entry. Each value is copied
+						separately, when an error occurs while adding
+						the value the paste operation will continue with
+						the next value.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em" fileref="icons/paste.gif"
 										format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Pasted the previously copied values
-						to the current entry. Each value is copied
-						separately, when an error occurs while adding
-						the value the paste operation will continue with
-						the next value.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -618,20 +618,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Icon:
-						<guiicon>
-							<inlinemediaobject>
-								<imageobject>
-									<imagedata contentdepth="1em"
-										fileref="icons/delete.gif" format="GIF" />
-								</imageobject>
-							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Deletes the selected attributes and
+						Deletes the selected attributes and
 						values. Note that the following attributes
 						aren't deleteable:
 						<itemizedlist>
@@ -649,6 +636,19 @@
 				</listitem>
 				<listitem>
 					<para>
+						Icon:
+						<guiicon>
+							<inlinemediaobject>
+								<imageobject>
+									<imagedata contentdepth="1em"
+										fileref="icons/delete.gif" format="GIF" />
+								</imageobject>
+							</inlinemediaobject>
+						</guiicon>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Enabled: If attributes and values are selected
 						and they are deletable.
 					</para>
@@ -671,7 +671,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Description: Selects all attributes and values.
+						Selects all attributes and values.
 					</para>
 				</listitem>
 				<listitem>
@@ -695,22 +695,22 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the distinguished name of
+						the current entry (e.g. cn=John
+						Fowler,ou=People,o=JNDITutorial)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_dn.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Copies the distinguished name of
-						the current entry (e.g. cn=John
-						Fowler,ou=People,o=JNDITutorial)
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -722,22 +722,22 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the URL of the current entry
+						(e.g. ldap://localhost:389/cn=John
+						Fowler,ou=People,o=JNDITutorial)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_url.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Copies the URL of the current entry
-						(e.g. ldap://localhost:389/cn=John
-						Fowler,ou=People,o=JNDITutorial)
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -751,22 +751,22 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the attribute descriptions of the
+						selected attributes and values as string to the
+						system clipboard.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_att.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Copies the attribute descriptions of the
-						selected attributes and values as string to the
-						system clipboard.
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -779,21 +779,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the selected values UTF-8 encoded to the
+						system clipboard.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_raw.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Copies the selected values UTF-8 encoded to the
-						system clipboard.
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -807,21 +807,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the selected values BASE-64 encoded to
+						the system clipboard.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_base64.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Copies the selected values BASE-64 encoded to
-						the system clipboard.
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -834,21 +834,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the selected values HEX encoded to the
+						system clipboard.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_hex.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Copies the selected values HEX encoded to the
-						system clipboard.
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -861,21 +861,21 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Copies the selected attribute and values in LDIF
+						format to the system clipboard.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/copy_ldif.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Copies the selected attribute and values in LDIF
-						format to the system clipboard.
+						</guiicon>
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -895,22 +895,22 @@
 						<itemizedlist>
 							<listitem>
 								<para>
+									Copies the selected
+									attribute and value as LDAP search
+									filter (attribute=value).
+								</para>
+							</listitem>
+							<listitem>
+								<para>
 									Icon:
 									<guiicon>
 										<inlinemediaobject>
-											<imageobject>
+											<imageobject>
 												<imagedata contentdepth="1em"
 													fileref="icons/filter_equals.gif" format="GIF" />
 											</imageobject>
 										</inlinemediaobject>
-									</guiicon>
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									Description: Copies the selected
-									attribute and value as LDAP search
-									filter (attribute=value).
+									</guiicon>
 								</para>
 							</listitem>
 							<listitem>
@@ -927,22 +927,22 @@
 						<itemizedlist>
 							<listitem>
 								<para>
+									Copies the selected
+									attribute and value as LDAP NOT
+									search filter (!(attribute=value)).
+								</para>
+							</listitem>
+							<listitem>
+								<para>
 									Icon:
 									<guiicon>
 										<inlinemediaobject>
-											<imageobject>
+											<imageobject>
 												<imagedata contentdepth="1em"
 													fileref="icons/filter_not.gif" format="GIF" />
 											</imageobject>
 										</inlinemediaobject>
-									</guiicon>
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									Description: Copies the selected
-									attribute and value as LDAP NOT
-									search filter (!(attribute=value)).
+									</guiicon>
 								</para>
 							</listitem>
 							<listitem>
@@ -959,23 +959,23 @@
 						<itemizedlist>
 							<listitem>
 								<para>
+									Copies the selected
+									attributes and values as LDAP AND
+									search filter
+									(&amp;(attribute1=value1)...(attributeN=valueN)).
+								</para>
+							</listitem>
+							<listitem>
+								<para>
 									Icon:
 									<guiicon>
 										<inlinemediaobject>
-											<imageobject>
+											<imageobject>
 												<imagedata contentdepth="1em"
 													fileref="icons/filter_and.gif" format="GIF" />
 											</imageobject>
 										</inlinemediaobject>
-									</guiicon>
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									Description: Copies the selected
-									attributes and values as LDAP AND
-									search filter
-									(&amp;(attribute1=value1)...(attributeN=valueN)).
+									</guiicon>
 								</para>
 							</listitem>
 						</itemizedlist>
@@ -987,23 +987,23 @@
 						<itemizedlist>
 							<listitem>
 								<para>
+									Copies the selected
+									attributes and values as LDAP OR
+									search filter
+									(|(attribute1=value1)...(attributeN=valueN)).
+								</para>
+							</listitem>
+							<listitem>
+								<para>
 									Icon:
 									<guiicon>
 										<inlinemediaobject>
-											<imageobject>
+											<imageobject>
 												<imagedata contentdepth="1em"
 													fileref="icons/filter_or.gif" format="GIF" />
 											</imageobject>
 										</inlinemediaobject>
-									</guiicon>
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									Description: Copies the selected
-									attributes and values as LDAP OR
-									search filter
-									(|(attribute1=value1)...(attributeN=valueN)).
+									</guiicon>
 								</para>
 							</listitem>
 						</itemizedlist>
@@ -1019,23 +1019,23 @@
 			<itemizedlist>
 				<listitem>
 					<para>
+						Deletes all values of the selected
+						attributes. Applicable to multi-valued
+						attributes, if you want to delete the complete
+						attribute just select one value use this action.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/delete_all.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Description: Deletes all values of the selected
-						attributes. Applicable to multi-valued
-						attributes, if you want to delete the complete
-						attribute just select one value use this action.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -1055,7 +1055,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Description: Opens the
+						Opens the
 						<link linkend="tools_attribute_wizard">
 							Edit Attribute wizard
 						</link>
@@ -1153,26 +1153,49 @@
 		</para>
 	</simplesect>
 
+	<simplesect id="tools_entry_editor_contextmenu_editentry">
+		<title>Edit Entry...</title>
+		<para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						Opens the 
+						<link linkend="tools_editentry_wizard">
+						Editor Entry Wizard</link>, used to edit the entry offline.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Shortcut:
+						<shortcut>
+							<keycap>F8</keycap>
+						</shortcut>
+					</para>
+				</listitem>
+			</itemizedlist>
+		</para>
+	</simplesect>
+
 	<simplesect id="tools_entry_editor_contextmenu_reload">
 		<title>Reload Attribute</title>
 		<para>
 			<itemizedlist>
 				<listitem>
 					<para>
+						Reloads the attributes of the current entry.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
 						Icon:
 						<guiicon>
 							<inlinemediaobject>
-								<imageobject>
+								<imageobject>
 									<imagedata contentdepth="1em"
 										fileref="icons/refresh.gif" format="GIF" />
 								</imageobject>
 							</inlinemediaobject>
-						</guiicon>
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Reloads the attributes of the current entry.
+						</guiicon>
 					</para>
 				</listitem>
 				<listitem>
@@ -1193,8 +1216,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						Description: Opens the Properties dialog with
-						the
+						Opens the Properties dialog with the
 						<link linkend="tools_attribute_properties">
 							Attribute properties page
 						</link>

Added: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.25.1_tools_search_logs_view.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.25.1_tools_search_logs_view.xml?rev=689113&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.25.1_tools_search_logs_view.xml (added)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.25.1_tools_search_logs_view.xml Tue Aug 26 08:38:04 2008
@@ -0,0 +1,218 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="tools_search_logs_view">
+	<title>Search Logs view</title>
+	<para>
+		The Search Logs view shows all search requests and optionally
+		all received search result entries.
+	</para>
+	
+	<simplesect id="tools_search_logs_view_concept">
+		<title>Concept</title>
+		<para>
+			All search requests are logged in LDIF to a logfile, it consists of
+			three parts: 
+			<itemizedlist>
+				<listitem>
+					<para>
+						The initial SEARCH REQUEST record. It contains all search request
+						parameters like search filter, scope and requested attributes.
+						It also contains the command line argument that could be used
+						to send the same request using the ldapsearch command line tool.
+					</para>
+				</listitem>		
+				<listitem>
+					<para>
+						Optional multiple SEARCH RESULT ENTRY records, one for each 
+						received entry.
+					</para>
+				</listitem>		
+				<listitem>
+					<para>
+						The final SEARCH RESULT DONE record. It contains the number
+						of received entries.
+					</para>
+				</listitem>		
+			</itemizedlist>
+			Each part contains a unique number that helps to put together all parts
+			for a specific request in case that there are multiple requests in parallel.
+		</para>
+		<para>
+			Example log of a SEARCH REQUEST record:
+			<code language="LDIF">
+				<sbr />
+				#!SEARCH REQUEST (112) OK
+				<sbr />
+				#!CONNECTION ldap://localhost:10389
+				<sbr />
+				#!DATE 2008-08-26T16:31:59.271
+				<sbr />
+				# LDAP URL     : ldap://localhost:10389/dc=example,dc=com?objectClass,cn,description?one?(objectClass=*)
+				<sbr />
+				# command line : ldapsearch -H ldap://localhost:10389 -x -D "uid=admin,ou=system" -W -b "dc=example,dc=com" -s one -a always -z 1000 "(objectClass=*)" "objectClass" "cn" "description"
+				<sbr />
+				# baseObject   : dc=example,dc=com
+				<sbr />
+				# scope        : singleLevel (1)
+				<sbr />
+				# derefAliases : derefAlways (3)
+				<sbr />
+				# sizeLimit    : 1000
+				<sbr />
+				# timeLimit    : 0
+				<sbr />
+				# typesOnly    : False
+				<sbr />
+				# filter       : (objectClass=*)
+				<sbr />
+				# attributes   : objectClass cn description
+				<sbr />
+			</code>
+		</para>
+		<para>
+			Example log of a SEARCH RESULT ENTRY record:
+			<code language="LDIF">
+				<sbr />
+				#!SEARCH RESULT ENTRY (112) OK
+				<sbr />
+				#!CONNECTION ldap://localhost:10389
+				<sbr />
+				#!DATE 2008-08-26T16:31:59.272
+				<sbr />
+				dn: cn=test,dc=example,dc=com
+				<sbr />
+				objectClass: person
+				<sbr />
+				objectClass: top
+				<sbr />
+				cn: test
+				<sbr />
+			</code>
+		</para>
+		<para>
+			Example log of a SEARCH RESULT DONE record:
+			<code language="LDIF">
+				<sbr />
+				#!SEARCH RESULT DONE (112) OK
+				<sbr />
+				#!CONNECTION ldap://localhost:10389
+				<sbr />
+				#!DATE 2008-08-26T16:31:59.273
+				<sbr />
+				# numEntries : 1
+				<sbr />
+			</code>
+		</para>
+		<para>
+			The search logging mechanism works with logfile rotation. 
+			It uses 10 logfiles each with 100KB per connection. 
+		</para>
+	</simplesect>
+			
+	<simplesect id="tools_search_logs_view_screenshot">
+		<title>Example screenshot</title>
+		<para>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata width="15cm"
+							fileref="images/tools_search_logs_1.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</screenshot>
+		</para>
+	</simplesect>
+
+	<simplesect id="tools_search_logs_view_toolbar">
+		<title>Toolbar</title>
+		<informaltable frame='all' >
+			<tgroup cols='3'>
+				<colspec colname="Icon" align="center" colwidth="1*" />
+				<colspec colname="Action" colwidth="2*" />
+				<colspec colname="Description" colwidth="4*" />
+				<thead>
+					<row>
+					  <entry>Icon</entry>
+					  <entry>Action</entry>
+					  <entry>Description</entry>
+					</row>
+				</thead>
+				<tbody>
+					<row>
+					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/clear.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
+					  <entry>Clear</entry>
+					  <entry>Clears the current search logfile.</entry>
+					</row>
+					<row>
+					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/refresh.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
+					  <entry>Refresh</entry>
+					  <entry>Reloads the current search logfile.</entry>
+					</row>
+					<row>
+					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/previous.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
+					  <entry>Older</entry>
+					  <entry>Loads an older search logfile.</entry>
+					</row>
+					<row>
+					  <entry><guiicon><inlinemediaobject><imageobject><imagedata contentdepth="1em" fileref="icons/next.gif" format="GIF"/></imageobject></inlinemediaobject></guiicon></entry>
+					  <entry>Newer</entry>
+					  <entry>Loads a newer search logfile.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</informaltable>						
+	</simplesect>
+	
+	<simplesect id="tools_search_logs_view_drop_down_menu">
+		<title>Drop Down Menu</title>
+		<para>
+			The drop down menu contains the following items:
+			<itemizedlist>
+				<listitem>
+					<para>
+						Enable Search Request Logs: Enables/Disables the search request and search result done logs.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Enable Search Result Entry Logs: Enables/Disables the search result entry logs. 
+						Note: You should only activate this options for debug reasons, otherwise your
+						logfile will overfill very fast.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Preferences...: Opens the
+						<link linkend="preferences_search_logs_view">
+							Search Logs preferences
+						</link>
+						dialog.
+					</para>
+				</listitem>
+			</itemizedlist>
+		</para>
+	</simplesect>
+	
+	<simplesect id="tools_search_logs_view_rotation">
+	</simplesect>	
+	
+<!-- 
+	Comment format, rotation
+ -->	
+</section>
\ No newline at end of file

Added: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.41.1_tools_editentry_wizard.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.41.1_tools_editentry_wizard.xml?rev=689113&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.41.1_tools_editentry_wizard.xml (added)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.41.1_tools_editentry_wizard.xml Tue Aug 26 08:38:04 2008
@@ -0,0 +1,123 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="tools_editentry_wizard">
+	<title>Edit Entry wizard</title>
+	<para>
+		This wizard helps you to edit an entry offline. You could make
+		multiple modifications, when finishing the wizard all your 
+		modifications are sent to the directory in one request. This
+		wizard is especially helpful when adding additional object
+		classes which require additional attributes.
+	</para>
+
+	<para>
+		To start the wizard choose <emphasis role="strong">Edit Entry...</emphasis>
+		from the Entry editor's context menu or use the 
+		<shortcut><keycap>F6</keycap></shortcut> shortcut.
+	</para>
+
+	<para>
+		The wizard is also the default value editor for the objectClass attribute,
+		so you could also start the wizard by editing the objectClass attribute. 
+	</para>
+
+	<para>
+		Editing the LDAP entry is a two-step process:
+		<orderedlist numeration="arabic">
+			<listitem>
+				<para>
+					<link linkend="tools_editentry_wizard_1">
+						Specify object classes of the entry.
+					</link>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<link linkend="tools_editentry_wizard_2">
+						Edit attributes and values of the entry.
+					</link>
+				</para>
+			</listitem>
+		</orderedlist>
+	</para>
+
+	<simplesect id="tools_editentry_wizard_1">
+		<title>Page 1</title>
+		<para>
+			On the first page you could change the object classes of
+			the entry.
+		</para>
+		<para>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata scale="50"
+							fileref="images/tools_newentry_wizard_2.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</screenshot>
+		</para>
+		<para>
+			The list
+			<emphasis role="strong">Available object classes</emphasis>
+			on the left side lists the object classes provided from
+			schema of the current connection. The list
+			<emphasis role="strong">Selected object classes</emphasis>
+			lists the object classes of the entry. To add object
+			classed to the "selected" list select some in the
+			"available" list and click the
+			<emphasis role="strong">Add</emphasis>
+			button. You could also double-click an object class in the
+			"available" list. To remove object classed from the
+			"selected" list select some in the "selected" list and click
+			the
+			<emphasis role="strong">Remove</emphasis>
+			button. You could also double-click an object class in the
+			"selected" list.
+		</para>
+	</simplesect>
+
+	<simplesect id="tools_editentry_wizard_2">
+		<title>Page 2</title>
+		<para>
+			On the second page you could change the attributes of the entry.
+		</para>
+		<para>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata scale="50"
+							fileref="images/tools_newentry_wizard_4.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</screenshot>
+		</para>
+		<para>
+			The layout and features are similar to the Entry editor. You
+			could add, edit or delete attributes and values.
+		</para>
+		<para>
+			As soon as all MUST attributes are filled the
+			<emphasis role="strong">Finish</emphasis>
+			button is activated. When clicking the button all modifications
+			will be sent to to the direcrory.
+		</para>
+	</simplesect>
+
+</section>
\ No newline at end of file

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.70_tools_value_editors.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.70_tools_value_editors.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.70_tools_value_editors.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.70_tools_value_editors.xml Tue Aug 26 08:38:04 2008
@@ -504,7 +504,7 @@
 					<mediaobject>
 						<imageobject>
 							<imagedata contentdepth="1em"
-								fileref="images/tools_value_editors_9a.png" format="PNG" />
+								fileref="images/tools_value_editors_10a.png" format="PNG" />
 						</imageobject>
 					</mediaobject>
 				</screenshot>
@@ -518,5 +518,34 @@
 		</simplesect>		
 	</section>		
 
+	<section id="tools_value_editors_oideditor">
+		<title>OID Editor</title>
+		<para>
+			The OID Editor is the default editor for attributes with OID syntax.
+		</para>
+		<simplesect id="tools_value_editors_oideditor_display">
+			<title>Display value</title>
+			<para>
+				The values are suffixed with the textual description of the OID.
+			</para>		
+			<para>
+				<screenshot>
+					<mediaobject>
+						<imageobject>
+							<imagedata contentdepth="1em"
+								fileref="images/tools_value_editors_9a.png" format="PNG" />
+						</imageobject>
+					</mediaobject>
+				</screenshot>
+			</para>
+		</simplesect>
+		<simplesect id="tools_value_editors_oideditor_edit">
+			<title>Edit value</title>
+			<para>
+				The In-Place Text Editor is used to edit values.
+			</para>
+		</simplesect>		
+	</section>		
+
 
 </section>
\ No newline at end of file

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2_tools.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2_tools.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2_tools.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2_tools.xml Tue Aug 26 08:38:04 2008
@@ -32,6 +32,7 @@
 		&tools_schema_browser;
 	
 		&tools_modification_logs_view;
+		&tools_search_logs_view;
 		&tools_progress_view;
 
 	</section>
@@ -41,6 +42,7 @@
 		
 		&tools_newconnection_wizard;
 		&tools_newentry_wizard;
+		&tools_editentry_wizard;
 		
 		&tools_attribute_wizard;
 		&tools_search_dialog;

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/3_tasks.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/3_tasks.xml?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/3_tasks.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/3_tasks.xml Tue Aug 26 08:38:04 2008
@@ -431,6 +431,14 @@
 				or press <shortcut><keycap>Delete</keycap></shortcut> key.
 			</para>
 		</section>		
+		
+		<section id="tasks_manage_entries_modifyobjectclass">
+			<title>Modifying the object class</title>
+			<para>
+				To modify the object class please use the 
+				<link linkend="tools_editentry_wizard">Edit Entry wizard</link>.
+			</para>
+		</section>		
 	</section>
 
 </chapter>

Modified: directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_browser_view_2.png
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_browser_view_2.png?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
Binary files - no diff available.

Added: directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_search_logs_1.png
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_search_logs_1.png?rev=689113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_search_logs_1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_value_editors_10a.png
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_value_editors_10a.png?rev=689113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/ldapbrowser-help/src/main/resources/html/images/tools_value_editors_10a.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java Tue Aug 26 08:38:04 2008
@@ -113,7 +113,7 @@
      */
     public String getText()
     {
-        return "Edit Entry";
+        return "Edit Entry...";
     }
 
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java?rev=689113&r1=689112&r2=689113&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java Tue Aug 26 08:38:04 2008
@@ -112,7 +112,7 @@
      */
     public String getText()
     {
-        return "Edit Entry";
+        return "Edit Entry...";
     }