diff --git a/docs/faq/cvs.xml b/docs/faq/cvs.xml
index 2d69cbb7bc..87e713f1a9 100644
--- a/docs/faq/cvs.xml
+++ b/docs/faq/cvs.xml
@@ -13,6 +13,7 @@ aclocal: configure.ac: 17: macro `AM_PROG_LIBTOOL' not found in library
 aclocal failed
 </programlisting>
 What's wrong ?
+        </para>
       </question>
 
       <answer>
@@ -29,11 +30,11 @@ prefix both aclocal and libtool are installed.
         <para>
 You can do three things to fix this :
 <orderedlist>
-<listitem>install automake in the same prefix as libtool
+<listitem>install automake in the same prefix as libtool</listitem>
 <listitem>force use of the automake installed in the same prefix as libtool
-by using the --with-automake option
+by using the --with-automake option</listitem>
 <listitem>figure out what prefix libtool has been installed to and point
-aclocal to the right location by running
+aclocal to the right location by running</listitem>
 <programlisting>
 export ACLOCAL_FLAGS="-I $(prefix)/share/aclocal"
 </programlisting>
diff --git a/docs/faq/gstreamer-faq.xml b/docs/faq/gstreamer-faq.xml
index f6f924b4ce..a1ce0bb003 100644
--- a/docs/faq/gstreamer-faq.xml
+++ b/docs/faq/gstreamer-faq.xml
@@ -5,11 +5,14 @@
 <!ENTITY START SYSTEM "start.xml">
 <!ENTITY GENERAL SYSTEM "general.xml">
 <!ENTITY DEPENDENCIES SYSTEM "dependencies.xml">
+
 <!ENTITY GETTING SYSTEM "getting.xml">
 <!ENTITY USING SYSTEM "using.xml">
-<!ENTITY DEVELOPING SYSTEM "developing.xml">
 <!ENTITY TROUBLESHOOTING SYSTEM "troubleshooting.xml">
 
+<!ENTITY CVS SYSTEM "cvs.xml">
+<!ENTITY DEVELOPING SYSTEM "developing.xml">
+
 ]>
 
 <article class="faq">
@@ -36,9 +39,12 @@
   &START;
   &GENERAL;
   &DEPENDENCIES;
+
   &GETTING;
   &USING;
-  &DEVELOPING;
   &TROUBLESHOOTING;
 
+  &CVS;
+  &DEVELOPING;
+
 </article>
diff --git a/docs/faq/start.xml b/docs/faq/start.xml
index ee3aa72371..74a97b683f 100644
--- a/docs/faq/start.xml
+++ b/docs/faq/start.xml
@@ -10,6 +10,10 @@ There's a few ways you can get started.
 If you'd rather learn by trying it out, start with
 <xref linkend="title-getting" endterm="title-getting"/>
 </listitem>
+<listitem>
+If you want to live on the bleeding edge and develop and use CVS, see
+<xref linkend="title-cvs" endterm="title-cvs"/>
+</listitem>
 </itemizedlist>
   </para>
 </sect1>
diff --git a/docs/faq/using.xml b/docs/faq/using.xml
index 844625a53c..ded44ee32e 100644
--- a/docs/faq/using.xml
+++ b/docs/faq/using.xml
@@ -2,9 +2,60 @@
   <title id="title-using">Using GStreamer</title>
   <qandaset>
 
+    <qandaentry>
+      <question id="using-getting-started">
+        <para>Ok, I've installed GStreamer.  What can I do next ?</para>
+      </question>
+
+      <answer>
+        <para>
+First of all, verify that you have a working registry and that you can
+inspect them by typing
+<programlisting>
+$ gst-inspect fakesrc
+</programlisting>
+This should print out a bunch of information about this particular element.
+If this tells you that there is "no such element or plugin", you haven't
+installed GStreamer correctly.  Please check
+<link linkend="chapter-getting">how to get GStreamer</link>
+If this fails with any other message, we would appreciate a
+<link linkend="using-bugs-where">bug report</link>.
+        </para>
+        <para>
+It's time to try out a few things.  Start with gst-launch and two plug-ins
+that you really should have : fakesrc and fakesink.  They do nothing except
+pass empty buffers. Type this at the command-line :
+<programlisting>
+$ gst-launch fakesrc num-buffers=3 ! fakesink
+</programlisting>
+This will print out output that looks similar to this :
+<programlisting>
+RUNNING pipeline
+fakesrc0: last-message = "get      ******* (fakesrc0:src)gt; (0 bytes, 0) 0x8057510"
+fakesink0: last-message = "chain   ******* (fakesink0:sink)lt; (0 bytes, 0) 0x8057510"
+fakesrc0: last-message = "get      ******* (fakesrc0:src)gt; (0 bytes, 1) 0x8057510"
+fakesink0: last-message = "chain   ******* (fakesink0:sink)lt; (0 bytes, 1) 0x8057510"
+fakesrc0: last-message = "get      ******* (fakesrc0:src)gt; (0 bytes, 2) 0x8057510"
+fakesink0: last-message = "chain   ******* (fakesink0:sink)lt; (0 bytes, 2) 0x8057510"
+execution ended after 5 iterations (sum 301479000 ns, average 60295800 ns, min 3000 ns, max 105482000 ns)
+</programlisting>
+(Some parts of output have been removed for clarity)  If it looks similar, then
+GStreamer itself is running correctly.
+        </para>
+        <para>
+After this, you might want to try and see if GStreamer can play audio on your
+system.  You need to combine two plug-ins for this test : sinesrc (which
+produces a pure tone) and an audio output plug-in.  You should choose one
+that matches your current sound output and you should make sure you have
+it installed.
+        </para>
+   
+      </answer>
+    </qandaentry>
+
     <qandaentry>
       <question id="using-gst-inspect">
-        <para>How do I tell what GStreamer plugins I have on my system ?</para>
+        <para>How can I see what GStreamer plugins I have on my system ?</para>
       </question>
 
       <answer>