diff --git a/functions/regex.xml b/functions/regex.xml
index c29358dbd8..0fe491c5c3 100644
--- a/functions/regex.xml
+++ b/functions/regex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.38 $ -->
+<!-- $Revision: 1.39 $ -->
  <reference id="ref.regex">
   <title>Regular Expression Functions (POSIX Extended)</title>
   <titleabbrev>Regexps</titleabbrev>
@@ -377,7 +377,7 @@ list($user,$pass,$uid,$gid,$extra)= split (":", $passwd_line, 5);
       </programlisting>
      </example>
     </para>
-    <tip>
+    <note>
      <simpara>
       If there are <replaceable>n</replaceable> occurrences of
       <parameter>pattern</parameter>, the returned array will contain
@@ -386,7 +386,7 @@ list($user,$pass,$uid,$gid,$extra)= split (":", $passwd_line, 5);
       only one element will be returned. Of course, this is also true if
       <parameter>string</parameter> is empty.
      </simpara>
-    </tip>
+    </note>
     <para>
      To parse a date which may be delimited with slashes, dots, or
      hyphens:
diff --git a/functions/var.xml b/functions/var.xml
index 45c32d8851..a801ed9723 100644
--- a/functions/var.xml
+++ b/functions/var.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.93 $ -->
+<!-- $Revision: 1.94 $ -->
  <reference id="ref.variables">
   <title>Variable Functions</title>
   <titleabbrev>Variables</titleabbrev>
@@ -474,13 +474,13 @@ import_request_variables("gP", "rvar_");
      Returns &true; if <parameter>var</parameter> is a <type>float</type>,
      &false; otherwise.
     </simpara>
-    <tip>
+    <note>
      <para>
       To test if a variable is a number or a numeric string (such as form
       input, which is always a string), you must use
       <function>is_numeric</function>.
      </para>
-    </tip>
+    </note>
     <simpara>
      See also 
      <function>is_bool</function>,
@@ -509,13 +509,13 @@ import_request_variables("gP", "rvar_");
      Returns &true; if <parameter>var</parameter> is an <type>integer</type>
      &false; otherwise.
     </simpara>
-    <tip>
+    <note>
      <para>
       To test if a variable is a number or a numeric string (such as form
       input, which is always a string), you must use
       <function>is_numeric</function>.
      </para>
-    </tip>
+    </note>
     <simpara>
      See also <function>is_bool</function>,
      <function>is_float</function>,