Updated Smart Bookmarks help content. Patch by poobar@nycap.rr.com. Fixes

2004-04-28  Piers Cornwell  <piers@gnome.org>

        * help/C/epiphany.xml:
        * help/C/figures/ephy-addressbar-smartbookmark-screenshot.png:
        * help/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png:

        Updated Smart Bookmarks help content. Patch by
        poobar@nycap.rr.com. Fixes bug #139616.

2 files changed, 417 insertions, 220 deletions

diff --git a/ChangeLog b/ChangeLog
index 0521ba647..b41eb744a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-04-28  Piers Cornwell  <piers@gnome.org>
 
+        * help/C/epiphany.xml:
+        * help/C/figures/ephy-addressbar-smartbookmark-screenshot.png:
+        * help/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png:
+
+        Updated Smart Bookmarks help content. Patch by
+        poobar@nycap.rr.com. Fixes bug #139616.
+
+2004-04-28  Piers Cornwell  <piers@gnome.org>
+
 	* help/C/figures/ephy-screenshot.png:
         * help/C/figures/ephy-history-window-screenshot.png:
 
diff --git a/help/C/epiphany.xml b/help/C/epiphany.xml
index 99bbb6c12..7595f06b4 100644
--- a/help/C/epiphany.xml
+++ b/help/C/epiphany.xml
@@ -36,7 +36,7 @@
       <holder>David Bordoley</holder>
     </copyright>
     <copyright>
-      <year>2003</year>
+      <year>2004</year>
       <holder>Piers Cornwell</holder>
     </copyright>
 
@@ -65,7 +65,7 @@
 	<surname>Somayaji</surname> 
 	<affiliation> 
 	  <orgname>GNOME Documentation Project</orgname> 
-	  <address> <email>patanjali@codito.com</email> </address> 
+	  <address><email>patanjali@codito.com</email></address> 
 	</affiliation> 
       </author> 
       <author> 
@@ -73,7 +73,7 @@
 	<surname>Bordoley</surname> 
 	<affiliation> 
 	  <orgname>Epiphany Development Team</orgname> 
-	  <address> <email>bordoley@msu.edu</email> </address> 
+	  <address><email>bordoley@msu.edu</email></address> 
 	</affiliation> 
       </author> 
       <author> 
@@ -81,7 +81,7 @@
 	<surname>Cornwell</surname> 
 	<affiliation> 
 	  <orgname>Epiphany Development Team</orgname> 
-	  <address> <email>piers@myrealbox.com</email> </address> 
+	  <address><email>piers@gnome.org</email></address> 
 	</affiliation> 
       </author>
     </authorgroup>
@@ -579,27 +579,31 @@
         </sect2>	
 	<sect2 id="to-change-zoom">
 	  <title>To Change the Zoom Factor</title>

-	  <para>You can use the following methods to resize the view of a page</para>

-	  <itemizedlist>

-	  	<listitem><para>To enlarge the view of a page, choose 

-	  	<menuchoice>

-		<guimenu>View</guimenu>

-		<guimenuitem>Zoom In</guimenuitem>

-	  	</menuchoice>.</para>

-		</listitem>

-		<listitem><para>To shrink the view of a page, choose 

-		<menuchoice>

-		<guimenu>View</guimenu>

-		<guimenuitem>Zoom Out</guimenuitem>

-		</menuchoice>.</para>

-		</listitem>

-		<listitem><para>To view the page at its actual size, choose 

-		<menuchoice>

-		<guimenu>View</guimenu>

-		<guimenuitem>Normal Size</guimenuitem>

-		</menuchoice>. </para>

-		</listitem>

-	  </itemizedlist>
+	  <para>
+            You can use the following methods to resize the view of a page
+          </para>

+	  <itemizedlist>
+            <listitem>
+              <para>To enlarge the view of a page, choose <menuchoice>

+                <guimenu>View</guimenu><guimenuitem>Zoom In</guimenuitem>

+                </menuchoice>.
+              </para>

+            </listitem>
+            <listitem>
+              <para>
+                To shrink the view of a page, choose <menuchoice>

+                <guimenu>View</guimenu><guimenuitem>Zoom Out</guimenuitem>

+                </menuchoice>.
+              </para>

+            </listitem>

