cvs: smarty /docs manual.xml.in /docs/en language-snippets.ent /docs/en/programmers/api-functions api-append-by-ref.xml api-append.xml

didou		Tue Apr 20 07:27:15 2004 EDT

  Added files:                 
    /smarty/docs/en	language-snippets.ent 

  Modified files:              
    /smarty/docs	manual.xml.in 
    /smarty/docs/en/programmers/api-functions	api-append-by-ref.xml 
                                             	api-append.xml 
  Log:
  added the language-snippets.ent file and started using entities for notes under en/programmers/api-functions
  
http://cvs.php.net/diff.php/smarty/docs/manual.xml.in?r1=1.8&r2=1.9&ty=u
Index: smarty/docs/manual.xml.in
diff -u smarty/docs/manual.xml.in:1.8 smarty/docs/manual.xml.in:1.9
--- smarty/docs/manual.xml.in:1.8	Tue Apr 13 03:26:17 2004
+++ smarty/docs/manual.xml.in	Tue Apr 20 07:27:15 2004
@@ -6,8 +6,10 @@
 
 <!-- Add translated specific definitions and snippets -->
 <!ENTITY % language-defs     SYSTEM "@LANG@/language-defs.ent">
+<!ENTITY % language-snippets SYSTEM "@LANG@/language-snippets.ent">
 
 %language-defs;
+%language-snippets;
 
 <!-- Fallback to English definitions and snippets (in case of missing translation) -->
 <!ENTITY % language-defs.default     SYSTEM "en/language-defs.ent">
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-append-by-ref.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-append-by-ref.xml
diff -u smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.2 smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-append-by-ref.xml	Tue Apr 20 07:27:15 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.append.by.ref">
  <refnamediv>
   <refname>append_by_ref</refname>
@@ -22,15 +22,7 @@
    explanation. If you pass the optional third parameter of true,
    the value will be merged with the current array instead of appended.
   </para>
-  <note>
-   <title>Technical Note</title>
-   <para>
-    The <parameter>merge</parameter> parameter respects array keys, so if 
-    you merge two numerically indexed arrays, they may overwrite each other 
-    or result in non-sequential keys. This is unlike the array_merge() function 
-    of PHP which wipes out numerical keys and renumbers them.
-   </para>
-  </note>
+  &note.parameter.merge;
   <example>
    <title>append_by_ref</title>
    <programlisting role="php">
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-append.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-append.xml
diff -u smarty/docs/en/programmers/api-functions/api-append.xml:1.2 smarty/docs/en/programmers/api-functions/api-append.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-append.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-append.xml	Tue Apr 20 07:27:15 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.append">
  <refnamediv>
   <refname>append</refname>
@@ -25,15 +25,7 @@
    parameter of true, the value will be merged with the current array
    instead of appended.
   </para>
-  <note>
-   <title>Technical Note</title>
-   <para>
-    The merge parameter respects array keys, so if you merge two
-    numerically indexed arrays, they may overwrite each other or result in
-    non-sequential keys. This is unlike the array_merge() function of PHP
-    which wipes out numerical keys and renumbers them.
-   </para>
-  </note>
+  &note.parameter.merge;
   <example>
    <title>append</title>
    <programlisting role="php">

http://cvs.php.net/co.php/smarty/docs/en/language-snippets.ent?r=1.1&p=1
Index: smarty/docs/en/language-snippets.ent
+++ smarty/docs/en/language-snippets.ent
<!-- $Revision: 1.1 $ -->

<!ENTITY note.parameter.merge '<note>
 <title>Technical Note</title>
 <para>
  The <parameter>merge</parameter> parameter respects array keys, so if
  you merge two numerically indexed arrays, they may overwrite each other
  or result in non-sequential keys. This is unlike the array_merge() function
  of PHP which wipes out numerical keys and renumbers them.
 </para>
</note>'>

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php