s/bookmark page/bookmark link, more consistent with the docs and better

2003-05-13  David Bordoley <bordoley@msu.edu>

	* data/ui/epiphany-history-window-ui.xml.in:
	* src/ephy-history-window.c:

	s/bookmark page/bookmark link, more consistent with
	the docs and better ui.

	* help/C/epiphany.xml:

	Start the create a bookmark section. Needs more work.
	Finish to open/copy address bookmark/history link sections.

4 files changed, 149 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index ffbb89c93..7690ed160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-05-13  David Bordoley <bordoley@msu.edu>
+
+	* data/ui/epiphany-history-window-ui.xml.in:
+	* src/ephy-history-window.c:
+
+	s/bookmark page/bookmark link, more consistent with
+	the docs and better ui.
+
+	* help/C/epiphany.xml:
+
+	Start the create a bookmark section. Needs more work.
+	Finish to open/copy address bookmark/history link sections.
+	
 2003-05-13  Xan Lopez  <xan@masilla.org>
 
 	* data/starthere/smartbookmarks.xml.in:
diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in
index e2a5e0322..d716f0bd5 100644
--- a/data/ui/epiphany-history-window-ui.xml.in
+++ b/data/ui/epiphany-history-window-ui.xml.in
@@ -5,7 +5,7 @@
         <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
 	<menuitem name="FileOpenInTab" verb="OpenInTab"/>
 	<separator name="FileSep1"/>
-	<menuitem name="FileBookmarkPage" verb="BookmarkPage"/>
+	<menuitem name="FileBookmarkLink" verb="BookmarkLink"/>
 	<menuitem name="FileDelete" verb="Delete"/>
 	<separator name="FileSep2"/>
 	<menuitem name="FileClose" verb="Close"/>
@@ -35,7 +35,7 @@
 	<separator name="HistoryPopupSep1"/>
 	<menuitem name="CopyHST" verb="Copy"/>
 	<separator name="HistoryPopupSep2"/>
-	<menuitem name="BookmarkPageHST" verb="BookmarkPage"/>
+	<menuitem name="BookmarkLinkHST" verb="BookmarkLink"/>
 	<menuitem name="DeleteHST" verb="Delete"/>
 </popup>
 
diff --git a/help/C/epiphany.xml b/help/C/epiphany.xml
index 6b376f619..9a47cf836 100644
--- a/help/C/epiphany.xml
+++ b/help/C/epiphany.xml
@@ -307,11 +307,6 @@ you can choose items related to the display of the web page.</para>
           <para>
           </para>
         </sect2>
-	<sect2 id="to-bookmark-page">
-          <title>To Bookmark a Page</title>
-          <para>
-          </para>
-        </sect2>
 	<sect2 id="to-find-text-in-page">
           <title>To Find Text in a Page</title>
 	  <para>To search a page for a string, perform the following steps:</para>
@@ -393,11 +388,6 @@ you can choose items related to the display of the web page.</para>
           <para>
           </para>
         </sect2>
-	<sect2 id="to-bookmark-link">
-          <title>To Bookmark a Link</title>
-          <para>
-          </para>
-        </sect2>
 	<sect2 id="to-switch-between-tab">
           <title>To Switch in Between Tabs</title>
           <para>
@@ -422,8 +412,40 @@ you can choose items related to the display of the web page.</para>
         </sect2>
 	<sect2 id="to-create-new-bookmark">
 	  <title>To Create a New Bookmark</title>
-          <para>
-          </para>
+          <para>You can create new bookmarks in several ways.</para>
+		<variablelist>
+    		<varlistentry>
+    		<term>Browser Window</term>
+    		<listitem>
+			<itemizedlist>

+	  		<listitem><para>To bookmark the currently viewed page, choose 

+	  		<menuchoice>

+			<guimenu>File</guimenu>

+			<guimenuitem>Bookmark Page...</guimenuitem>

+	  		</menuchoice>.</para>

+			</listitem>
+			<listitem><para>To bookmark a link in the currently viewed page, 
+					right click on the link and choose 

+	  		<menuchoice>

+			<guimenuitem>Bookmark Link...</guimenuitem>

+	  		</menuchoice>.</para>

