[Xfce4-commits] <midori:master> Replace unmaintained docs with FAQ from the wiki
Christian Dywan
noreply at xfce.org
Tue Mar 8 23:32:01 CET 2011
Updating branch refs/heads/master
to e643cc8c10c79b866f39bcd701da13f4fe29a69a (commit)
from d16b32e6c81a1c4072e5591989c485c2c120dfc8 (commit)
commit e643cc8c10c79b866f39bcd701da13f4fe29a69a
Author: Christian Dywan <christian at twotoasts.de>
Date: Tue Mar 8 23:25:37 2011 +0100
Replace unmaintained docs with FAQ from the wiki
Realistically nobody maintains offline documentation and
none of the people claiming to look into it ever did, whereas
the FAQ is being updated by or with input from individuals.
faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq
and all <link rel="stylesheet"> tags were replaced with
<link rel="stylesheet" type="text/css" href="faq.css" />.
docs/user/midori.css => data/faq.css | 0
data/faq.html | 847 ++++++++++++++++++++++++++++++++++
docs/user/midori.txt | 255 ----------
midori/midori-browser.c | 28 +-
wscript | 30 +--
5 files changed, 859 insertions(+), 301 deletions(-)
diff --git a/docs/user/midori.css b/data/faq.css
similarity index 100%
rename from docs/user/midori.css
rename to data/faq.css
diff --git a/data/faq.html b/data/faq.html
new file mode 100644
index 0000000..419ec60
--- /dev/null
+++ b/data/faq.html
@@ -0,0 +1,847 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ lang="en" dir="ltr">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>midori:faq</title>
+<meta name="generator" content="DokuWiki" />
+<meta name="robots" content="noindex,nofollow" />
+<meta name="date" content="2011-03-08T14:48:25+0100" />
+<meta name="keywords" content="midori,faq" />
+<link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki" />
+<link rel="start" href="/" />
+<link rel="contents" href="/midori/faq?do=index" title="Sitemap" />
+<link rel="alternate" type="application/rss+xml" title="Recent Changes" href="/feed.php" />
+<link rel="alternate" type="application/rss+xml" title="Current Namespace" href="/feed.php?mode=list&ns=midori" />
+<link rel="alternate" type="text/html" title="Plain HTML" href="/_export/xhtml/midori/faq" />
+<link rel="alternate" type="text/plain" title="Wiki Markup" href="/_export/raw/midori/faq" />
+<link rel="canonical" href="http://wiki.xfce.org/midori/faq" />
+<link rel="stylesheet" type="text/css" href="faq.css" />
+<script type="text/javascript" ><!--//--><![CDATA[//><!--
+var NS='midori';var JSINFO = {"id":"midori:faq","namespace":"midori"};
+//--><!]]></script>
+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=1299220652" ></script>
+</head>
+<body>
+<div class="dokuwiki export">
+<!-- TOC START -->
+<div class="toc">
+<div class="tocheader toctoggle" id="toc__header">Table of Contents</div>
+<div id="toc__inside">
+
+<ul class="toc">
+<li class="level1"><div class="li"><span class="li"><a href="#midori_-_frequently_asked_questions" class="toc">Midori - Frequently asked questions</a></span></div></li>
+<li class="level1"><div class="li"><span class="li"><a href="#getting_started" class="toc">Getting started</a></span></div>
+<ul class="toc">
+<li class="level2"><div class="li"><span class="li"><a href="#about_midori" class="toc">About Midori</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#common_problems" class="toc">Common problems</a></span></div></li>
+</ul>
+</li>
+<li class="level1"><div class="li"><span class="li"><a href="#features" class="toc">Features</a></span></div>
+<ul class="toc">
+<li class="level2"><div class="li"><span class="li"><a href="#web_applicationsprivate_browsing" class="toc">Web Applications/ Private Browsing</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#download_managers" class="toc">Download Managers</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#proxy_servers" class="toc">Proxy servers</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#using_the_keyboard" class="toc">Using the Keyboard</a></span></div>
+<ul class="toc">
+<li class="level3"><div class="li"><span class="li"><a href="#following_links" class="toc">Following Links</a></span></div></li>
+<li class="level3"><div class="li"><span class="li"><a href="#toggling_between_pages" class="toc">Toggling between pages</a></span></div></li>
+<li class="level3"><div class="li"><span class="li"><a href="#customizing_keyboard_shortcuts" class="toc">Customizing keyboard shortcuts</a></span></div></li>
+</ul>
+</li>
+<li class="level2"><div class="li"><span class="li"><a href="#mouse_gestures" class="toc">Mouse Gestures</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#spell_check" class="toc">Spell check</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#user_scripts" class="toc">User scripts</a></span></div></li>
+<li class="level2"><div class="li"><span class="li"><a href="#user_styles" class="toc">User styles</a></span></div></li></ul>
+</li></ul>
+</div>
+</div>
+<!-- TOC END -->
+
+<h1 class="sectionedit1"><a name="midori_-_frequently_asked_questions" id="midori_-_frequently_asked_questions">Midori - Frequently asked questions</a></h1>
+<div class="level1">
+
+<p>
+
+<strong>This document is licensed under the <acronym title="GNU Lesser General Public License">LGPL</acronym> 2.1.</strong>
+</p>
+
+<p>
+This is a list of frequently asked questions about the Midori Web Browser. Anyone feel free to improve and/ or extend this page, but keep it clean and easy to read for other Xfce users.
+</p>
+
+</div>
+<!-- EDIT1 SECTION "Midori - Frequently asked questions" [1-289] -->
+<h1 class="sectionedit2"><a name="getting_started" id="getting_started">Getting started</a></h1>
+<div class="level1">
+
+</div>
+<!-- EDIT2 SECTION "Getting started" [290-319] -->
+<h2 class="sectionedit3"><a name="about_midori" id="about_midori">About Midori</a></h2>
+<div class="level2">
+
+</div>
+
+<h4><a name="what_is_midori_and_why_should_i_use_it" id="what_is_midori_and_why_should_i_use_it">What is "Midori" and why should I use it?</a></h4>
+<div class="level4">
+
+<p>
+Midori is a Web Browser, that aims to be lightweight and fast. It aligns well with the Xfce philosophy of making the most out of available resources.
+</p>
+
+</div>
+
+<h4><a name="how_to_pronounce_midori_and_what_does_the_name_mean" id="how_to_pronounce_midori_and_what_does_the_name_mean">How to pronounce Midori and what does the name mean?</a></h4>
+<div class="level4">
+
+<p>
+Pronounce it “midoɺi”, with a Spanish/ Japanese “r” or “Mee-Doh-Ree” in English or read it Italian. The name comes from the Japanese word 緑 (みどり) for the colour “green”.
+</p>
+
+</div>
+
+<h4><a name="what_does_the_logo_mean" id="what_does_the_logo_mean">What does the logo mean?</a></h4>
+<div class="level4">
+
+<p>
+The paw of a green cat. Obviously. Also it resembles the letter “M” in “Midori”. The curving is supposed to emphasize speed.
+</p>
+
+</div>
+
+<h4><a name="on_which_platforms_does_midori_run_currently" id="on_which_platforms_does_midori_run_currently">On which platforms does Midori run currently?</a></h4>
+<div class="level4">
+
+<p>
+Midori is basically very portable and should run on all platforms that its dependencies support.
+</p>
+
+</div>
+
+<h4><a name="under_which_license_is_midori_distributed" id="under_which_license_is_midori_distributed">Under which license is Midori distributed?</a></h4>
+<div class="level4">
+
+<p>
+Midori and all delivered artwork are licensed under the LGPL2.
+
+</p>
+
+</div>
+<!-- EDIT3 SECTION "About Midori" [320-1212] -->
+<h2 class="sectionedit4"><a name="common_problems" id="common_problems">Common problems</a></h2>
+<div class="level2">
+
+</div>
+
+<h4><a name="why_does_google_mailcalendarmaps_facebook_not_work_or_show_mobile_version" id="why_does_google_mailcalendarmaps_facebook_not_work_or_show_mobile_version">Why does Google Mail/ Calendar/ Maps, Facebook not work or show mobile version?</a></h4>
+<div class="level4">
+
+<p>
+
+Because they discriminate against your browser. Go to Preferences > Network > Identify As, and choose Safari.
+Many other websites use similar means of detecting the browser.
+</p>
+
+<p>
+Ideally Google would follow <a href="http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ#UserAgent_Detection" class="urlextern" title="http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ#UserAgent_Detection" rel="nofollow">their own recommendation</a> at some point.
+</p>
+
+</div>
+
+<h4><a name="there_are_missing_iconswarnings" id="there_are_missing_iconswarnings">There are missing icons/ warnings</a></h4>
+<div class="level4">
+
+<p>
+The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org <acronym title="specification">spec</acronym> compliant icon theme, such as Tango or Gnome, or one that is compatible with these.
+</p>
+
+</div>
+
+<h4><a name="tweaking_midori_on_the_gtk_level" id="tweaking_midori_on_the_gtk_level">Tweaking Midori on the Gtk level</a></h4>
+<div class="level4">
+
+<p>
+If you don't have a desktop application that takes care of Gtk settings or if your interface doesn't support a particular feature, you can modify any settings easily manually by specifying them in a text file called ~/.gtkrc-2.0 or /etc/gtk-2.0/gtkrc:
+</p>
+
+<p>
+Use Tango as a fallback for your icon theme:
+
+</p>
+<pre class="code">gtk-icon-theme-name = "MySuperFancyTheme"
+gtk-fallback-icon-theme = "Tango"</pre>
+
+<p>
+Use a smaller toolbar:
+
+</p>
+<pre class="code">gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR</pre>
+
+<p>
+Enable changing hotkeys while hovering menu items:
+
+</p>
+<pre class="code">gtk-can-change-accels = 1</pre>
+
+</div>
+
+<h4><a name="midori_crashes_shortly_before_pages_are_loaded" id="midori_crashes_shortly_before_pages_are_loaded">Midori crashes shortly before pages are loaded</a></h4>
+<div class="level4">
+
+<p>
+There appears to be an issue with Glib 2.16. The recommended solution is to upgrade your Glib package to 2.18.
+</p>
+
+</div>
+
+<h4><a name="flashnetscape_plugins_don_t_work" id="flashnetscape_plugins_don_t_work">Flash/ Netscape plugins don't work</a></h4>
+<div class="level4">
+
+<p>
+You need to set MOZ_PLUGIN_PATH, for example like this:
+</p>
+<pre class="code bash"><span class="kw3">export</span> <span class="re2">MOZ_PLUGIN_PATH</span>=<span class="st0">"/usr/lib/mozilla/plugins"</span></pre>
+
+<p>
+The official Flash plugin is called libflashplayer.so .
+</p>
+
+<p>
+You can either run that above line and run Midori in the same terminal afterwards or, for the long term, put it in ~/.bash_profile or /etc/profile.d or your respective distribution's place for this.
+</p>
+
+</div>
+
+<h4><a name="flash_is_crashing_all_the_time" id="flash_is_crashing_all_the_time">Flash is crashing all the time</a></h4>
+<div class="level4">
+
+<p>
+
+Try searching for a package named nspluginwrapper or similar in your distribution repositories. It implements plugins in their own process so they can't drag down the whole browser.
+</p>
+
+</div>
+
+<h4><a name="https_urls_won_t_load" id="https_urls_won_t_load">HTTPS URLS won't load</a></h4>
+<div class="level4">
+
+<p>
+
+That's a problem with WebKit. You can work around it to some extent if you start Midori like so:
+</p>
+<pre class="code bash"><span class="kw3">export</span> <span class="re2">WEBKIT_IGNORE_SSL_ERRORS</span>=<span class="st0">"1"</span> midori</pre>
+
+</div>
+
+<h4><a name="javascript_popup_windows" id="javascript_popup_windows">Javascript Popup windows</a></h4>
+<div class="level4">
+
+<p>
+
+By default, Midori blocks all popup windows that openen on their own. With WebKitGTK+ 1.1.11 or higher, you can use a hidden setting to enable these windows.
+
+</p>
+<ol>
+<li class="level1"><div class="li"> Quit Midori</div>
+</li>
+<li class="level1"><div class="li"> Open the file ~/.config/midori/config</div>
+</li>
+<li class="level1"><div class="li"> Add a line “javascript-can-open-windows-automatically=true”</div>
+</li>
+</ol>
+
+<p>
+
+There is also a preference in the git version as of 2010-03-23.
+</p>
+
+</div>
+
+<h4><a name="scroll_with_middle_mouse_button" id="scroll_with_middle_mouse_button">Scroll with middle mouse button</a></h4>
+<div class="level4">
+
+<p>
+
+<a href="http://ubuntuforums.org/showthread.php?t=478418" class="urlextern" title="http://ubuntuforums.org/showthread.php?t=478418" rel="nofollow">http://ubuntuforums.org/showthread.php?t=478418</a>
+</p>
+
+</div>
+
+<h4><a name="html5_video_doesn_t_play" id="html5_video_doesn_t_play">HTML5 Video doesn't play</a></h4>
+<div class="level4">
+
+<p>
+
+You need to have GStreamer plugins installed which implement the codecs.
+
+</p>
+<ol>
+<li class="level1"><div class="li"> You need gstreamer0.10-pulse if you're using PulseAudio.</div>
+</li>
+<li class="level1"><div class="li"> You may need gstreamer0.10-alsa for ALSA, depending on your distribution.</div>
+</li>
+<li class="level1"><div class="li"> With Arch Linux, you may need to install liboil explicitly if it is not installed already (see <a href="https://bugs.archlinux.org/task/20945" class="urlextern" title="https://bugs.archlinux.org/task/20945" rel="nofollow">this</a> bug report).</div>
+</li>
+<li class="level1"><div class="li"> You need plugins for Theora, gstreamer0.10-base and <acronym title="Motion Picture Experts Group">MPEG</acronym>-4 incluing aac (e.g. gst-plugins-faad), gstreamer0.10-bad. For WebM, you'll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at <a href="http://www.gstreamer.net/documentation/plugins.html" class="urlextern" title="http://www.gstreamer.net/documentation/plugins.html" rel="nofollow">http://www.gstreamer.net/documentation/plugins.html</a> for details.</div>
+</li>
+<li class="level1"><div class="li"> For Youtube or Vimeo, you need WebKitGTK+ 1.1.20 or newer.</div>
+</li>
+</ol>
+
+</div>
+
+<h4><a name="java_doesn_t_work_applets_don_t_show_up" id="java_doesn_t_work_applets_don_t_show_up">Java doesn't work, applets don't show up</a></h4>
+<div class="level4">
+
+<p>
+
+Java is supported in WebKitGTK+ since 1.1.22. If you need Java, you need to upgrade to at least that version. Sun/ Oracle Java as well as IcedTea are known to work. Distribution specific setup might be required, such as setting LD_LIBRARY_PATH to include the location of libxul.so and making a symbolic link for libnpjp2.so to /usr/lib/mozilla.
+</p>
+
+<p>
+icedtea6 version 1.8 and above has been known to crash midori. If this is the case for you, try sun-jre.
+</p>
+
+</div>
+
+<h4><a name="are_socks_proxy_servers_supported" id="are_socks_proxy_servers_supported">Are SOCKS proxy servers supported?</a></h4>
+<div class="level4">
+
+<p>
+
+Currently only <acronym title="Hyper Text Transfer Protocol">HTTP</acronym> proxy servers are supported directly. A way to use SOCKS on Unix is to use tsocks with <acronym title="Secure Shell">SSH</acronym> as follows:
+
+</p>
+<ol>
+<li class="level1"><div class="li"> Install 'tsocks'</div>
+</li>
+<li class="level1"><div class="li"> Open /etc/tsocks.conf in an editor</div>
+</li>
+<li class="level1"><div class="li"> Type something like this, you can choose the port freely: <pre class="code">server = 127.0.0.1
+server_type = 5
+server_port = 5555</pre>
+</div>
+</li>
+<li class="level1"><div class="li"> Open an <acronym title="Secure Shell">SSH</acronym> connection with the same port: <pre class="code"> ssh -D localhost:5555 myhost.com </pre>
+</div>
+</li>
+<li class="level1"><div class="li"> Run Midori with “tsocks” in front of it: <pre class="code"> tsocks midori </pre>
+</div>
+</li>
+<li class="level1"><div class="li"> Now you can use for example <a href="http://www.whatsmyip.org/" class="urlextern" title="http://www.whatsmyip.org/" rel="nofollow">http://www.whatsmyip.org/</a> to verify that you are using a SOCKS connection. The IP address should match the one of your <acronym title="Secure Shell">SSH</acronym> host. Remember to keep the <acronym title="Secure Shell">SSH</acronym> login running, and don't suspend it, otherwise it won't work.</div>
+</li>
+<li class="level1"><div class="li"> If the connection fails for some reason, you should see a connection error.</div>
+</li>
+</ol>
+
+</div>
+
+<h4><a name="how_do_i_get_rid_of_the_menubar" id="how_do_i_get_rid_of_the_menubar">How do I get rid of the menubar?</a></h4>
+<div class="level4">
+
+<p>
+
+In the menubar, go to View → Toolbars → Menubar, voilà the menubar is gone and a new icon appears at the right end of the toolbar. Click the icon to access functionality that otherwise sits in the menubar.
+Midori 0.3.2 disables the menubar by default.
+</p>
+
+</div>
+
+<h4><a name="why_can_t_i_use_periods_when_searching_from_the_location_bar" id="why_can_t_i_use_periods_when_searching_from_the_location_bar">Why can't I use periods when searching from the location bar?</a></h4>
+<div class="level4">
+
+<p>
+
+Midori tries to make a smart guess on whether you are searching for something or typing a valid address by hand. Yet there are ambiguous cases so it fails.
+</p>
+
+<p>
+Try using 'g' in front of the search terms, like 'g Ms.Marple'. The 'g' is a token that tells the browser you want to use Google. See Tools > Manage Search Engines or right-click the location bar and select the menu item, to look at search engines and tokens.
+</p>
+
+</div>
+
+<h4><a name="how_can_i_reload_and_bypass_the_cache" id="how_can_i_reload_and_bypass_the_cache">How can I reload and bypass the cache?</a></h4>
+<div class="level4">
+
+<p>
+
+Hold the Shift key while clicking Refresh in the toolbar (this works in Chromium, Mozilla, Opera and Safari, too).
+Since Midori 0.3.2 you can use Ctrl+Shift+R.
+</p>
+
+</div>
+
+<h4><a name="how_do_i_make_tabs_pinnedstickyminimized" id="how_do_i_make_tabs_pinnedstickyminimized">How do I make tabs pinned/ sticky/ minimized?</a></h4>
+<div class="level4">
+
+<p>
+
+Right-click the tab label, and click 'Minimize'.
+</p>
+
+</div>
+
+<h4><a name="why_doesn_t_google_live_search_work" id="why_doesn_t_google_live_search_work">Why doesn't Google "live search" work?</a></h4>
+<div class="level4">
+
+<p>
+
+You need to set Preferences > Network > Identify As to Firefox.
+</p>
+
+</div>
+
+<h4><a name="opening_html_email_with_mutt" id="opening_html_email_with_mutt">Opening html email with Mutt</a></h4>
+<div class="level4">
+
+<p>
+
+Place the following in ~/.mutt/mailcap or ~/.mailcap:
+</p>
+<pre class="code">text/html; midori -a '%s'; test=test -n "$DISPLAY"; nametemplate=%s.html</pre>
+
+</div>
+
+<h4><a name="scrolling_on_website_xyz_is_very_slow" id="scrolling_on_website_xyz_is_very_slow">Scrolling on website xyz is very slow</a></h4>
+<div class="level4">
+<ol>
+<li class="level1"><div class="li"> Go to Tools > Extensions</div>
+</li>
+<li class="level1"><div class="li"> Enable 'User Addons' if it's not yet enabled</div>
+</li>
+<li class="level1"><div class="li"> Create a text file .local/share/midori/styles/scrollfix.user.css</div>
+</li>
+<li class="level1"><div class="li"> Put this into the file: * {-webkit-box-shadow: none !important;}</div>
+</li>
+</ol>
+
+</div>
+
+<h4><a name="file_opening_doesn_t_workpdfs_are_opened_with_gimp" id="file_opening_doesn_t_workpdfs_are_opened_with_gimp">File opening doesn't work/ PDFs are opened with GIMP</a></h4>
+<div class="level4">
+
+<p>
+
+Midori opens files with GIO, and falls back to xdg-open, exo-open or gnome-open if these are available. All of this relies on freedesktop.org <acronym title="Multipurpose Internet Mail Extension">MIME</acronym> configuration. To tweak this there are multiple options:
+
+</p>
+<ol>
+<li class="level1"><div class="li"> Use 'Open With' with a graphical file manager</div>
+</li>
+<li class="level1"><div class="li"> Edit ~/.local/share/applications/defaults.list with a text editor</div>
+</li>
+<li class="level1"><div class="li"> Run something like ‘xdg-mime default evince.desktop application/pdf’</div>
+</li>
+</ol>
+
+<p>
+
+xdg-open knows how to handle GNOME, KDE and Xfce.
+LXDE is unfortunately not supported yet, see <a href="https://bugs.freedesktop.org/show_bug.cgi?id=26058" class="urlextern" title="https://bugs.freedesktop.org/show_bug.cgi?id=26058" rel="nofollow">https://bugs.freedesktop.org/show_bug.cgi?id=26058</a>
+</p>
+
+</div>
+
+<h4><a name="open_magnetircaptand_friends_with_an_application" id="open_magnetircaptand_friends_with_an_application">Open magnet:, irc:, apt: and friends with an application</a></h4>
+<div class="level4">
+
+<p>
+
+As of git 2011-03-05 02:40:00 UTC and Midori 0.3.3 you can
+</p>
+
+<p>
+Add a line to ~/.local/share/applications/mimeapps.list:
+
+</p>
+<pre class="code"> x-scheme-handler/magnet=transmission-gtk.desktop</pre>
+
+<p>
+
+Or install an application which advertises the scheme like so:
+
+</p>
+<pre class="code"> MimeType=x-scheme-handler/magnet;</pre>
+
+<p>
+
+Note that incomplete .desktop files will silently fail and it will look as if it doesn't exist.
+</p>
+
+</div>
+<!-- EDIT4 SECTION "Common problems" [1213-8887] -->
+<h1 class="sectionedit5"><a name="features" id="features">Features</a></h1>
+<div class="level1">
+
+</div>
+<!-- EDIT5 SECTION "Features" [8888-8910] -->
+<h2 class="sectionedit6"><a name="web_applicationsprivate_browsing" id="web_applicationsprivate_browsing">Web Applications/ Private Browsing</a></h2>
+<div class="level2">
+
+<p>
+
+There are two closely related features to open websites as dedicated windows of their own. You can do the following to use them:
+
+</p>
+<ol>
+<li class="level1"><div class="li"> File (or Globe button) → Private Browsing</div>
+</li>
+<li class="level1"><div class="li"> Right-click a hyperlink → Open as Web Application</div>
+</li>
+<li class="level1"><div class="li"> Add or Edit a bookmark → [x] Run as web application</div>
+</li>
+<li class="level1"><div class="li"> Type ‘midori -a <a href="http://foo.bar" class="urlextern" title="http://foo.bar" rel="nofollow">http://foo.bar</a>’ on a command line</div>
+</li>
+</ol>
+
+<p>
+ You can also add options such as ‘-e Fullscreen’, ‘-e Navigationbar’ or ‘-e Statusbar’ (as of Midori 0.2.9 ‘midori –help-execute will list all available commands’)
+</p>
+
+<p>
+A window like this is always a separate process, so crashes don't affect the normal browser session. No sensitive data such as cookies, history or bookmarks are stored. No extensions are loaded. Panels are not available.
+</p>
+
+<p>
+As of Midori 0.2.9 Private Browsing uses preferences, cookies, keyboard shortcuts and search engines from the normal session, but it won't save any changes. This behaviour can be emulated from the command line with ”-a” and ”-c”.
+</p>
+
+</div>
+<!-- EDIT6 SECTION "Web Applications/ Private Browsing" [8911-9946] -->
+<h2 class="sectionedit7"><a name="download_managers" id="download_managers">Download Managers</a></h2>
+<div class="level2">
+
+<p>
+
+Midori can start downloads with an external download manager. To use that feature, open up the “Preferences” dialog, click the “Applications” tab, insert the name of a program executable or shell script in the “Download Manager” input box, right-click a link, and click “Download with Download Manager”. There is a list of download managers on <a href="http://en.wikipedia.org/wiki/Comparison_of_download_managers" class="urlextern" title="http://en.wikipedia.org/wiki/Comparison_of_download_managers" rel="nofollow">Wikipedia</a>.
+</p>
+
+</div>
+
+<h4><a name="admiral" id="admiral">Admiral</a></h4>
+<div class="level4">
+
+<p>
+<a href="http://bbs.archlinux.org/viewtopic.php?id=73504" class="urlextern" title="http://bbs.archlinux.org/viewtopic.php?id=73504" rel="nofollow">Admiral</a> is a shell script that utilizes <a href="http://aria2.sourceforge.net/" class="urlextern" title="http://aria2.sourceforge.net/" rel="nofollow">aria2</a>, <a href="http://freshmeat.net/projects/zenity" class="urlextern" title="http://freshmeat.net/projects/zenity" rel="nofollow">Zenity</a>, and <a href="http://linuxappfinder.com/package/libnotify-bin" class="urlextern" title="http://linuxappfinder.com/package/libnotify-bin" rel="nofollow">libnotify-bin</a>. Admiral allows you to choose the directory to which you wish download a file with a <acronym title="Graphical User Interface">GUI</acronym> dialog, sends a desktop notification if the download fails and when starting and finishing the download, and logs failures.
+</p>
+
+</div>
+
+<h4><a name="aria2" id="aria2">Aria2</a></h4>
+<div class="level4">
+
+<p>
+
+<a href="http://aria2.sourceforge.net/" class="urlextern" title="http://aria2.sourceforge.net/" rel="nofollow">aria2</a> is a lightweight multi-protocol & multi-source, cross platform download utility operated in command-line. It supports <acronym title="Hyper Text Transfer Protocol">HTTP</acronym>/HTTPS, <acronym title="File Transfer Protocol">FTP</acronym>, BitTorrent and Metalink. aria2 has built-in <acronym title="Extensible Markup Language">XML</acronym>-<acronym title="Remote Procedure Call">RPC</acronym> interface. You can manipulate aria2 via <acronym title="Extensible Markup Language">XML</acronym>-<acronym title="Remote Procedure Call">RPC</acronym> interface.
+</p>
+
+</div>
+
+<h4><a name="uget_former_urlgfe" id="uget_former_urlgfe">Uget (former Urlgfe)</a></h4>
+<div class="level4">
+
+<p>
+
+<a href="http://urlget.sourceforge.net/" class="urlextern" title="http://urlget.sourceforge.net/" rel="nofollow">UGet</a> is a cross platform download manager. It can watch the clipboard to offer download dialogues automatically and it can be configured to pass through files, such as torrents, to the appropriate handler.
+</p>
+
+</div>
+
+<h4><a name="gget" id="gget">GGet</a></h4>
+<div class="level4">
+
+<p>
+
+<a href="http://live.gnome.org/GGet" class="urlextern" title="http://live.gnome.org/GGet" rel="nofollow">GGet</a> is a download manager primarily for the GNOME desktop, but it also works in other unix/ GTk+ environments.
+</p>
+
+</div>
+<!-- EDIT7 SECTION "Download Managers" [9947-11615] -->
+<h2 class="sectionedit8"><a name="proxy_servers" id="proxy_servers">Proxy servers</a></h2>
+<div class="level2">
+
+<p>
+
+By running a local proxy you can modify web content even before it has reached Midori. That allows you to do things similar to what user scripts and user styles provide and even others that neither is suitable for.
+</p>
+
+<p>
+To use Midori with a proxy server, there are two options:
+
+</p>
+<ol>
+<li class="level1"><div class="li"> WebKit is built with libcurl. Define an environment variable http_proxy and set it to your proxy server like so:</div>
+</li>
+</ol>
+<pre class="code">export http_proxy = 234.22.154.11:8000</pre>
+<ol>
+<li class="level1"><div class="li"> 2. WebKit is built with libsoup. Midori >= 0.1.2, is built with libsoup. Try to open some web page. Now open the preferences, and you should see a Network tab with a 'Proxy server' field.</div>
+</li>
+</ol>
+
+</div>
+
+<h4><a name="privoxy" id="privoxy">Privoxy</a></h4>
+<div class="level4">
+
+<p>
+
+Privoxy is a non-caching web proxy with filter capabilites and particular support for blocking advertisements before even loading them.
+</p>
+
+<p>
+<a href="http://www.privoxy.org/faq/" class="urlextern" title="http://www.privoxy.org/faq/" rel="nofollow">http://www.privoxy.org/faq/</a>
+</p>
+
+</div>
+
+<h4><a name="mousehole" id="mousehole">Mousehole</a></h4>
+<div class="level4">
+
+<p>
+
+Mousehole is a scriptable proxy server written in Ruby.
+</p>
+
+<p>
+<a href="http://code.whytheluckystiff.net/mouseHole/" class="urlextern" title="http://code.whytheluckystiff.net/mouseHole/" rel="nofollow">http://code.whytheluckystiff.net/mouseHole/</a>
+</p>
+
+</div>
+
+<h4><a name="polipo" id="polipo">Polipo</a></h4>
+<div class="level4">
+
+<p>
+
+ Polipo is a caching web proxy (a web cache) designed to be used by one
+ person or a small group of people. It is similar in spirit to WWWOFFLE, but
+ the implementation techniques are more like the ones used by Squid.
+</p>
+
+<p>
+<a href="http://www.pps.jussieu.fr/~jch/software/polipo/" class="urlextern" title="http://www.pps.jussieu.fr/~jch/software/polipo/" rel="nofollow">http://www.pps.jussieu.fr/~jch/software/polipo/</a>
+</p>
+
+</div>
+<!-- EDIT8 SECTION "Proxy servers" [11616-12858] -->
+<h2 class="sectionedit9"><a name="using_the_keyboard" id="using_the_keyboard">Using the Keyboard</a></h2>
+<div class="level2">
+
+</div>
+<!-- EDIT9 SECTION "Using the Keyboard" [12859-12890] -->
+<h3 class="sectionedit10"><a name="following_links" id="following_links">Following Links</a></h3>
+<div class="level3">
+
+<p>
+
+To enable Hints in Midori [similar to those vimperator provides in Firefox], press .
+</p>
+
+<p>
+With hints enabled, type the link number, and press Enter to open the link in the current tab, or Ctrl-Enter to open the link in a new tab. To clear a typed link number before pressing Enter or Ctrl-Enter, use Escape.
+</p>
+
+</div>
+<!-- EDIT10 SECTION "Following Links" [12891-13222] -->
+<h3 class="sectionedit11"><a name="toggling_between_pages" id="toggling_between_pages">Toggling between pages</a></h3>
+<div class="level3">
+
+<p>
+
+Enable the History List extension Tools → Extensions. Now you can conveniently toggle between any two pages with Ctrl-Tab.
+</p>
+
+</div>
+<!-- EDIT11 SECTION "Toggling between pages" [13223-13382] -->
+<h3 class="sectionedit12"><a name="customizing_keyboard_shortcuts" id="customizing_keyboard_shortcuts">Customizing keyboard shortcuts</a></h3>
+<div class="level3">
+
+<p>
+
+Enable the Shortcuts extension Tools → Extensions. To edit a keybinding Tools → Customize Shortcuts…
+
+</p>
+
+</div>
+<!-- EDIT12 SECTION "Customizing keyboard shortcuts" [13383-13531] -->
+<h2 class="sectionedit13"><a name="mouse_gestures" id="mouse_gestures">Mouse Gestures</a></h2>
+<div class="level2">
+
+<p>
+
+Midori has a Mouse Gestures extension (since git 2009-01-21).
+</p>
+
+<p>
+As of 0.2.5 the right button initiates gestures.
+</p>
+
+<p>
+You can change the button using a hidden option:
+
+</p>
+<ol>
+<li class="level1"><div class="li"> Create a text file ~/.config/midori/extensions/libmouse-gestures.so/config .</div>
+</li>
+<li class="level1"><div class="li"> Type the following in there:</div>
+</li>
+</ol>
+<pre class="code"> [settings]
+ button=2</pre>
+
+<p>
+
+For a quick and dirty overview of the gestures in the current release take a look at the <a href="http://www.matthiaskruk.de/midori/mouse-gestures.pdf" class="urlextern" title="http://www.matthiaskruk.de/midori/mouse-gestures.pdf" rel="nofollow">preliminary manual</a>.
+Further information is available at the <a href="http://www.matthiaskruk.de/midori" class="urlextern" title="http://www.matthiaskruk.de/midori" rel="nofollow">MGX website</a>.
+</p>
+
+<p>
+Additionally, there are programs allowing mouse gestures system-wide, for example <a href="http://easystroke.wiki.sourceforge.net/" class="urlextern" title="http://easystroke.wiki.sourceforge.net/" rel="nofollow">EasyStroke</a>.
+</p>
+
+</div>
+<!-- EDIT13 SECTION "Mouse Gestures" [13532-14263] -->
+<h2 class="sectionedit14"><a name="spell_check" id="spell_check">Spell check</a></h2>
+<div class="level2">
+
+<p>
+
+First enable spell checking:
+Edit→Preferences→Behavior and Check off “Enable Spell Checking”.
+</p>
+
+<p>
+Now while typing any errors should get underlined in red. To get suggestions, highlight the word and right-click. Should see a list of suggestions on the top of the menu.
+</p>
+
+</div>
+<!-- EDIT14 SECTION "Spell check" [14264-14557] -->
+<h2 class="sectionedit15"><a name="user_scripts" id="user_scripts">User scripts</a></h2>
+<div class="level2">
+
+</div>
+
+<h4><a name="overview" id="overview">Overview</a></h4>
+<div class="level4">
+
+<p>
+
+UserScripts are scripts applied on some, or on all web pages. They can modify pages locally to add or alter functionality. That includes fixing bugs in web pages. User scripts are also available in other browsers, in the form of <a href="http://www.greasespot.net" class="urlextern" title="http://www.greasespot.net" rel="nofollow">Mozilla's Greasemonkey</a> or <a href="http://www.opera.com/support/tutorials/userjs/" class="urlextern" title="http://www.opera.com/support/tutorials/userjs/" rel="nofollow">Opera's User JavaScript</a>.
+</p>
+
+</div>
+
+<h4><a name="how_to_install_a_userscript" id="how_to_install_a_userscript">How to install a UserScript</a></h4>
+<div class="level4">
+
+<p>
+
+First, you need to find some scripts (or write your own). You can find some at <a href="http://userscripts.org/" class="urlextern" title="http://userscripts.org/" rel="nofollow">userscripts.org</a>. As explained previously, a lot of scripts work, while others do not work.
+</p>
+
+<p>
+To install a userscript, you have to download the script as a file, and put it in the following directory <strong>~/.local/share/midori/scripts</strong> (you may need to create that directory if it does not exist). Midori will automatically see and use it, which you can also see in the user scripts panel.
+</p>
+
+<p>
+Note, if the script is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-script.js where ”.js” is the extension.
+</p>
+
+</div>
+
+<h4><a name="flash_blocking_via_a_user_script" id="flash_blocking_via_a_user_script">Flash blocking via a User script</a></h4>
+<div class="level4">
+
+<p>
+
+You can use <a href="http://userscripts.org/scripts/show/45343" class="urlextern" title="http://userscripts.org/scripts/show/45343" rel="nofollow">BlockFlash2</a> as a user script which replaces all Flash elements with a button that says “Play Flash”.
+</p>
+
+</div>
+
+<h4><a name="flash_blocking_via_a_user_style" id="flash_blocking_via_a_user_style">Flash blocking via a User style</a></h4>
+<div class="level4">
+
+<p>
+
+You can also use <a href="http://rightfootin.blogspot.com/2009/04/flashblock-wannabe.html" class="urlextern" title="http://rightfootin.blogspot.com/2009/04/flashblock-wannabe.html" rel="nofollow">FlashBlock WannaBe</a> as a user script in order to replace Flash elements with placeholders and load them on click. The script is pretty advanced compared to most Flash blockers found on the web.
+</p>
+
+</div>
+<!-- EDIT15 SECTION "User scripts" [14558-16243] -->
+<h2 class="sectionedit16"><a name="user_styles" id="user_styles">User styles</a></h2>
+<div class="level2">
+
+</div>
+
+<h4><a name="overview1" id="overview1">Overview</a></h4>
+<div class="level4">
+
+<p>
+
+User styles are <acronym title="Cascading Style Sheets">CSS</acronym> Cascading Style sheets that are loaded locally and applied on top of web pages, similar to User scripts, in order to add or alter functionality and also fix bugs.
+</p>
+
+</div>
+
+<h4><a name="how_to_install_a_user_style" id="how_to_install_a_user_style">How to install a user style</a></h4>
+<div class="level4">
+
+<p>
+
+First, you need to find some styles (or write your own). You can find some at <a href="http://userstyles.org/" class="urlextern" title="http://userstyles.org/" rel="nofollow">userstyles.org</a>. Many styles may or may not work, depending on whether the author decided to use browser specific features.
+</p>
+
+<p>
+To install a user style, you have to download the style as a file, and put it in the following directory <strong>~/.local/share/midori/styles</strong> (you may need to create that directory if it does not exist). Midori will automatically see and use it, which you can also see in the user styles panel.
+</p>
+
+<p>
+Note, if the style is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-style.css where ”.css” is the extension.
+</p>
+
+</div>
+
+<h4><a name="how_to_install_a_user_style_before_midori_0020" id="how_to_install_a_user_style_before_midori_0020">How to install a user style before Midori 0.0.20</a></h4>
+<div class="level4">
+
+<p>
+
+Open up the Preferences and use the file chooser button beside User Stylesheet to choose a style sheet file. The style sheet will from now on be applied to all sites automatically.
+</p>
+
+</div>
+
+<h4><a name="a_user_css_to_display_the_url_when_a_link_is_hovered" id="a_user_css_to_display_the_url_when_a_link_is_hovered">A user css to display the url when a link is hovered</a></h4>
+<div class="level4">
+
+<p>
+
+This user css is used to display the corresponding url when a link is hovered. This is similar to what chromium/chrome provides when hovering over a link, shown on the bottom left of the page. Add the following to <strong>~/.local/share/midori/styles</strong>, then restart Midori and make sure that it is enabled Tools → Userstyles.
+</p>
+
+<p>
+Customize as needed:
+</p>
+<pre class="code">a[href]:hover {
+ text-decoration: none !important;
+ }
+ a[href]:hover:after {
+ content: attr(href);
+ position: fixed; left: 4px; bottom: 4px;
+ padding: 0 6px !important;
+ max-width: 95%; overflow: hidden;
+ white-space: nowrap; text-overflow: ellipsis;
+ font:10pt sans-serif !important; text-shadow: 0 0 12px white;
+ background-color: ButtonFace !important; color: ButtonText !important;
+ opacity: 0.8; outline: ButtonFace solid thick;
+ z-index: 9999;
+ }</pre>
+
+</div>
+<!-- EDIT16 SECTION "User styles" [16244-] --></div>
+</body>
+</html>
diff --git a/docs/user/midori.txt b/docs/user/midori.txt
deleted file mode 100644
index 3e30f09..0000000
--- a/docs/user/midori.txt
+++ /dev/null
@@ -1,255 +0,0 @@
-.. |(version)| replace:: 0.2.2
-
-'''''''
- Midori
-'''''''
-
------------------------------------------
- A lightweight, portable GTK+ web browser
------------------------------------------
-
-:Authors: Christian Dywan
-:Date: $Date: 2009-11-18 18:20:11 +0100 (Wed, 18 Nov 2009) $
-:Version: |(version)|
-
-Copyright © 2008-2009
-
-This documentation is distributed under the terms of the
-`GNU Lesser General Public License`_; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-
-.. contents::
-
-
-
-Introduction
-''''''''''''
-
-
-What is Midori
---------------
-
-Midori is a lightweight and portable web browser based on Gtk+. The
-interface is designed to be intuitive yet powerful.
-
-* Full integration with GTK+2.
-* Fast rendering with WebKit.
-* Tabs, windows and session management.
-* Flexibly configurable Web Search.
-* User scripts and user styles support.
-* Straightforward bookmark management.
-* Customizable and extensible interface.
-* Extensions written in C.
-
-
-Running Midori
---------------
-
-
-* If you are using a graphical desktop environment you will usually find
- Midori in the menu under Network.
-
-* You can also run Midori from a console or a Run dialog.
- See also `Command line usage`.
-
- $ midori
-
-A browser window appears where you can start navigating the web right away.
-
-
-The main interface
---------------------------
-
-
-The main browser window consists of a few basic elements:
-
-
-* The menubar. It's pretty much standardized and gives you access to
- allmost all features, many of the items have a keyboard shortcut by default.
- See also `Keyboard shortcuts`_.
-
-* The navigationbar. It lets you open tabs, go back and forward, enter
- addresses, search the web and reopen closed tabs.
- See also `The navigationbar`.
-
-* The sidepanel. It takes a pretty central role in the functionality it provides,
- yet it can be hidden and resized to not distract you.
- See also `The sidepanel`.
-
-* The statusbar. It displays informational text when hovering something
- with a pointer. That's it.
-
-
-Taking a closer look
-''''''''''''''''''''
-
-
-Command line usage
-------------------
-
-
-Running Midori normally works as follows:
-
-
-* $ midori
-
- Just run a new instance of Midori. If an instance of Midori is already
- running a new window in that instance will be opened.
-
-* $ midori [URIs]
-
- You can supply any number of URIs to open as arguments. If you have a
- saved session or a running instance they will be added to the last
- active window.
-
-* $ midori [URI1]|[URI2]|...
-
- You can separate URIS by a pipe (|) as well. They are handled as if you
- provided all URIs as separate arguments.
-
-* $ midori --run [JAVASCRIPT]
-
- If you pass the filename of a javascript Midori will attempt to run
- the contents of the file as javascript code.
-
-
-Note that support for opening tabs in an existing instance depends on
-your build and may not be available on some platforms.
-
-
-The following arguments are supported if you call Midori from a command line.
-
-
-+-------+--------------------+------------------------------------------------+
-| Short | Long option | Function |
-+=======+====================+================================================+
-| -a | --app | Run ADDRESS as a web application |
-+-------+--------------------+------------------------------------------------+
-| -c | --config | Use FOLDER as configuration folder |
-+-------+--------------------+------------------------------------------------+
-| -r | --run | Run the specified filename as javascript |
-+-------+--------------------+------------------------------------------------+
-| -s | --snapshot + Take a snapshot of the specified URI |
-+-------+--------------------+------------------------------------------------+
-| -V | --version | Show version information and exit. |
-+-------+--------------------+------------------------------------------------+
-
-
-Configuration files
--------------------
-
-
-The configuration files in Midori that save related states are by default
-stored in the folder ~/.config/midori in the home directory. It is possible
-to use a different folder by specifying '--config' on the command line.
-
-The files stored in the primary configuration folder are the following:
-
-+----------------+------------------------------------------------------------+
-| Filename | Contents |
-+================+============================================================+
-| accels | Keyboard shortcuts, GtkAccelMap resource |
-+----------------+------------------------------------------------------------+
-| bookmarks.xbel | Bookmarks, XBEL |
-+----------------+------------------------------------------------------------+
-| config | Preferences, text key file |
-+----------------+------------------------------------------------------------+
-| cookies.txt | Cookies, Mozilla text cookies |
-+----------------+------------------------------------------------------------+
-| history.db | History, sqlite3 |
-+----------------+------------------------------------------------------------+
-| logins | Usernames and passwords, plain text |
-+----------------+------------------------------------------------------------+
-| running | A file created to track whether Midori quit cleanly |
-+----------------+------------------------------------------------------------+
-| search | Search engines, text key file |
-+----------------+------------------------------------------------------------+
-| session.xbel | The current or last session, ie. open tabs, |
-+----------------+------------------------------------------------------------+
-| tabtrash.xbel | The 10 last closed tabs |
-+----------------+------------------------------------------------------------+
-
-Note that generally manual modifications to these files aren't recommended. As
-an exception, while Midori is *not* running, it is possible to edit or
-replace the 'bookmarks.xbel' as long as it is valid XBEL/ XML.
-
-Currently while Midori is running it will happily overwrite files as needed and
-never read back any changes.
-
-
-Keyboard shortcuts
-------------------
-
-
-...
-
-
-The navigationbar
------------------
-
-
-The navigationbar is the primary toolbar containing notably back and forward
-buttons, the location entry and a search entry. The "Toolbar Editor" extension
-can be used to add or remove items.
-
-
-The sidepanel
--------------
-
-
-...
-
-
-Extensions
-----------
-
-
-...
-
-
-Frequently asked questions
-''''''''''''''''''''''''''
-
-
-How do you pronounce Midori and what does it mean anyway?
----------------------------------------------------------
-
-Pronounce it "midoɺi", with a Bavarian/ Japanese "r" or "Mee-Doh-Ree"
-in English or read it Italian. The name comes from the Japanese word
-緑 (みどり) for the colour "green".
-
-
-What does the logo mean?
-------------------------
-
-The paw of a green cat. Obviously. Also it resembles the letter "M"
-in "Midori". The curving is supposed to emphasize speed.
-
-
-On which platforms does Midori run currently?
----------------------------------------------
-
-Midori is basically very portable and should run on all platforms that
-its dependencies support.
-
-
-
-Under which license is Midori distributed?
-------------------------------------------
-
-Midori, documentation and all delivered artwork are licensed under the LGPL2.
-
-
-GNU Lesser General Public License
-'''''''''''''''''''''''''''''''''
-
-::
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- FIXME: Provide full license text
-
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 44b9cdb..c5cdded 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3032,7 +3032,7 @@ midori_preferences_response_help_cb (GtkWidget* preferences,
MidoriBrowser* browser)
{
if (response == GTK_RESPONSE_HELP)
- gtk_action_activate (_action_by_name (browser, "HelpContents"));
+ gtk_action_activate (_action_by_name (browser, "HelpFAQ"));
}
static void
@@ -4589,20 +4589,20 @@ _action_help_link_activate (GtkAction* action,
#endif
action_name = gtk_action_get_name (action);
- if (!strncmp ("HelpContents", action_name, 12))
+ if (!strncmp ("HelpFAQ", action_name, 7))
{
#ifdef G_OS_WIN32
{
#ifdef DOCDIR
- gchar* path = sokoke_find_data_filename ("doc/midori/user/midori.html");
+ gchar* path = sokoke_find_data_filename ("doc/midori/faq.html");
uri = free_uri = g_filename_to_uri (path, NULL, NULL);
if (g_access (path, F_OK) != 0)
{
- if (g_access (DOCDIR "/user/midori.html", F_OK) == 0)
- uri = "file://" DOCDIR "/user/midori.html";
+ if (g_access (DOCDIR "/faq.html", F_OK) == 0)
+ uri = "file://" DOCDIR "/faq.html";
else
#endif
- uri = "error:nodocs share/doc/midori/user/midori.html";
+ uri = "error:nodocs share/doc/midori/faq.html";
#ifdef DOCDIR
}
g_free (path);
@@ -4610,14 +4610,12 @@ _action_help_link_activate (GtkAction* action,
}
#else
#ifdef DOCDIR
- uri = "file://" DOCDIR "/user/midori.html";
- if (g_access (DOCDIR "/user/midori.html", F_OK) != 0)
+ uri = "file://" DOCDIR "/faq.html";
+ if (g_access (DOCDIR "/faq.html", F_OK) != 0)
#endif
- uri = "error:nodocs " DOCDIR "/user/midori.html";
+ uri = "error:nodocs " DOCDIR "/faq.html";
#endif
}
- else if (!strncmp ("HelpFAQ", action_name, 7))
- uri = "http://wiki.xfce.org/midori/faq";
else if (!strncmp ("HelpBugs", action_name, 8))
uri = PACKAGE_BUGREPORT;
else
@@ -5126,11 +5124,8 @@ static const GtkActionEntry entries[] =
N_("Open the tabs saved in the last session"), NULL },
{ "Help", NULL, N_("_Help") },
- { "HelpContents", GTK_STOCK_HELP,
- N_("_Contents"), "F1",
- N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) },
- { "HelpFAQ", NULL,
- N_("_Frequent Questions"), NULL,
+ { "HelpFAQ", GTK_STOCK_HELP,
+ N_("_Frequent Questions"), "F1",
N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) },
{ "HelpBugs", NULL,
N_("_Report a Bug"), NULL,
@@ -5381,7 +5376,6 @@ static const gchar* ui_markup =
"<menuitem action='Tools'/>"
"<menuitem action='Window'/>"
"<menu action='Help'>"
- "<menuitem action='HelpContents'/>"
"<menuitem action='HelpFAQ'/>"
"<menuitem action='HelpBugs'/>"
"<separator/>"
diff --git a/wscript b/wscript
index 3277526..80a1fa7 100644
--- a/wscript
+++ b/wscript
@@ -98,19 +98,6 @@ def configure (conf):
sys.exit (1)
conf.check_tool ('glib2')
- if option_enabled ('userdocs'):
- conf.find_program ('rst2html.py', var='RST2HTML')
- # debian renames the executable, check that as well :(
- if not conf.env['RST2HTML']:
- conf.find_program ('rst2html', var='RST2HTML')
- if conf.env['RST2HTML']:
- user_docs = 'yes'
- else:
- option_checkfatal ('userdocs', 'user documentation')
- user_docs = 'N/A'
- else:
- user_docs = 'no '
-
if option_enabled ('nls'):
conf.check_tool ('intltool')
if conf.env['INTLTOOL'] and conf.env['POCOM']:
@@ -329,7 +316,6 @@ def configure (conf):
Notifications: %(libnotify)s (libnotify)
IDN support: %(idn)s (libidn or libsoup 2.27.90)
- User documentation: %(user_docs)s (docutils)
API documentation: %(api_docs)s (gtk-doc)
''' % locals ())
if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4':
@@ -368,7 +354,6 @@ def set_options (opt):
group.add_option ('--update-po', action='store_true', default=False,
help='Update localization files', dest='update_po')
add_enable_option ('docs', 'informational text files', group)
- add_enable_option ('userdocs', 'user documentation', group)
add_enable_option ('apidocs', 'API documentation', group, disable=True)
group = opt.add_option_group ('Optional features', '')
@@ -419,24 +404,11 @@ def build (bld):
if bld.env['docs']:
bld.install_files ('${DOCDIR}/', \
- 'AUTHORS COPYING ChangeLog EXPAT README')
+ 'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
# Install default configuration
bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
- if bld.env['RST2HTML']:
- # FIXME: Build only if needed
- Utils.check_dir (blddir)
- Utils.check_dir (blddir + '/docs')
- Utils.check_dir (blddir + '/docs/user')
- os.chdir (blddir + '/docs/user')
- command = bld.env['RST2HTML'] + ' -stg ' + \
- '--stylesheet=../../../docs/user/midori.css ' + \
- '../../../docs/user/midori.txt ' + 'midori.html'
- Utils.exec_command (command)
- os.chdir ('../../..')
- bld.install_files ('${DOCDIR}/user/', blddir + '/docs/user/midori.html')
-
if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_po')
obj.podir = 'po'
More information about the Xfce4-commits
mailing list