+            <listitem>
+              <para>
+                To view the page at its actual size, choose <menuchoice>

+                <guimenu>View</guimenu><guimenuitem>Normal Size</guimenuitem>

+                </menuchoice>.
+              </para>

+            </listitem>

+          </itemizedlist>
         </sect2>
 	<sect2 id="to-view-page-source">
           <title>To View the Source of a Page</title>
@@ -630,8 +634,8 @@
               <term>To open a link in a new tab</term>
               <listitem>
                 <para>
-                  Right click it and select <guimenuitem>Open Link in New Tab</guimenuitem>, click 
-                  with the middle mouse button.
+                  Right click it and select <guimenuitem>Open Link in New 
+                  Tab</guimenuitem>, click with the middle mouse button.
                 </para>
               </listitem>
             </varlistentry>
@@ -692,11 +696,15 @@
             principles: 
             <itemizedlist>
               <listitem>
-              Building a browser with the simplest interface possible.
+                <para>
+                  Building a browser with the simplest interface possible.
+	        </para>
               </listitem>
               <listitem>
-              Avoiding the need for the user to remember addresses of
-              sites that the user wants to visit. 
+                <para>
+                  Avoiding the need for the user to remember addresses of
+                  sites that the user wants to visit. 
+		</para>
               </listitem>
             </itemizedlist>
           </para>
@@ -767,32 +775,40 @@
             accessed by: 
             <itemizedlist>
               <listitem>
-              Typing in a topic in the location bar of the main
-              window drops down a list of bookmarks of that category.
+               <para>
+                 Typing in a topic in the location bar of the main
+                 window drops down a list of bookmarks of that category.
+		</para>
               </listitem>
               <listitem>
-              A word typed into the location bar are automatically
-              searched in the bookmark database and matching bookmarks
-              are shown in a drop down list below the location bar. 
+               <para>
+                 A word typed into the location bar are automatically
+                 searched in the bookmark database and matching bookmarks
+                 are shown in a drop down list below the location bar. 
+		</para>
               </listitem>
               <listitem>
-              The menu item <guimenu>Bookmark</guimenu> gives a menu of all the
-              different topics. Bookmarks related to these topics can
-              then be accessed from submenus here. This is closest to
-              the traditional method of accessing bookmarks, and is
-              provided to keep compatibility.
+               <para>
+                 The menu item <guimenu>Bookmark</guimenu> gives a menu of 
+		 all the different topics. Bookmarks related to these topics 
+		 can then be accessed from submenus here. This is closest to
+                 the traditional method of accessing bookmarks, and is
+                 provided to keep compatibility.
+		</para>
               </listitem>
               <listitem>
-              The bookmark bar can also be used to access your 
-              bookmarks. 
-              Choose <menuchoice>
-                     <guimenu>View</guimenu>
-                     <guimenuitem>Bookmarks Bar</guimenuitem>
-                     </menuchoice>
-              to add the Bookmark bar. However, each topic and
-              bookmark needs to be configured in the Bookmarks dialog
-              to be shown on this bar. This can be used to organise
-              most frequently used bookmarks. 
+               <para>
+                 The bookmark bar can also be used to access your 
+                 bookmarks. 
+                 Choose <menuchoice>
+                        <guimenu>View</guimenu>
+                        <guimenuitem>Bookmarks Bar</guimenuitem>
+                        </menuchoice>
+                 to add the Bookmark bar. However, each topic and
+                 bookmark needs to be configured in the Bookmarks dialog
+                 to be shown on this bar. This can be used to organise
+                 most frequently used bookmarks. 
+	        </para>
               </listitem>
             </itemizedlist>
           </para>
@@ -836,60 +852,86 @@ history link in the history window, then choose <guimenuitem>Bookmark Link..</gu
         </sect2>
 	<sect2 id="to-select-bookmarks">
           <title>To Select Bookmarks and Topics</title>