+			</listitem>
+			</itemizedlist>
+    		</listitem>
+    		</varlistentry>
+		<varlistentry>
+		<term>History Window</term>
+    		<listitem>
+		<para>To bookmark the currently selected history link, choose 

+	  	<menuchoice>

+		<guimenu>File</guimenu>

+		<guimenuitem>Bookmark Link...</guimenuitem>

+	  	</menuchoice>. Alternatively, right-click on the
+history link in the history window, then choose <guimenuitem>Bookmark Link..</guimenuitem>.</para>

+		</listitem>
+    		</varlistentry>
+    		</variablelist>
+	
         </sect2>
 	<sect2 id="to-select-bookmarks">
           <title>To Select Bookmarks and Topics</title>
@@ -484,8 +506,38 @@ Click on the bookmark that you want to select.</para>
         </sect2>
 	<sect2 id="to-open-bookmark">
           <title>To Open a Bookmark in a New Window or Tab</title>
-          <para>
-          </para>
+          <variablelist>
+    		<varlistentry>
+    			<term>To open a bookmark in a new window perform the following steps:</term>
+    				<listitem>
+				<orderedlist>
+        			<listitem>
+          			<para>Select the bookmark that you want to open.</para>
+        			</listitem>
+        			<listitem>
+          			<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in New 						Window</guimenuitem></menuchoice>. 
+					Alternatively, right-click on the bookmark, then choose 					<menuchoice><guimenuitem>Open in New Window</guimenuitem>
+					</menuchoice>.</para>
+        			</listitem>
+				</orderedlist>
+				</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>To open a bookmark in a new tab perform the following steps:</term>
+				<listitem>
+				<orderedlist>
+        			<listitem>
+          			<para>Select the bookmark that you want to open.</para>
+        			</listitem>
+        			<listitem>
+          			<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in New 						Tab</guimenuitem></menuchoice>. 
+					Alternatively, right-click on the bookmark, then choose 					<menuchoice><guimenuitem>Open in New Tab</guimenuitem>
+					</menuchoice>.</para>
+        			</listitem>
+				</orderedlist>
+				</listitem>
+		</varlistentry>
+	  </variablelist>
         </sect2>
 	<sect2 id="to-create-new-topic">
           <title>To Create a New Topic</title>
@@ -545,8 +597,16 @@ bookmarks or topic in the bookmarks window, then choose <guimenuitem>Delete</gui
         </sect2>
 	<sect2 id="to-copy-bookmark-address">
           <title>To Copy the Address of a Bookmark</title>
-          <para>
-          </para>
+          <para>To copy the address of a bookmark perform the following steps:</para>
+      		<orderedlist>
+        	<listitem>
+          	<para>Select the bookmark.</para>
+        	</listitem>
+        	<listitem>
+          	<para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy Address</guimenuitem></menuchoice>. Alternatively, right-click on the
+bookmark, then choose <guimenuitem>Copy Address</guimenuitem>.</para>
+        	</listitem>
+      		</orderedlist>
         </sect2>
 	<sect2 id="to-add-bookmark-or-topic-to-bookmarks-bar">
           <title>To Add a Bookmark or Topic to the Bookmarks Bar</title>
@@ -603,7 +663,7 @@ bookmarks or topic in the bookmarks window, then choose <guimenuitem>Delete</gui
 
 <!-- ============= Managing Your History Links ================ -->
   <sect1 id="ephy-managing-history">
-      <title>Managing Your History Link</title>
+      <title>Managing Your History Links</title>
       <para>
       </para>
 	<sect2 id="overview-of-history">
@@ -618,13 +678,51 @@ bookmarks or topic in the bookmarks window, then choose <guimenuitem>Delete</gui
         </sect2>
 	<sect2 id="to-open-history-link">
           <title>To Open a History Link in a New Window or Tab</title>
