From 0a851225eb32db6986ba4c108d01402498ad2134 Mon Sep 17 00:00:00 2001
From: pete_morgan <pete_morgan@localhost>
Date: Mon, 9 Oct 2006 23:28:03 +0000
Subject: [PATCH] Minor changes and corrections

---
 docs/en/designers/language-basic-syntax.xml          |  2 +-
 .../language-function-popup-init.xml                 | 11 +++++++++++
 .../language-modifiers/language-modifier-escape.xml  |  8 ++++----
 docs/en/getting-started.xml                          |  3 +++
 docs/en/programmers/api-functions/api-display.xml    | 12 ++++++------
 docs/en/programmers/plugins/plugins-inserts.xml      |  4 +---
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/docs/en/designers/language-basic-syntax.xml b/docs/en/designers/language-basic-syntax.xml
index 6919e6fa..6728c542 100644
--- a/docs/en/designers/language-basic-syntax.xml
+++ b/docs/en/designers/language-basic-syntax.xml
@@ -8,7 +8,7 @@
   <literal>}</literal>, but they can be <link linkend="variable.left.delimiter">changed</link>.
  </para>
  <para>
-  For examples, we will assume that you are using the default
+  For the examples in this manual, we will assume that you are using the default
   delimiters. In Smarty, all content outside of delimiters is displayed as
   static content, or unchanged. When Smarty encounters template tags, it
   attempts to interpret them, and displays the appropriate output in their
diff --git a/docs/en/designers/language-custom-functions/language-function-popup-init.xml b/docs/en/designers/language-custom-functions/language-function-popup-init.xml
index 50c9dfc1..6fd190ee 100644
--- a/docs/en/designers/language-custom-functions/language-function-popup-init.xml
+++ b/docs/en/designers/language-custom-functions/language-function-popup-init.xml
@@ -51,6 +51,17 @@
 </programlisting>
  </example>
 
+<note>
+<title>XHTML validation</title>
+<para>The <literal>{popup_init}</literal> does not validate with
+strict and you will get the error
+<literal>document type does not allow element "div" here;</literal>
+(ie a <literal>&lt;div&gt;</literal> tag in the <literal>&lt;head&gt;</literal>).
+
+This means you will need to include the <literal>&lt;script&gt;</literal> and
+<literal>&lt;div&gt;</literal> tags manually.
+</para>
+</note>
 
 </sect1>
 <!-- Keep this comment at the end of the file
diff --git a/docs/en/designers/language-modifiers/language-modifier-escape.xml b/docs/en/designers/language-modifiers/language-modifier-escape.xml
index f68f4467..0951b382 100644
--- a/docs/en/designers/language-modifiers/language-modifier-escape.xml
+++ b/docs/en/designers/language-modifiers/language-modifier-escape.xml
@@ -121,10 +121,10 @@ smarty [AT] example [DOT] com
       <link linkend="language.function.mailto">
       <varname>{mailto}</varname></link></para>
       <screen>
-   <![CDATA[
-   {* email address mangled *}
-   <a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
-   ]]>
+<![CDATA[
+{* email address mangled *}
+<a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
+]]>
    </screen>
   </example>
 
diff --git a/docs/en/getting-started.xml b/docs/en/getting-started.xml
index 32ded647..4fa1ffaf 100644
--- a/docs/en/getting-started.xml
+++ b/docs/en/getting-started.xml
@@ -528,6 +528,9 @@ $smarty->cache_dir    = '/web/www.example.com/guestbook/cache/';
 
 $smarty->assign('name','Ned');
 
+//** un-comment the following line to show the debug console
+//$smarty->debugging = true;
+
 $smarty->display('index.tpl');
 
 ?>
diff --git a/docs/en/programmers/api-functions/api-display.xml b/docs/en/programmers/api-functions/api-display.xml
index 4aca6623..ad8f84a8 100644
--- a/docs/en/programmers/api-functions/api-display.xml
+++ b/docs/en/programmers/api-functions/api-display.xml
@@ -37,15 +37,15 @@ $smarty->caching = true;
 if(!$smarty->is_cached('index.tpl')) {
 
   // dummy up some data
-  $address = "245 N 50th";
+  $address = '245 N 50th';
   $db_data = array(
-               "City" => "Lincoln",
-               "State" => "Nebraska",
-               "Zip" => "68502"
+               'City' => 'Lincoln',
+               'State' => 'Nebraska',
+               'Zip' => '68502'
              );
 
-  $smarty->assign("Name","Fred");
-  $smarty->assign("Address",$address);
+  $smarty->assign('Name', 'Fred');
+  $smarty->assign('Address', $address);
   $smarty->assign('data', $db_data);
 
 }
diff --git a/docs/en/programmers/plugins/plugins-inserts.xml b/docs/en/programmers/plugins/plugins-inserts.xml
index 6f5f9cd8..c3864580 100644
--- a/docs/en/programmers/plugins/plugins-inserts.xml
+++ b/docs/en/programmers/plugins/plugins-inserts.xml
@@ -42,9 +42,7 @@ function smarty_insert_time($params, &$smarty)
         $smarty->trigger_error("insert time: missing 'format' parameter");
         return;
     }
-
-    $datetime = strftime($params['format']);
-    return $datetime;
+    return strftime($params['format']);
 }
 ?>
 ]]>