-          <para>You can select bookmarks and topics in several
-ways.  <xref linkend="epiphany-TBL-2"/> describes how to select items in the bookmark window.</para>
-      		<table frame="topbot" id="epiphany-TBL-2">
-        	<title>Selecting Items in the Bookmarks Window</title>
-        	<tgroup cols="2" colsep="0" rowsep="0">
-          	<colspec colname="colspec0" colwidth="36.36*"/>
-          	<colspec colname="colspec2" colwidth="63.64*"/>
-          	<thead>
-            	<row rowsep="1">
-              	<entry valign="top">
-                <para>Task</para>
-              	</entry>
-              	<entry colname="colspec2" valign="top">
-                <para>Action</para>
-              	</entry>
+          <para>
+            You can select bookmarks and topics in several ways. 
+            <xref linkend="epiphany-TBL-2"/> describes how to select items 
+            in the bookmark window.
+          </para>
+          <table frame="topbot" id="epiphany-TBL-2">
+            <title>Selecting Items in the Bookmarks Window</title>
+            <tgroup cols="2" colsep="0" rowsep="0">
+              <colspec colname="colspec0" colwidth="36.36*"/>
+              <colspec colname="colspec2" colwidth="63.64*"/>
+              <thead>
+                <row rowsep="1">
+                  <entry valign="top">
+                    <para>
+                      Task
+                    </para>
+                  </entry>
+              	  <entry colname="colspec2" valign="top">
+                    <para>
+                      Action
+                    </para>
+                  </entry>
             	</row>
-          	</thead>
-          	<tbody>
-            	<row>
-              	<entry colname="colspec0" valign="top">
-                <para>Select a bookmark or topic</para>
-              	</entry>
-              	<entry colname="colspec2" valign="top">
-                <para>Click on the bookmark or topic.</para>
-              	</entry>
+              </thead>
+              <tbody>
+                <row>
+                  <entry colname="colspec0" valign="top">
+                    <para>
+                      Select a bookmark or topic
+                    </para>
+              	  </entry>
+              	  <entry colname="colspec2" valign="top">
+                    <para>
+                      Click on the bookmark or topic.
+                    </para>
+              	  </entry>
             	</row>
             	<row>
-              	<entry colname="colspec0" valign="top">
-                <para>Select a group of contiguous bookmarks</para>
-              	</entry>
-              	<entry colname="colspec2" valign="top">
-                <para>Press-and-hold <keycap>Shift</keycap>. Click on the first bookmark in the group, then click on the last bookmark in the group.</para>
-              	</entry>
+              	  <entry colname="colspec0" valign="top">
+                    <para>
+                      Select a group of contiguous bookmarks
+                    </para>
+              	  </entry>
+              	  <entry colname="colspec2" valign="top">
+                    <para>
+                      Press-and-hold <keycap>Shift</keycap>. Click on the 
+                      first bookmark in the group, then click on the last 
+                      bookmark in the group.
+                    </para>
+                  </entry>
             	</row>
             	<row>
-              	<entry colname="colspec0" valign="top">
-                <para>Select multiple bookmarks</para>
-              	</entry>
-              	<entry colname="colspec2" valign="top">
-                <para>Press-and-hold <keycap>Ctrl</keycap>.
-Click on the bookmark that you want to select.</para>
-              	</entry>
+              	  <entry colname="colspec0" valign="top">
+                    <para>
+                      Select multiple bookmarks
+                    </para>
+              	  </entry>
+              	  <entry colname="colspec2" valign="top">
+                    <para>
+                      Press-and-hold <keycap>Ctrl</keycap>. Click on the 
+                      bookmark that you want to select.
+                    </para>
+              	  </entry>
             	</row>
             	<row>
-              	<entry colname="colspec0" valign="top">
-                <para>Select all bookmarks in a topic</para>
-              	</entry>
-              	<entry colname="colspec2" valign="top">
-                <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice>.</para>
-              	</entry>
+              	  <entry colname="colspec0" valign="top">
+                    <para>
+                      Select all bookmarks in a topic
+                    </para>
+              	  </entry>
+              	  <entry colname="colspec2" valign="top">
+                    <para>
+                      Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
+                      Select All</guimenuitem></menuchoice>.
+                    </para>
+              	  </entry>
             	</row>
-          	</tbody>
-        	</tgroup>
-      		</table>
+              </tbody>
+            </tgroup>
+          </table>
         </sect2>
 	<sect2 id="to-open-bookmark">
           <title>To Open a Bookmark in a New Window or Tab</title>
@@ -915,20 +957,27 @@ Click on the bookmark that you want to select.</para>
              </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>
