[Xfce4-commits] <midori:master> Update FAQ from the wiki

Tue Aug 2 00:10:03 CEST 2011

Updating branch refs/heads/master
         to d82bae1dd11d831d52bf36812e08f7b5bd09381f (commit)
       from 504188151e1dc98cf68eaab179c536a117ed7bce (commit)

commit d82bae1dd11d831d52bf36812e08f7b5bd09381f
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Aug 2 00:03:31 2011 +0200

    Update FAQ from the wiki
    
    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" />.
    
    A phrase referring to the source was added to the first paragraph.

 data/faq.html |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/data/faq.html b/data/faq.html
index a8b2a17..fde4978 100644
--- a/data/faq.html
+++ b/data/faq.html
@@ -5,23 +5,23 @@
 <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="index,follow" />
-<meta name="date" content="2011-05-05T22:28:18+0200" />
-<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" />
+<meta name="generator" content="DokuWiki"/>
+<meta name="robots" content="index,follow"/>
+<meta name="date" content="2011-05-05T22:28:18+0200"/>
+<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 SIG=' --- //[[christian at twotoasts.de|Christian Dywan]] 2011/05/16 01:12//';var JSINFO = {"id":"midori:faq","namespace":"midori"};
+<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=1305397590" ></script>
+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=1306663866"></script>
 </head>
 <body>
 <div class="dokuwiki export">
@@ -71,6 +71,9 @@ var NS='midori';var SIG=' --- //[[christian at twotoasts.de|Christian Dywan]] 2011/
 <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>
+<p>
+This is a snapshot of Frequently Asked Questions designated for offline viewing. The most recent version of this document can be found <a href="http://wiki.xfce.org/midori/faq">in the Xfce wiki</a>.
+<p/>
 
 </div>
 <!-- EDIT1 SECTION "Midori - Frequently asked questions" [1-289] -->
@@ -275,7 +278,7 @@ You need to have GStreamer plugins installed which implement the codecs.
 </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 class="level1"><div class="li"> You need plugins for Theora, gstreamer0.10-base and <acronym title="Moving 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>