-          <para>
-          </para>
+          <variablelist>
+    		<varlistentry>
+    			<term>To open a history link in a new window perform the following steps:</term>
+    				<listitem>
+				<orderedlist>
+        			<listitem>
+          			<para>Select the history link that you want to open.</para>
+        			</listitem>
+        			<listitem>
+          			<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in New 						Window</guimenuitem></menuchoice>. 
+					Alternatively, right-click on the history link, then choose 					<menuchoice><guimenuitem>Open in New Window</guimenuitem>
+					</menuchoice>.</para>
+        			</listitem>
+				</orderedlist>
+				</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>To Open a history link in a new tab perform the following steps:</term>
+				<listitem>
+				<orderedlist>
+        			<listitem>
+          			<para>Select the history link that you want to open.</para>
+        			</listitem>
+        			<listitem>
+          			<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in New 						Tab</guimenuitem></menuchoice>. 
+					Alternatively, right-click on the history link, then choose 					<menuchoice><guimenuitem>Open in New Tab</guimenuitem>
+					</menuchoice>.</para>
+        			</listitem>
+				</orderedlist>
+				</listitem>
+		</varlistentry>
+	  </variablelist>
         </sect2>
 	<sect2 id="to-delete-history-link">
           <title>To Delete a History Link</title>
-          <para>
-          </para>
+          <para>To delete a history link perform the following steps:</para>
+      		<orderedlist>
+        	<listitem>
+          	<para>Select the history link that you want to delete.</para>
+        	</listitem>
+        	<listitem>
+          	<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>. Alternatively, right-click on the
+history link, then choose <guimenuitem>Delete</guimenuitem>.</para>
+        	</listitem>
+      		</orderedlist>
         </sect2>
 	<sect2 id="to-search-history">
           <title>To Search Your History Links</title>
@@ -633,13 +731,16 @@ bookmarks or topic in the bookmarks window, then choose <guimenuitem>Delete</gui
         </sect2>
 	<sect2 id="to-copy-history-link-address">
           <title>To Copy the Address of a History Link</title>
-          <para>
-          </para>
-        </sect2>
-	<sect2 id="to-bookmark-history-link">
-          <title>To Bookmark a History Link</title>
-          <para>
-          </para>
+          <para>To copy the address of a history link perform the following steps:</para>
+      		<orderedlist>
+        	<listitem>
+          	<para>Select the history link.</para>
+        	</listitem>
+        	<listitem>
+          	<para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy Address</guimenuitem></menuchoice>. Alternatively, right-click on the
+history link, then choose <guimenuitem>Copy Address</guimenuitem>.</para>
+        	</listitem>
+      		</orderedlist>
         </sect2>
   </sect1>
 
@@ -658,7 +759,7 @@ bookmarks or topic in the bookmarks window, then choose <guimenuitem>Delete</gui
   </sect1>
 
 <!-- ============= Customizing Epiphany ==== -->
-  <sect1 id="ephy-customiz">
+  <sect1 id="ephy-customize">
       <title>Customizing &fr;</title>
       <para>
       </para>
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 2d273a4a0..8fd0115e1 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -76,7 +76,7 @@ static void cmd_open_bookmarks_in_browser (EggAction *action,
 					   EphyHistoryWindow *editor);
 static void cmd_delete                    (EggAction *action,
                                            EphyHistoryWindow *editor);
-static void cmd_bookmark_page             (EggAction *action,
+static void cmd_bookmark_link             (EggAction *action,
                                            EphyHistoryWindow *editor);
 static void cmd_clear			  (EggAction *action,
 				           EphyHistoryWindow *editor);
@@ -133,9 +133,9 @@ static EggActionGroupEntry ephy_history_ui_entries [] = {
 	{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
 	  N_("Delete the selected history link"),
 	  G_CALLBACK (cmd_delete), NULL },
-	{ "BookmarkPage", N_("Boo_kmark Page..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	{ "BookmarkLink", N_("Boo_kmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
 	  N_("Bookmark the selected history link"),
-	  G_CALLBACK (cmd_bookmark_page), NULL },
+	  G_CALLBACK (cmd_bookmark_link), NULL },
 	{ "Close", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
 	  N_("Close the history window"),
 	  G_CALLBACK (cmd_close), NULL },
@@ -440,7 +440,7 @@ cmd_delete (EggAction *action,
 }
 
 static void
-cmd_bookmark_page (EggAction *action,
+cmd_bookmark_link (EggAction *action,
                    EphyHistoryWindow *editor)
 {
         GtkWindow *window;