diff --git a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/chapter-nodes.texinfo b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/chapter-nodes.texinfo
index 84b3cf4..a97790e 100644
--- a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/chapter-nodes.texinfo
+++ b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/chapter-nodes.texinfo
@@ -1,5 +1,2 @@
-@node =NODE=
-@section =SECT=
-@cindex =CIND=
 @include =INCL=
 
diff --git a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section-functions.texinfo b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section-functions.texinfo
index f726a19..7bf3dfd 100644
--- a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section-functions.texinfo
+++ b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section-functions.texinfo
@@ -1,3 +1,6 @@
+@section =SECT=
+@cindex =CIND=
+
 @subheading Name
 
 The @file{=SECT=} directory organizes @dots{}
@@ -29,7 +32,3 @@ Copyright @copyright{} =COPYRIGHT_YEAR_LIST= =COPYRIGHT_HOLDER=
 This  is free software.  You may redistribute copies of it under the
 terms of the @ref{GNU General Public License}.  There is NO WARRANTY,
 to the extent permitted by law.
-
-@subheading See also
-
-=TEXINFO_SEEALSO=
diff --git a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section.texinfo b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section.texinfo
index 9094611..8968bff 100644
--- a/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section.texinfo
+++ b/Scripts/Functions/Help/Texinfo/Templates/en_US/Chapters/section.texinfo
@@ -1,19 +1,7 @@
-@subheading Goals
-
-The @file{=SECT=} directory organizes @dots{}
-
-@subheading Description
+@node =NODE=
+@section =SECT=
+@cindex =CIND=
 
 @itemize
 @item ...
 @end itemize
-
-@subheading Usage
-
-@itemize
-@item ...
-@end itemize
-
-@subheading See also
-
-=TEXINFO_SEEALSO=
diff --git a/Scripts/Functions/Help/Texinfo/Templates/en_US/manual.conf b/Scripts/Functions/Help/Texinfo/Templates/en_US/manual.conf
deleted file mode 100755
index 84665c4..0000000
--- a/Scripts/Functions/Help/Texinfo/Templates/en_US/manual.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file defines what template file a documentation entry uses.
-# Definition of template files is set on the left side and the regular
-# expression pattern matching the documentation entry file on the
-# right side. The first match wins.
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-Chapters/section-functions.texinfo   = "^.+-function-[[:alnum:]]+\.texinfo$"
-Chapters/section.texinfo             = "^.+\.texinfo$"
diff --git a/Scripts/Functions/Help/Texinfo/Templates/es_ES/manual.conf b/Scripts/Functions/Help/Texinfo/Templates/es_ES/manual.conf
deleted file mode 100755
index ce1599b..0000000
--- a/Scripts/Functions/Help/Texinfo/Templates/es_ES/manual.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Este fichero define la relación entre las plantillas de sección y
-# los caminos del repositorio. Aquí usted puede personalizar la
-# plantilla de sección utilizada en directorios específicos del
-# repository.  La primera coincidencia gana.
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-Directories/section-functions.texinfo   = "(trunk|branches|tags)/Scripts/Functions/[[:alnum:]]+\.texinfo$"
-Directories/section.texinfo             = "(trunk|branches|tags).*\.texinfo$"
diff --git a/Scripts/Functions/Help/Texinfo/Templates/manual.conf b/Scripts/Functions/Help/Texinfo/Templates/manual.conf
new file mode 100755
index 0000000..84665c4
--- /dev/null
+++ b/Scripts/Functions/Help/Texinfo/Templates/manual.conf
@@ -0,0 +1,10 @@
+# This file defines what template file a documentation entry uses.
+# Definition of template files is set on the left side and the regular
+# expression pattern matching the documentation entry file on the
+# right side. The first match wins.
+# ----------------------------------------------------------------------
+# $Id$
+# ----------------------------------------------------------------------
+
+Chapters/section-functions.texinfo   = "^.+-function-[[:alnum:]]+\.texinfo$"
+Chapters/section.texinfo             = "^.+\.texinfo$"