pwg: final cleanups for 1.0

4 files changed, 16 insertions, 16 deletions

diff --git a/docs/pwg/appendix-checklist.xml b/docs/pwg/appendix-checklist.xml
index 503031fc1..336d3da76 100644
--- a/docs/pwg/appendix-checklist.xml
+++ b/docs/pwg/appendix-checklist.xml
@@ -133,7 +133,7 @@ gst_pad_set_event_func (myelement->srcpad,
       <listitem>
         <para>
           Elements should make sure they forward events they do not
-          handle with gst_pad_event_default (pad, event) instead of
+          handle with gst_pad_event_default (pad, parent, event) instead of
           just dropping them. Events should never be dropped unless
           specifically intended.
         </para>
@@ -141,20 +141,10 @@ gst_pad_set_event_func (myelement->srcpad,
       <listitem>
         <para>
           Elements should make sure they forward queries they do not
-          handle with gst_pad_query_default (pad, query) instead of
+          handle with gst_pad_query_default (pad, parent, query) instead of
           just dropping them.
         </para>
       </listitem>
-      <listitem>
-        <para>
-          Elements should use gst_pad_get_parent() in event and query
-          functions, so that they hold a reference to the element while they
-          are operating. Note that gst_pad_get_parent() increases the
-          reference count of the element, so you must be very careful to call
-          gst_object_unref (element) before returning from your query or
-          event function, otherwise you will leak memory.
-        </para>
-      </listitem>
     </itemizedlist>
   </sect1>
 
@@ -168,8 +158,8 @@ gst_pad_set_event_func (myelement->srcpad,
           tool to show that your element is finished. Applications such as
           Rhythmbox and Totem (for GNOME) or AmaroK (for KDE)
           <emphasis>are</emphasis>. <command>gst-launch</command> will not
-          test various things such as proper clean-up on reset, interrupt
-          event handling, querying and so on.
+          test various things such as proper clean-up on reset, event
+          handling, querying and so on.
         </para>
       </listitem>
       <listitem>
diff --git a/docs/pwg/appendix-porting.xml b/docs/pwg/appendix-porting.xml
index d7a3ec4a6..ab457a8ce 100644
--- a/docs/pwg/appendix-porting.xml
+++ b/docs/pwg/appendix-porting.xml
@@ -186,3 +186,11 @@
     </itemizedlist>
   </sect1>
 </chapter>
+
+<chapter id="chapter-porting-1_0">
+  <title>Porting 0.10 plug-ins to 1.0</title>
+  <para>
+    You can find the list of changes in the
+    <ulink url="http://cgit.freedesktop.org/gstreamer/gstreamer/tree/docs/random/porting-to-1.0.txt">Porting to 1.0</ulink> document.
+  </para>
+</chapter>
diff --git a/docs/pwg/other-manager.xml b/docs/pwg/other-manager.xml
index ebd1ace2b..53381146b 100644
--- a/docs/pwg/other-manager.xml
+++ b/docs/pwg/other-manager.xml
@@ -30,7 +30,9 @@
     <listitem>
       <para>
         To embed an element, or a series of elements, into something that
-        looks and works like a simple element to the outside world.
+        looks and works like a simple element to the outside world. This
+        is particular handy for implementing sources and sink elements with
+        multiple pads.
       </para>
     </listitem>
   </itemizedlist>
diff --git a/docs/pwg/other-ntoone.xml b/docs/pwg/other-ntoone.xml
index d9b75b8da..9efcff63a 100644
--- a/docs/pwg/other-ntoone.xml
+++ b/docs/pwg/other-ntoone.xml
@@ -9,7 +9,7 @@
     and the N-to-1 element synchronizes those streams by
     expected-timestamp-based logic. This means it lets all streams wait
     except for the one that provides the earliest next-expected timestamp.
-    When that stream has passwed one buffer, the next
+    When that stream has passed one buffer, the next
     earliest-expected-timestamp is calculated, and we start back where we
     were, until all streams have reached EOS. There is a helper base class,
     called <classname>GstCollectPads</classname>, that will help you to do