diff --git a/ChangeLog b/ChangeLog
index 60ac137b55..2f56d3ddc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-06  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gstconfig.h.in:
+	  Add 'id' for example.
+
+	* gst/gstpad.c:
+	* gst/gstutils.c:
+	* plugins/elements/gstfdsink.c:
+	  Link to signals. Doc and comment fixes.
+
 2008-02-05  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstpad.h: (GST_PAD_LINK_SUCCESSFUL):
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index c3c8b13ff0..af6de5c7b2 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -37,7 +37,7 @@
  *
  * If a subsystem is disabled in GStreamer, a value is defined in
  * &lt;gst/gst.h&gt;. You can check this if you do subsystem-specific stuff.
- * <example>
+ * <example id="example-gstconfig">
  * <title>Doing subsystem specific things</title>
  * <programlisting>
  * &hash;ifndef GST_DISABLE_GST_DEBUG
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 89f3220d65..3c51504c23 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1529,8 +1529,8 @@ gst_pad_set_bufferalloc_function (GstPad * pad,
  * @srcpad: the source #GstPad to unlink.
  * @sinkpad: the sink #GstPad to unlink.
  *
- * Unlinks the source pad from the sink pad. Will emit the "unlinked" signal on
- * both pads.
+ * Unlinks the source pad from the sink pad. Will emit the #GstPad::unlinked
+ * signal on both pads.
  *
  * Returns: TRUE if the pads were unlinked. This function returns FALSE if
  * the pads were not linked together.
diff --git a/gst/gstutils.c b/gst/gstutils.c
index 583e8caf01..dd2a407d7c 100644
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -2437,7 +2437,7 @@ gst_buffer_stamp (GstBuffer * dest, const GstBuffer * src)
 {
   gst_buffer_copy_metadata (dest, src, GST_BUFFER_COPY_TIMESTAMPS);
 }
-#endif
+#endif /* GST_REMOVE_DEPRECATED */
 
 static gboolean
 intersect_caps_func (GstPad * pad, GValue * ret, GstPad * orig)
@@ -2848,7 +2848,7 @@ gst_atomic_int_set (gint * atomic_int, gint value)
  * Adds a "data probe" to a pad. This function will be called whenever data
  * passes through a pad. In this case data means both events and buffers. The
  * probe will be called with the data as an argument, meaning @handler should
- * have the same callback signature as the 'have-data' signal of #GstPad.
+ * have the same callback signature as the #GstPad::have-data signal.
  * Note that the data will have a reference count greater than 1, so it will
  * be immutable -- you must not change it.
  *
@@ -2892,7 +2892,7 @@ gst_pad_add_data_probe (GstPad * pad, GCallback handler, gpointer data)
 /**
  * gst_pad_add_event_probe:
  * @pad: pad to add the event probe handler to
- * @handler: function to call when data is passed over pad
+ * @handler: function to call when events are passed over pad
  * @data: data to pass along with the handler
  *
  * Adds a probe that will be called for all events passing through a pad. See
@@ -2921,7 +2921,7 @@ gst_pad_add_event_probe (GstPad * pad, GCallback handler, gpointer data)
 /**
  * gst_pad_add_buffer_probe:
  * @pad: pad to add the buffer probe handler to
- * @handler: function to call when data is passed over pad
+ * @handler: function to call when buffers are passed over pad
  * @data: data to pass along with the handler
  *
  * Adds a probe that will be called for all buffers passing through a pad. See
diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c
index 7819126594..628750183f 100644
--- a/plugins/elements/gstfdsink.c
+++ b/plugins/elements/gstfdsink.c
@@ -27,9 +27,9 @@
  *
  * Write data to a unix file descriptor.
  *
- * This element will sycnhronize on the clock before writing the data on the
+ * This element will synchronize on the clock before writing the data on the
  * socket. For file descriptors where this does not make sense (files, ...) the
- * ::sync property can be used to disable synchronisation.
+ * #GstBaseSink:sync property can be used to disable synchronisation.
  *
  * Last reviewed on 2006-04-28 (0.10.6)
  */