From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Wed, 13 Jan 2010 09:32:59 +0000 (+0000)
Subject: faq: fix link to gst-uninstalled on cgit
X-Git-Tag: RELEASE-0.10.26~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92b1df01866a66db415b6088fe4a03db1d33084c;p=platform%2Fupstream%2Fgstreamer.git

faq: fix link to gst-uninstalled on cgit

Fix link to gst-uninstalled now that it's been moved, and fix a typo
while we're at it. Also add a new section to 'Building GStreamer from
git' that points to the 'How do I develop against an uninstalled copy
of GStreamer' section.
---

diff --git a/docs/faq/developing.xml b/docs/faq/developing.xml
index 281ebb5..dafbc4c 100644
--- a/docs/faq/developing.xml
+++ b/docs/faq/developing.xml
@@ -46,7 +46,7 @@ or integrate with autoconf using the pkg.m4 macro (providing PKG_CONFIG_CHECK).
 It is possible to develop and compile against an uninstalled copy of
 gstreamer and gst-plugins-* (for example, against gits checkouts).
 The easiest way to do this is to use a bash script like  this:
-<ulink url="http://cgit.freedesktop.org/gstreamer/gstreamer/tree/docs/faq/gst-uninstalled">lastest version of gst-uninstalled</ulink>.
+<ulink url="http://cgit.freedesktop.org/gstreamer/gstreamer/tree/scripts/gst-uninstalled">latest version of gst-uninstalled</ulink>.
 
 If you put this script in your path, and symlink it to gst-git (if you want
 to develop against git master) or to gst-released (if you want to develop
diff --git a/docs/faq/git.xml b/docs/faq/git.xml
index 4b8e91d..6cad2b1 100644
--- a/docs/faq/git.xml
+++ b/docs/faq/git.xml
@@ -3,6 +3,23 @@
   <qandaset defaultlabel="qanda">
 
     <qandaentry>
+      <question id="git-uninstalled">
+        <para>
+Is there a way to test or develop against GStreamer from git without
+interfering with my system GStreamer installed from packages?
+        </para>
+      </question>
+
+      <answer>
+        <para>
+Yes! You have two options: you can either run GStreamer in an uninstalled setup
+(see <link linkend="developing-uninstalled-gstreamer">How do I develop against
+an uninstalled GStreamer copy ?</link>), or you can use GNOME's jhbuild.
+        </para>
+      </answer>
+    </qandaentry>
+
+    <qandaentry>
       <question id="git-anon">
         <para>
 How do I check out GStreamer from git ?