diff --git a/reference/cairo/cairocontext/appendpath.xml b/reference/cairo/cairocontext/appendpath.xml
index dae1401291..71180add35 100644
--- a/reference/cairo/cairocontext/appendpath.xml
+++ b/reference/cairo/cairocontext/appendpath.xml
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/arc.xml b/reference/cairo/cairocontext/arc.xml
index 289edea89e..51acc66981 100644
--- a/reference/cairo/cairocontext/arc.xml
+++ b/reference/cairo/cairocontext/arc.xml
@@ -121,7 +121,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/arcnegative.xml b/reference/cairo/cairocontext/arcnegative.xml
index 74a6d5bbf5..fe6d18597b 100644
--- a/reference/cairo/cairocontext/arcnegative.xml
+++ b/reference/cairo/cairocontext/arcnegative.xml
@@ -102,7 +102,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/clip.xml b/reference/cairo/cairocontext/clip.xml
index 030825322f..e4771ce972 100644
--- a/reference/cairo/cairocontext/clip.xml
+++ b/reference/cairo/cairocontext/clip.xml
@@ -66,7 +66,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/clippreserve.xml b/reference/cairo/cairocontext/clippreserve.xml
index 091c5e4a07..fa8be30e43 100644
--- a/reference/cairo/cairocontext/clippreserve.xml
+++ b/reference/cairo/cairocontext/clippreserve.xml
@@ -63,7 +63,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/closepath.xml b/reference/cairo/cairocontext/closepath.xml
index 38227ff250..a9a04c0949 100644
--- a/reference/cairo/cairocontext/closepath.xml
+++ b/reference/cairo/cairocontext/closepath.xml
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/copypage.xml b/reference/cairo/cairocontext/copypage.xml
index f9ac906f5d..f409c37fda 100644
--- a/reference/cairo/cairocontext/copypage.xml
+++ b/reference/cairo/cairocontext/copypage.xml
@@ -54,7 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/curveto.xml b/reference/cairo/cairocontext/curveto.xml
index f0d657260f..2e3a429bda 100644
--- a/reference/cairo/cairocontext/curveto.xml
+++ b/reference/cairo/cairocontext/curveto.xml
@@ -113,7 +113,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/fill.xml b/reference/cairo/cairocontext/fill.xml
index 4c8c6df84e..7b2a100230 100644
--- a/reference/cairo/cairocontext/fill.xml
+++ b/reference/cairo/cairocontext/fill.xml
@@ -49,7 +49,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairocontext/fillpreserve.xml b/reference/cairo/cairocontext/fillpreserve.xml
index 9762436d59..ea3a01360e 100644
--- a/reference/cairo/cairocontext/fillpreserve.xml
+++ b/reference/cairo/cairocontext/fillpreserve.xml
@@ -50,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &returns.void;
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/cairo/cairomatrix/scale.xml b/reference/cairo/cairomatrix/scale.xml
deleted file mode 100644
index 5e203c1d33..0000000000
--- a/reference/cairo/cairomatrix/scale.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: $ -->
-
-<refentry xml:id="cairomatrix.scale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CairoMatrix::scale</refname>
-  <refname>cairo_matrix_scale</refname>
-  <refpurpose>Applies scaling to a matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>Object oriented style (method):</para>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>CairoMatrix::scale</methodname>
-   <methodparam><type>float</type><parameter>sx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sy</parameter></methodparam>
-   </methodsynopsis>
-  <para>Procedural style:</para>
-  <methodsynopsis>
-   <type>ReturnType</type><methodname>cairo_matrix_scale</methodname>
-   <methodparam><type>CairoContext</type><parameter>context</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sy</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Applies scaling by sx, sy to the transformation in the matrix. The effect of
-    the new transformation is to first scale the coordinates by sx and sy, then
-    apply the original transformation to the coordinates.
-  </para>
- 
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matrix</parameter></term>
-     <listitem>
-      <para>
-       Procedural only - CairoMatrix instance
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sx</parameter></term>
-     <listitem>
-      <para>
-       scale factor in the X direction 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sy</parameter></term>
-     <listitem>
-      <para>
-       scale factor in the Y direction 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Object oriented style</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Apply scaling to a matrix */
-$matrix = new CairoMatrix(1.0, 0.5, 0.0, 1.0, 0.0, 0.0);
-$matrix->scale(0.2, 2.0);
-?>
-]]>
-     </programlisting>
-  </para>
-  <para>
-   <example>
-    <title>Procedural style</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Apply scaling to a matrix */
-$matrix = cairo_matrix_init(1.0, 0.5, 0.0, 1.0, 0.0, 0.0);
-cairo_matrix_scale($matrix, 0.2, 2.0);
-?>
-]]>
-     </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>CairoMatrix::initScale</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->