diff --git a/doc/geany.html b/doc/geany.html
index 603d70a7..4668b4c4 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -3016,13 +3016,13 @@ file</p>
 file</p>
 </td>
 <td><p class="first">Loads From:
-filetype.xxx file in
+filetypes.xxx file in
 ~/.config/geany/filedefs</p>
 <p class="last">Saves to: as above,
 creating if needed.</p>
 </td>
 <td><p class="first">Loads From:
-filetype.xxx in
+filetypes.xxx in
 Geany install</p>
 <p class="last">Saves to: as user
 preferences left.</p>
@@ -3043,7 +3043,7 @@ geany.conf file in
 creating if needed.</p>
 </td>
 <td><p class="first">Loads From:
-filetype.xxx in
+filetypes.xxx in
 Geany install</p>
 <p class="last">Saves to: as user
 preferences left.</p>
@@ -3072,14 +3072,14 @@ project file</p>
 <td><p class="first">Loads From:
 geany.conf file in
 ~/.config/geany or else
-filetype.xxx file in
+filetypes.xxx file in
 ~/.config/geany/filedefs</p>
 <p class="last">Saves To:
-filetype.xxx file in
+filetypes.xxx file in
 ~/.config/geany/filedefs</p>
 </td>
 <td><p class="first">Loads From:
-filetype.xxx in
+filetypes.xxx in
 Geany install</p>
 <p class="last">Saves To: as user
 preferences left.</p>
@@ -3091,8 +3091,8 @@ Command: ./%e</td>
 </table>
 <p>The following notes on the table reference cells by coordinate as (group,source):</p>
 <ul class="simple">
-<li>General - for filetype.xxx substitute the filetype name of the
-current document for xxx.</li>
+<li>General - for filetypes.xxx substitute the appropriate extension for
+the filetype of the current document for xxx - see <cite>filenames</cite>.</li>
 <li>System Filetypes - Labels loaded from these sources are locale sensitive
 and can contain translations.</li>
 <li>(Filetype, Project File) and (Filetype, Preferences) - preferences use a full
@@ -6553,7 +6553,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2011-03-29 13:47 UTC.
+Generated on: 2011-03-29 13:56 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index de1b13d4..d9464b9a 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -2754,14 +2754,14 @@ is shown in the following table.
 | Group        | Project File        | Preferences              | System Filetype   |  Defaults                     |
 +==============+=====================+==========================+===================+===============================+
 | Filetype     | Loads From: project | Loads From:              | Loads From:       | None                          |
-|              | file                | filetype.xxx file in     | filetype.xxx in   |                               |
+|              | file                | filetypes.xxx file in    | filetypes.xxx in  |                               |
 |              |                     | ~/.config/geany/filedefs | Geany install     |                               |
 |              | Saves To: project   |                          |                   |                               |
 |              | file                | Saves to: as above,      | Saves to: as user |                               |
 |              |                     | creating if needed.      | preferences left. |                               |
 +--------------+---------------------+--------------------------+-------------------+-------------------------------+
 | Filetype     | Loads From: project | Loads From:              | Loads From:       | 1:                            |
-| Independent  | file                | geany.conf file in       | filetype.xxx in   |   Label: _Make                |
+| Independent  | file                | geany.conf file in       | filetypes.xxx in  |   Label: _Make                |
 |              |                     | ~/.config/geany          | Geany install     |   Command: make               |
 |              | Saves To: project   |                          |                   |                               |
 |              | file                | Saves to: as above,      | Saves to: as user | 2:                            |
@@ -2773,20 +2773,20 @@ is shown in the following table.
 |              |                     |                          |                   |    Command: make %e.o         |
 +--------------+---------------------+--------------------------+-------------------+-------------------------------+
 | Execute      | Loads From: project | Loads From:              | Loads From:       | Label: _Execute               |
-|              | file or else        | geany.conf file in       | filetype.xxx in   | Command: ./%e                 |
+|              | file or else        | geany.conf file in       | filetypes.xxx in  | Command: ./%e                 |
 |              | filetype defined in | ~/.config/geany or else  | Geany install     |                               |
-|              | project file        | filetype.xxx file in     |                   |                               |
+|              | project file        | filetypes.xxx file in    |                   |                               |
 |              |                     | ~/.config/geany/filedefs | Saves To: as user |                               |
 |              | Saves To:           |                          | preferences left. |                               |
 |              | project file        | Saves To:                |                   |                               |
-|              |                     | filetype.xxx file in     |                   |                               |
+|              |                     | filetypes.xxx file in    |                   |                               |
 |              |                     | ~/.config/geany/filedefs |                   |                               |
 +--------------+---------------------+--------------------------+-------------------+-------------------------------+
 
 The following notes on the table reference cells by coordinate as (group,source):
 
-* General - for filetype.xxx substitute the filetype name of the
-  current document for xxx.
+* General - for filetypes.xxx substitute the appropriate extension for
+  the filetype of the current document for xxx - see `filenames`.
 
 * System Filetypes - Labels loaded from these sources are locale sensitive
   and can contain translations.