From f57a3723939c86e87f4c7630973bb3c703f022d9 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Fri, 5 Dec 2003 12:26:58 +0000
Subject: [PATCH] more trademark protectoin and doc fixing

Original commit message from CVS:
more trademark protectoin and doc fixing
---
 docs/faq/faq.xml             |  1 -
 docs/gst/gstreamer-docs.sgml |  1 -
 docs/gst/tmpl/gst.sgml       |  2 +-
 docs/gst/tmpl/gstxml.sgml    | 10 +++++++---
 docs/pwg/building-boiler.xml |  4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index 35dcb28698..0fee3531a6 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -17,7 +17,6 @@
 
 <!ENTITY CVS SYSTEM "cvs.xml">
 <!ENTITY DEVELOPING SYSTEM "developing.xml">
-
 ]>
 
 <article class="faq" id="index">
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index 1344062b0f..6b667c5c39 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -83,7 +83,6 @@ well as the object hierarchy that defines elements and bins, along
 with some more specialized elements.</para>
 
     &Gst;
-    &GstAutoplug;
     &GstBin;
     &GstBuffer;
     &GstConfig;
diff --git a/docs/gst/tmpl/gst.sgml b/docs/gst/tmpl/gst.sgml
index 92d32672a9..6a518c69e6 100644
--- a/docs/gst/tmpl/gst.sgml
+++ b/docs/gst/tmpl/gst.sgml
@@ -1,5 +1,5 @@
 <!-- ##### SECTION Title ##### -->
-Gstreamer
+GStreamer
 
 <!-- ##### SECTION Short_Description ##### -->
 Media library supporting arbitrary formats and filter graphs.
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 32d00bc1f9..08450b21b9 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
+@: 
+@: 
+@:
+
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -119,7 +123,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@: 
+@gstxml: the object which received the signal.
+@arg1: 
+@arg2: 
 
diff --git a/docs/pwg/building-boiler.xml b/docs/pwg/building-boiler.xml
index 7347ab9d46..2e7e8c1ccf 100644
--- a/docs/pwg/building-boiler.xml
+++ b/docs/pwg/building-boiler.xml
@@ -14,8 +14,8 @@
 
   <!-- ############ sect1 ############# -->
 
-  <sect1 id="sect1-boiler-source" xreflabel="Getting the Gstreamer Plugin Templates">
-    <title>Getting the Gstreamer Plugin Templates</title>
+  <sect1 id="sect1-boiler-source" xreflabel="Getting the GStreamer Plugin Templates">
+    <title>Getting the GStreamer Plugin Templates</title>
     <para>
       There are currently two ways to develop a new plugin for &GStreamer;: You
       can write the entire plugin by hand, or you can copy an existing plugin