Merged with main repo.

5 files changed, 37 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index fbb5bec2..49cd1139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ user. For a history of changes in full detail, see our Mercurial repository
 at http://hg.dillo.org/dillo
 
 
-dillo-3.0.4 [not released yet]
+dillo-3.0.4 [April 09, 2014]
 
 +- OPTGROUP and INS elements.
  - Some HTML5 elements, etc.
diff --git a/configure.ac b/configure.ac
index c9807deb..f6f9d5c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with aclocal, autoconf and automake.
 
-AC_INIT([dillo], [3.0.4-rc2])
+AC_INIT([dillo], [3.0.4])
 
 dnl Detect the canonical target build environment
 AC_CANONICAL_TARGET
diff --git a/dillorc b/dillorc
index 9e13f84e..82684706 100644
--- a/dillorc
+++ b/dillorc
@@ -154,10 +154,11 @@
 
 # Set the URLs used by the web search dialog.
 # "%s" is replaced with the search keywords separated by '+'.
-# Format: search_url="[<label> ]<url>"
+# Format: search_url="[prefix ][<label> ]<url>"
 # You can enable multiple search_url strings at once and select from among
 # them at runtime, with the first being the default.
-search_url="DuckDuckGo http://duckduckgo.com/lite/?kp=-1&q=%s"
+# (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+search_url="dd DuckDuckGo http://duckduckgo.com/lite/?kp=-1&q=%s"
 search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
 search_url="Free Dictionary http://www.thefreedictionary.com/%s"
 search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
diff --git a/doc/user_help.html b/doc/user_help.html
index 1824c8ae..9de2056f 100644
--- a/doc/user_help.html
+++ b/doc/user_help.html
@@ -304,6 +304,28 @@
 
  <table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3>
    <tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat">
+   <h4><font color="green">Web search from the Location bar:</font></h4>
+   </td></tr>
+   <tr><td bgcolor="#70a0c0">
+   <p>
+   Besides the GUI, you can also use the location bar as a CLI for quick
+   web search. You can specify a prefix in <b><font color="#5040a0">dillorc</font></b>
+   for each search engine and use it from the location bar.
+   <p>
+   Example, in dillorc:<br>
+   <blockquote>
+    <code>search_url="dd Duckduckgo http://duckduckgo.com/lite/?kp=-1&q=%s"</code>
+   </blockquote>
+   means you can reach the location bar (CTRL+L), then type:
+   <blockquote>
+    <code>dd dillo browser</code>
+   </blockquote>
+   to web-search with Duckduckgo for the keywords: <code>dillo browser</code>.
+   </td></tr>
+ </table>
+
+ <table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3>
+   <tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat">
    <h4><font color="green">Keyboard shortcuts:</font></h4>
    </td></tr>
    <tr><td bgcolor="#70a0c0">
diff --git a/src/IO/about.c b/src/IO/about.c
index 22999b79..772e1247 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -230,7 +230,7 @@ const char *const AboutSplash=
 "<tr>\n"
 " <td bgcolor='#CCCCCC'>\n"
 "  <h4>Release overview</h4>\n"
-"  April ??, 2014\n"
+"  April 09, 2014\n"
 "<tr>\n"
 " <td bgcolor='#FFFFFF'>\n"
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
@@ -244,12 +244,13 @@ const char *const AboutSplash=
 "including a new preference stretchability_factor.\n"
 "<p>\n"
 "It also comes with support for a few <b>HTML5</b> elements and better CSS\n"
-"including background <b>images.</b>\n"
+"including background <b>images</b> (enable load_background_images in\n"
+"dillorc or the tools menu).\n"
 "<p>\n"
 "It has enhanced <b>security</b> by fixing a set of potentially exploitable\n"
 "code patterns reported by the Oulu University Secure Programming Group.\n"
 "<p>\n"
-"Finally it also fixes compiling on HURD and IRIX\n"
+"Finally it also fixes compiling on HURD and IRIX.\n"
 "<p>\n"
 "The core team welcomes developers willing to join our workforce.\n"
 "<p>\n"
@@ -275,20 +276,20 @@ const char *const AboutSplash=
 "<ul>\n"
 "<li> OPTGROUP and INS elements.\n"
 "<li> Added some HTML5 elements.\n"
-"<li> Added show_ui_tooltip preference (BUG#1140).\n"
+"<li> Added <b>show_ui_tooltip</b> preference (BUG#1140).\n"
 "<li> Make embedding into other applications more reliable (BUG#1127).\n"
 "<li> Add search from address bar.\n"
 "<li> Better scaling (down) of images, even with consideration of gamma \n"
 " correction.\n"
 "<li> Some linebreaking fixes, and optimization for non-justified text,\n"
-" including new preference stretchability_factor.\n"
-"<li> Added white_bg_replacement preference.\n"
+" including new preference <b>stretchability_factor</b>.\n"
+"<li> Added <b>white_bg_replacement</b> preference.\n"
 "<li> Implemented background images (except 'background-attachment'), added\n"
-" load_background_images preference, as well as a new entry in the tools\n"
-" menu.\n"
+" <b>load_background_images</b> preference, as well as a new entry in the\n"
+" tools menu.\n"
 "<li> Fix a set of bugs reported by Oulu Univ. Secure Programming Group\n"
 " (HTML parsing, URL resolution, GIF processing, etc.)\n"
-"<li> Made show_url dillorc option work again (BUG#1128)\n"
+"<li> Made <b>show_url</b> dillorc option work again (BUG#1128)\n"
 "<li> Fix compiling on Hurd.\n"
 "<li> Avoid Dpid children becoming zombies.\n"
 "<li> Fix compiling on IRIX with MIPSpro compiler.\n"