added the language-snippets.ent file and started using entities for notes under en/programmers/api-functions

This commit is contained in:
didou
2004-04-20 11:27:15 +00:00
parent cfdc174a3f
commit a40103f346
4 changed files with 15 additions and 18 deletions

View File

@@ -0,0 +1,11 @@
<!-- $Revision$ -->
<!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>'>

View File

@@ -22,15 +22,7 @@
explanation. If you pass the optional third parameter of true, explanation. If you pass the optional third parameter of true,
the value will be merged with the current array instead of appended. the value will be merged with the current array instead of appended.
</para> </para>
<note> &note.parameter.merge;
<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>
<example> <example>
<title>append_by_ref</title> <title>append_by_ref</title>
<programlisting role="php"> <programlisting role="php">

View File

@@ -25,15 +25,7 @@
parameter of true, the value will be merged with the current array parameter of true, the value will be merged with the current array
instead of appended. instead of appended.
</para> </para>
<note> &note.parameter.merge;
<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>
<example> <example>
<title>append</title> <title>append</title>
<programlisting role="php"> <programlisting role="php">

View File

@@ -6,8 +6,10 @@
<!-- Add translated specific definitions and snippets --> <!-- Add translated specific definitions and snippets -->
<!ENTITY % language-defs SYSTEM "@LANG@/language-defs.ent"> <!ENTITY % language-defs SYSTEM "@LANG@/language-defs.ent">
<!ENTITY % language-snippets SYSTEM "@LANG@/language-snippets.ent">
%language-defs; %language-defs;
%language-snippets;
<!-- Fallback to English definitions and snippets (in case of missing translation) --> <!-- Fallback to English definitions and snippets (in case of missing translation) -->
<!ENTITY % language-defs.default SYSTEM "en/language-defs.ent"> <!ENTITY % language-defs.default SYSTEM "en/language-defs.ent">