diff --git a/docs/en/designers/language-builtin-functions/language-function-config-load.xml b/docs/en/designers/language-builtin-functions/language-function-config-load.xml
index 62e8b71e..6262ec1d 100644
--- a/docs/en/designers/language-builtin-functions/language-function-config-load.xml
+++ b/docs/en/designers/language-builtin-functions/language-function-config-load.xml
@@ -95,12 +95,14 @@
   within a section with the added attribute
   <emphasis>section</emphasis>.
  </para>
- <para>
-  NOTE: <emphasis>Config file sections</emphasis> and the built-in
-  template function called <emphasis>section</emphasis> have nothing
-  to do with each other, they just happen to share a common naming
-  convention.
- </para>
+ <note>
+  <para>
+   <emphasis>Config file sections</emphasis> and the built-in
+   template function called <emphasis>section</emphasis> have nothing
+   to do with each other, they just happen to share a common naming
+   convention.
+  </para>
+ </note>
  <example>
   <title>function config_load with section</title>
   <programlisting>
diff --git a/docs/en/designers/language-builtin-functions/language-function-section.xml b/docs/en/designers/language-builtin-functions/language-function-section.xml
index dd9247dc..69834fd6 100644
--- a/docs/en/designers/language-builtin-functions/language-function-section.xml
+++ b/docs/en/designers/language-builtin-functions/language-function-section.xml
@@ -237,13 +237,15 @@ e-mail: jane@mydomain.com&lt;p&gt;</programlisting>
 		Sections also have their own variables that handle section properties.
 		These are indicated like so: {$smarty.section.sectionname.varname}
 		</para>
-		<para>
-		NOTE: As of Smarty 1.5.0, the syntax for section property variables has
-		been changed from {%sectionname.varname%} to
-		{$smarty.section.sectionname.varname}. The old syntax is still
-		supported, but you will only see reference to the new syntax in the
-		manual examples.
-		</para>
+		<note>
+		 <para>
+		  As of Smarty 1.5.0, the syntax for section property variables has
+ 		  been changed from {%sectionname.varname%} to
+		  {$smarty.section.sectionname.varname}. The old syntax is still
+		  supported, but you will only see reference to the new syntax in the
+		  manual examples.
+		 </para>
+		</note>
 			<sect2 id="section.property.index">
 			<title>index</title>
 			<para>
@@ -339,12 +341,14 @@ e-mail: jane@mydomain.com&lt;p&gt;</programlisting>
 			<para>
         	iteration is used to display the current loop iteration.
 			</para>
-			<para>
-			NOTE: This is not affected by the section properties start, step and
-			max, unlike the index property. Iteration also starts with 1
-			instead of 0 like index. rownum is an alias to iteration, they work
-			identical.
-			</para>
+			<note>
+			 <para>
+			  This is not affected by the section properties start, step and
+			  max, unlike the index property. Iteration also starts with 1
+			  instead of 0 like index. rownum is an alias to iteration, they work
+			  identical.
+			 </para>
+			</note>
 	<example>
 	<title>section property iteration</title>
 	<programlisting>
@@ -565,4 +569,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/docs/en/designers/language-custom-functions/language-function-popup.xml b/docs/en/designers/language-custom-functions/language-function-popup.xml
index 9b1a6190..c9ca86a7 100644
--- a/docs/en/designers/language-custom-functions/language-function-popup.xml
+++ b/docs/en/designers/language-custom-functions/language-function-popup.xml
@@ -426,4 +426,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/docs/en/programmers/api-variables/variable-php-handling.xml b/docs/en/programmers/api-variables/variable-php-handling.xml
index df11594d..8ba38878 100644
--- a/docs/en/programmers/api-variables/variable-php-handling.xml
+++ b/docs/en/programmers/api-variables/variable-php-handling.xml
@@ -18,11 +18,13 @@
        <listitem><para>SMARTY_PHP_ALLOW - Smarty will execute the tags
          as PHP code.</para></listitem>
       </itemizedlist>
-      <para>
-       NOTE: Embedding PHP code into templates is highly discouraged.
-       Use <link linkend="language.custom.functions">custom functions</link> or
-       <link linkend="language.modifiers">modifiers</link> instead.
-      </para>
+      <note>
+       <para>
+        Embedding PHP code into templates is highly discouraged.
+        Use <link linkend="language.custom.functions">custom functions</link> or
+        <link linkend="language.modifiers">modifiers</link> instead.
+       </para>
+      </note>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -43,4 +45,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->