diff --git a/docs/fwg/testapp.sgml b/docs/fwg/testapp.sgml
index be0807291f..bfbd66abdd 100644
--- a/docs/fwg/testapp.sgml
+++ b/docs/fwg/testapp.sgml
@@ -17,7 +17,7 @@
   </para>
 </chapter>
 
-<chapter id="cha-testapp-connect">
+<chapter id="cha-testapp-running">
   <title>Running the pipeline</title>
   <para>
   </para>
diff --git a/docs/manual/bins.sgml b/docs/manual/bins.sgml
index eb89b4c475..ec69b174cf 100644
--- a/docs/manual/bins.sgml
+++ b/docs/manual/bins.sgml
@@ -110,7 +110,7 @@
   while (elements) {
     GstElement *element = GST_ELEMENT (elements-&gt;data);
 
-    g_print ("element in bin: %s\n", gst_element_get_name (element));
+    g_print ("element in bin: &percnt;s\n", gst_element_get_name (element));
 
     elements = g_list_next (elements);
   }
diff --git a/docs/manual/dynamic.sgml b/docs/manual/dynamic.sgml
index 4cfdcf6846..23a59263e7 100644
--- a/docs/manual/dynamic.sgml
+++ b/docs/manual/dynamic.sgml
@@ -102,7 +102,7 @@ new_pad_created (GstElement *parse, GstPad *pad, GstElement *pipeline)
 
   GtkWidget *appwindow;
 
-  g_print ("***** a new pad %s was created\n", gst_pad_get_name (pad));
+  g_print ("***** a new pad &percnt;s was created\n", gst_pad_get_name (pad));
   
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED);
 
diff --git a/docs/manual/helloworld.sgml b/docs/manual/helloworld.sgml
index f9802e01c6..7eaa2450bc 100644
--- a/docs/manual/helloworld.sgml
+++ b/docs/manual/helloworld.sgml
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   gst_init(&amp;argc, &amp;argv);
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;n", argv[0]);
+    g_print ("usage: &percnt;s &lt;filename&gt;n", argv[0]);
     exit (-1);
   }
 
diff --git a/docs/manual/helloworld2.sgml b/docs/manual/helloworld2.sgml
index 98c2e96736..1a48f7f991 100644
--- a/docs/manual/helloworld2.sgml
+++ b/docs/manual/helloworld2.sgml
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   GstElement *pipeline;
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: &percnt;s &lt;filename&gt;\n", argv[0]);
     exit (-1);
   }
 
diff --git a/docs/manual/pads.sgml b/docs/manual/pads.sgml
index 8cfaf47f5d..52f0ccb66b 100644
--- a/docs/manual/pads.sgml
+++ b/docs/manual/pads.sgml
@@ -34,7 +34,7 @@
  while (pads) {
    GstPad *pad = GST_PAD (pads-&gt;data);
 
-   g_print ("pad name %s\n", gst_pad_get_name (pad));
+   g_print ("pad name &percnt;s\n", gst_pad_get_name (pad));
    
    pads = g_list_next (pads);
  }
@@ -82,7 +82,7 @@
 static void
 pad_connect_func (GstElement *parser, GstPad *pad, GstElement *pipeline)
 {
-  g_print("***** a new pad %s was created\n", gst_pad_get_name(pad));
+  g_print("***** a new pad &percnt;s was created\n", gst_pad_get_name(pad));
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
@@ -258,12 +258,12 @@ Pads:
     ...
  caps = gst_pad_get_caps_list (pad);
 
- g_print ("pad name %s\n", gst_pad_get_name (pad));
+ g_print ("pad name &percnt;s\n", gst_pad_get_name (pad));
  
  while (caps) {
    GstCaps *cap = (GstCaps *) caps-&gt;data;
 
-   g_print (" Capability name %s, MIME type\n", gst_caps_get_name (cap), 
+   g_print (" Capability name &percnt;s, MIME type\n", gst_caps_get_name (cap), 
                                                 gst_caps_get_mime (cap));
    
    caps = g_list_next (caps);
diff --git a/docs/manual/plugins.sgml b/docs/manual/plugins.sgml
index 4f7c57cbed..6d082d0104 100644
--- a/docs/manual/plugins.sgml
+++ b/docs/manual/plugins.sgml
@@ -55,7 +55,7 @@ struct _GstPlugin {
     while (plugins) {
       GstPlugin *plugin = (GstPlugin *)plugins-&gt;data;
 
-      g_print ("plugin: %s\n", gst_plugin_get_name (plugin));
+      g_print ("plugin: &percnt;s\n", gst_plugin_get_name (plugin));
 
       plugins = g_list_next (plugins);
     }
diff --git a/docs/manual/queues.sgml b/docs/manual/queues.sgml
index e057f2e8d7..2450e49961 100644
--- a/docs/manual/queues.sgml
+++ b/docs/manual/queues.sgml
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   gst_init (&amp;argc,&amp;argv);
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: &percnt;s &lt;filename&gt;\n", argv[0]);
     exit (-1);
   }
 
diff --git a/docs/manual/threads.sgml b/docs/manual/threads.sgml
index 29908ade29..b5f24f0bb6 100644
--- a/docs/manual/threads.sgml
+++ b/docs/manual/threads.sgml
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   GstElement *thread;
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: &percnt;s &lt;filename&gt;\n", argv[0]);
     exit (-1);
   }
 
diff --git a/docs/manual/typedetection.sgml b/docs/manual/typedetection.sgml
index cfbf97782b..297c56221a 100644
--- a/docs/manual/typedetection.sgml
+++ b/docs/manual/typedetection.sgml
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
   gst_init(&amp;argc,&amp;argv);
 
   if (argc != 2) {
-    g_print("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print("usage: &percnt;s &lt;filename&gt;\n", argv[0]);
     exit(-1);
   }
 
diff --git a/docs/manual/xml.sgml b/docs/manual/xml.sgml
index 399a90739a..ba86abbc86 100644
--- a/docs/manual/xml.sgml
+++ b/docs/manual/xml.sgml
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   gst_init (&amp;argc,&amp;argv);
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: &percnt;s &lt;filename&gt;\n", argv[0]);
     exit (-1);
   }