+             <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">
@@ -1029,74 +1078,183 @@ Click on the bookmark that you want to select.</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>
+            <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>
-          <para>You can add a bookmark or topic to the bookmarks bar in the following ways:</para>
-		<variablelist>
-    		<varlistentry>
-    		<term><guimenu>File</guimenu> menu</term>
-    		<listitem>
-    		<para>Select the bookmark or topic you wish to add, and choose 
-    		<menuchoice>
-    		<guisubmenu>File</guisubmenu>
-    		<guimenuitem>Show in Bookmarks Bar</guimenuitem>
-    		</menuchoice>. </para>
-    		</listitem>
-    		</varlistentry>
-    		<varlistentry>
-    		<term>Drag and Drop</term>
-    		<listitem>
-    		<para>You can drag and drop bookmarks and topics from the bookmarks window onto the bookmarks bar.</para>
-    		</listitem>
-    		</varlistentry>
-    		</variablelist>
+          <para>
+            You can add a bookmark or topic to the bookmarks bar in the following ways:
+          </para>
+          <variablelist>
+            <varlistentry>
+              <term>
+                <guimenu>File</guimenu> menu
+              </term>
+              <listitem>
+                <para>
+                  Select the bookmark or topic you wish to add, and choose 
+                  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>
+                  Show in Bookmarks Bar</guimenuitem></menuchoice>.
+                </para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+             <term>
+               Drag and Drop
+             </term>
+             <listitem>
+               <para>
+                 You can drag and drop bookmarks and topics from the 
+                 bookmarks window onto the bookmarks bar.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
         </sect2>
 	<sect2 id="to-remove-bookmark-or-topic-from-bookmarks-bar">
           <title>To Remove a Bookmark or Topic From the Bookmarks Bar</title>
-          <para>You can remove a bookmark or topic from the bookmarks bar in the following ways:</para>
-		<variablelist>
-    		<varlistentry>
-    		<term><guimenu>File</guimenu> menu</term>
-    		<listitem>
-    		<para>Select the bookmark or topic you wish to remove, and choose 
-    		<menuchoice>
-    		<guisubmenu>File</guisubmenu>
-    		<guimenuitem>Show in Bookmarks Bar</guimenuitem>
-    		</menuchoice>.</para>
-    		</listitem>
-    		</varlistentry>
-    		<varlistentry>
-    		<term>Toolbar Editor</term>
-    		<listitem>
-    		<para>You can remove bookmarks and topics from the bookmarks bar 
-		      using the toolbar editor as described in the section
-		      <xref linkend="to-edit-toolbars"/>.</para>
-    		</listitem>
-    		</varlistentry>
-    		</variablelist>
-        </sect2>
-	<sect2 id="smart-bookmarks">
-          <title>Smart Bookmarks</title>
           <para>
-            Smart bookmarks are a special kind of bookmark that can take one or 
-            more arguments. If you add a smart bookmark to a toolbar, you will 
-            see its name and a text box. You can enter text into the box and press 
-            enter to perform the function of the smart bookmark.
+            You can remove a bookmark or topic from the bookmarks bar in the following ways:
           </para>
+          <variablelist>
+            <varlistentry>
+              <term>
+                <guimenu>File</guimenu> menu
+              </term>
+              <listitem>
+                <para>
+                  Select the bookmark or topic you wish to remove, and choose 
+                  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>Show 
+                  in Bookmarks Bar</guimenuitem></menuchoice>.
+                </para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>
+                Toolbar Editor
+              </term>
+              <listitem>
+                <para>
+                  You can remove bookmarks and topics from the bookmarks bar 
+		  using the toolbar editor as described in the section
+		  <xref linkend="to-edit-toolbars"/>.
+                </para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </sect2>
+	<sect2 id="smart-bookmarks">
+	  <title>Smart Bookmarks</title>
           <para>
-            To add a smart bookmark, go to the 
-            <ulink url="http://galeon.sourceforge.net/bookmarks/browse.php" type="http">
-            Smart Bookmarks archive</ulink> and follow the instructions there.
           </para>
