diff --git a/common b/common
index 856fbbfa88..6f36afb863 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 856fbbfa88621ab67df141ead8d4d3df32c5c176
+Subproject commit 6f36afb863ab8f16a6be2a9f068cefdee885317d
diff --git a/docs/plugins/inspect/plugin-audioconvert.xml b/docs/plugins/inspect/plugin-audioconvert.xml
index ca59cfabfe..14b8a24226 100644
--- a/docs/plugins/inspect/plugin-audioconvert.xml
+++ b/docs/plugins/inspect/plugin-audioconvert.xml
@@ -8,13 +8,6 @@
   <package>GStreamer CVS/prerelease</package>
   <origin>http://gstreamer.freedesktop.org/</origin>
   <elements>
-    <element>
-      <name>buffer-frames-convert</name>
-      <longname>buffer-frames conversion</longname>
-      <class>Filter/Converter/Audio</class>
-      <description>Convert between different values of the buffer-frames stream property</description>
-      <author>Andy Wingo &lt;wingo at pobox.com&gt;</author>
-    </element>
     <element>
       <name>audioconvert</name>
       <longname>Audio Conversion</longname>
@@ -22,5 +15,12 @@
       <description>Convert audio to different formats</description>
       <author>Benjamin Otte &lt;in7y118@public.uni-hamburg.de&gt;</author>
     </element>
+    <element>
+      <name>buffer-frames-convert</name>
+      <longname>buffer-frames conversion</longname>
+      <class>Filter/Converter/Audio</class>
+      <description>Convert between different values of the buffer-frames stream property</description>
+      <author>Andy Wingo &lt;wingo at pobox.com&gt;</author>
+    </element>
   </elements>
 </plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-ogg.xml b/docs/plugins/inspect/plugin-ogg.xml
index f00efdf52f..41367418ed 100644
--- a/docs/plugins/inspect/plugin-ogg.xml
+++ b/docs/plugins/inspect/plugin-ogg.xml
@@ -8,6 +8,27 @@
   <package>GStreamer CVS/prerelease</package>
   <origin>http://gstreamer.freedesktop.org/</origin>
   <elements>
