diff --git a/docs/manual/basics-elements.xml b/docs/manual/basics-elements.xml
index 8b104a9..7fbc60a 100644
--- a/docs/manual/basics-elements.xml
+++ b/docs/manual/basics-elements.xml
@@ -3,7 +3,7 @@
   <para> 
     The most important object in &GStreamer; for the application programmer
     is the <ulink type="http"
-    url="../../gstreamer/html/GstElement.html"><classname>GstElement</classname></ulink>
+    url="&URLAPI;GstElement.html"><classname>GstElement</classname></ulink>
     object. An element is the basic building block for a media pipeline. All
     the different high-level components you will use are derived from
     <classname>GstElement</classname>. Every decoder, encoder, demuxer, video
diff --git a/docs/manual/basics-pads.xml b/docs/manual/basics-pads.xml
index a9e98d0..70f949a 100644
--- a/docs/manual/basics-pads.xml
+++ b/docs/manual/basics-pads.xml
@@ -226,9 +226,9 @@ link_to_multiplexer (GstPad     *tolink_pad,
       <para>
         A pad's capabilities are described in a <classname>GstCaps</classname>
         object. Internally, a <ulink type="http"
-        url="../../gstreamer/html/gstreamer-GstCaps.html"><classname>GstCaps</classname></ulink>
+        url="&URLAPI;gstreamer-GstCaps.html"><classname>GstCaps</classname></ulink>
         will contain one or more <ulink type="http"
-        url="../../gstreamer/html/gstreamer-GstStructure.html"><classname>GstStructure</classname></ulink>
+        url="&URLAPI;gstreamer-GstStructure.html"><classname>GstStructure</classname></ulink>
         that will describe one media type. A negotiated pad will have
         capabilities set that contain exactly <emphasis>one</emphasis>
         structure. Also, this structure will contain only
@@ -608,7 +608,7 @@ link_elements_with_filter (GstElement *element1, GstElement *element2)
     </para>
     <figure float="1" id="section-bin-noghost-img">
       <title>Visualisation of a <ulink type="http"
-      url="../../gstreamer/html/GstBin.html"><classname>GstBin</classname></ulink>
+      url="&URLAPI;GstBin.html"><classname>GstBin</classname></ulink>
       element without ghost pads</title>
       <mediaobject>
         <imageobject>
@@ -627,7 +627,7 @@ link_elements_with_filter (GstElement *element1, GstElement *element2)
     
     <figure float="1" id="section-bin-ghost-img">
       <title>Visualisation of a <ulink type="http"
-      url="../../gstreamer/html/GstBin.html"><classname>GstBin</classname></ulink>
+      url="&URLAPI;GstBin.html"><classname>GstBin</classname></ulink>
       element with a ghost pad</title>
       <mediaobject>
         <imageobject>
diff --git a/docs/manual/intro-motivation.xml b/docs/manual/intro-motivation.xml
index e2d7f21..55571b6 100644
--- a/docs/manual/intro-motivation.xml
+++ b/docs/manual/intro-motivation.xml
@@ -290,7 +290,7 @@
 	developers can experiment with different algorithms, speeding up the
 	development of open and free multimedia codecs like those developed
 	by the <ulink url="http://www.xiph.org" type="http">Xiph.Org
-	Foundation</ulink> (such as Theora and	Vorbis.
+	Foundation</ulink> (such as Theora and	Vorbis).
       </para>
     </section>
 
diff --git a/docs/manual/manual.xml b/docs/manual/manual.xml
index 6462ccc..ac268b5 100644
--- a/docs/manual/manual.xml
+++ b/docs/manual/manual.xml
@@ -12,7 +12,7 @@
 <footnote>
   <para>
     The code for this example is automatically extracted from
-    the documentation and built under <filename>examples/manual</filename>
+    the documentation and built under <filename>tests/examples/manual</filename>
     in the GStreamer tarball.
   </para>
 </footnote>