+          <sect3 id="smart-bookmarks-introduction">
+            <title>Introduction</title>
+            <para>
+              Smart Bookmarks are a special kind of bookmark that can take one or more 
+              arguments. By using Smart Bookmarks, web searches and queries can be 
+              performed without loading a query page first.
+            </para>
+            <para>
+              All of your Smart Bookmarks will appear in a drop down menu if you enter 
+              some text in the address bar, as shown in  
+              <xref linkend="ephy-addressbar-smartbookmark-screenshot"/>. By selecting 
+              the Smart Bookmark, a query using the given text will be performed.
+            </para>
+            <figure id="ephy-addressbar-smartbookmark-screenshot">
+              <title>Smart Bookmark in address bar drop down menu</title>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata
+                    fileref="figures/ephy-addressbar-smartbookmark-screenshot.png"
+                    format="PNG"/> 
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </figure>
+            <para>
+              It is also possible to add a Smart Bookmark to a toolbar by selecting 
+              <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
+              property dialog. If you do so, you will see its name and a text box, 
+              as shown in <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>. 
+              You can enter text into the box and press enter to perform the function of 
+              the Smart Bookmark.
+            </para>
+            <figure id="ephy-bookmarkbar-smartbookmark-screenshot">
+              <title>Smart Bookmark in the bookmarks bar</title>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata
+                    fileref="figures/ephy-bookmarkbar-smartbookmark-screenshot.png"
+                    format="PNG"/> 
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </figure>
+          </sect3>
+          <sect3 id="smart-bookmarks-create-a-smartbookmark">
+            <title>How do I create a Smart Bookmark?</title>
+            <para>
+              Smart Bookmarks can be created by finding out what address a site uses for 
+              searching, for example 
+              <command>http://www.google.com/search?q=SEARCHPHRASE</command> will 
+              start a Google query for <command>SEARCHPHRASE</command>.
+            </para>
+            <para>
+              To make this address a Smart Bookmark, perform the following steps:
+            </para>
+            <orderedlist>
+              <listitem>
+                <para>
+                  Add a bookmark for 
+                  <command>http://www.google.com/search?q=SEARCHPHRASE</command>
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  Open the bookmarks window.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  In the <guimenuitem>Address</guimenuitem> field of the bookmark's 
+                  <guimenuitem>Properties</guimenuitem> dialog, replace 
+                  <command>SEARCHPHRASE</command> with %s.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  (Optional) If you want the Smart Bookmark to appear in the bookmarks
+                  bar, as shown in 
+                  <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>, select 
+                  <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
+                  <guimenuitem>Properties</guimenuitem> dialog.
+                </para>
+              </listitem>
+            </orderedlist>
+          </sect3>
+          <sect3 id="smart-bookmarks-archive">
+            <title>Smart Bookmarks Archive</title>
+            <para>
+              An archive containing lots of Smart Bookmarks is available at the 
+              <ulink url="http://galeon.sourceforge.net/bookmarks/">Galeon</ulink> 
+              web site.
+            </para>
+          </sect3>
         </sect2>
   </sect1>
 
@@ -1156,50 +1314,71 @@ bookmark, then choose <guimenuitem>Copy Address</guimenuitem>.</para>
 	<sect2 id="to-open-history-link">
           <title>To Open a History Link in a New Window or Tab</title>
           <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>
+            <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>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>
+          <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>
@@ -1221,16 +1400,25 @@ history link, then choose <guimenuitem>Delete</guimenuitem>.</para>
         </sect2>
 	<sect2 id="to-copy-history-link-address">
           <title>To Copy the Address of a History Link</title>
-          <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>
+          <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>
 
@@ -2296,7 +2484,7 @@ history link, then choose <guimenuitem>Copy Address</guimenuitem>.</para>
 
     <para>
       &fr; was written by Marco Presenti Gritti 
-      (<email>marco@it.gnome.org</email>). To find more information
+      (<email>marco@gnome.org</email>). To find more information
       about &fr;, please visit the <ulink
       url="http://www.gnome.org/projects/epiphany/" type="http">Epiphany 
       Web page</ulink>. 
@@ -2305,7 +2493,7 @@ history link, then choose <guimenuitem>Copy Address</guimenuitem>.</para>
     <para>
       This manual was written by David Bordoley 
       (<email>bordoley@msu.edu</email>), Piers Cornwell 
-      (<email>piers@myrealbox.com</email>) and Patanjali Somayaji 
+      (<email>piers@gnome.org</email>) and Patanjali Somayaji 
       (<email>patanjali@codito.com</email>). 
     </para>