+    <element>
+      <name>oggdemux</name>
+      <longname>ogg demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>demux ogg streams (info about ogg: http://xiph.org)</description>
+      <author>Wim Taymand &lt;wim@fluendo.com&gt;</author>
+    </element>
+    <element>
+      <name>oggmux</name>
+      <longname>ogg muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>mux ogg streams (info about ogg: http://xiph.org)</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
+    </element>
+    <element>
+      <name>ogmaudioparse</name>
+      <longname>OGM audio stream parser</longname>
+      <class>Codec/Decoder/Audio</class>
+      <description>parse an OGM audio header and stream</description>
+      <author>Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
     <element>
       <name>ogmtextparse</name>
       <longname>OGM text stream parser</longname>
@@ -22,26 +43,5 @@
       <description>parse an OGM video header and stream</description>
       <author>Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
-    <element>
-      <name>ogmaudioparse</name>
-      <longname>OGM audio stream parser</longname>
-      <class>Codec/Decoder/Audio</class>
-      <description>parse an OGM audio header and stream</description>
-      <author>Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
-    </element>
-    <element>
-      <name>oggmux</name>
-      <longname>ogg muxer</longname>
-      <class>Codec/Muxer</class>
-      <description>mux ogg streams (info about ogg: http://xiph.org)</description>
-      <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
-    </element>
-    <element>
-      <name>oggdemux</name>
-      <longname>ogg demuxer</longname>
-      <class>Codec/Demuxer</class>
-      <description>demux ogg streams (info about ogg: http://xiph.org)</description>
-      <author>Wim Taymand &lt;wim@fluendo.com&gt;</author>
-    </element>
   </elements>
 </plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-tcp.xml b/docs/plugins/inspect/plugin-tcp.xml
index 7edf99dd8b..114335cac4 100644
--- a/docs/plugins/inspect/plugin-tcp.xml
+++ b/docs/plugins/inspect/plugin-tcp.xml
@@ -16,17 +16,10 @@
       <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;, Wim Taymans &lt;wim@fluendo.com&gt;</author>
     </element>
     <element>
-      <name>tcpserversrc</name>
-      <longname>TCP Server source</longname>
-      <class>Source/Network</class>
-      <description>Receive data as a server over the network via TCP</description>
-      <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
-    </element>
-    <element>
-      <name>tcpserversink</name>
-      <longname>TCP Server sink</longname>
+      <name>tcpclientsink</name>
+      <longname>TCP Client sink</longname>
       <class>Sink/Network</class>
-      <description>Send data as a server over the network via TCP</description>
+      <description>Send data as a client over the network via TCP</description>
       <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
     </element>
     <element>
@@ -37,10 +30,17 @@
       <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
     </element>
     <element>
-      <name>tcpclientsink</name>
-      <longname>TCP Client sink</longname>
+      <name>tcpserversink</name>
+      <longname>TCP Server sink</longname>
       <class>Sink/Network</class>
-      <description>Send data as a client over the network via TCP</description>
+      <description>Send data as a server over the network via TCP</description>
+      <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
+    </element>
+    <element>
+      <name>tcpserversrc</name>
+      <longname>TCP Server source</longname>
+      <class>Source/Network</class>
+      <description>Receive data as a server over the network via TCP</description>
       <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
     </element>
   </elements>
diff --git a/docs/plugins/inspect/plugin-theora.xml b/docs/plugins/inspect/plugin-theora.xml
index 637caff978..1fe6048874 100644
--- a/docs/plugins/inspect/plugin-theora.xml
+++ b/docs/plugins/inspect/plugin-theora.xml
@@ -8,13 +8,6 @@
   <package>GStreamer CVS/prerelease</package>
   <origin>http://gstreamer.freedesktop.org/</origin>
   <elements>
-    <element>
-      <name>theoraenc</name>
-      <longname>TheoraEnc</longname>
-      <class>Codec/Encoder/Video</class>
-      <description>encode raw YUV video to a theora stream</description>
-      <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
-    </element>
     <element>
       <name>theoradec</name>
       <longname>TheoraDec</longname>
@@ -22,5 +15,12 @@
       <description>decode raw theora streams to raw YUV video</description>
       <author>Benjamin Otte &lt;in7y118@public.uni-hamburg.de&gt;, Wim Taymans &lt;wim@fluendo.com&gt;</author>
     </element>
+    <element>
+      <name>theoraenc</name>
+      <longname>TheoraEnc</longname>
+      <class>Codec/Encoder/Video</class>
+      <description>encode raw YUV video to a theora stream</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
+    </element>
   </elements>
 </plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-vorbis.xml b/docs/plugins/inspect/plugin-vorbis.xml
index 0c55eb8cb0..d36c0d70b4 100644
--- a/docs/plugins/inspect/plugin-vorbis.xml
+++ b/docs/plugins/inspect/plugin-vorbis.xml
@@ -8,13 +8,6 @@
   <package>GStreamer CVS/prerelease</package>
   <origin>http://gstreamer.freedesktop.org/</origin>
   <elements>
-    <element>
-      <name>vorbisparse</name>
-      <longname>VorbisParse</longname>
-      <class>Codec/Parser/Audio</class>
-      <description>parse raw vorbis streams</description>
-      <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
-    </element>
     <element>
       <name>vorbisdec</name>
       <longname>VorbisDec</longname>
@@ -29,5 +22,12 @@
       <description>Encodes audio in Vorbis format</description>
       <author>Monty &lt;monty@xiph.org&gt;, Wim Taymans &lt;wim@fluendo.com&gt;</author>
     </element>
+    <element>
+      <name>vorbisparse</name>
+      <longname>VorbisParse</longname>
+      <class>Codec/Parser/Audio</class>
+      <description>parse raw vorbis streams</description>
+      <author>Thomas Vander Stichele &lt;thomas at apestaart dot org&gt;</author>
+    </element>
   </elements>
 </plugin>
\ No newline at end of file