steinm Fri Mar 3 12:42:34 2006 UTC
Modified files:
/phpdoc/en/reference/ps/functions ps-add-note.xml
Log:
- fixed a typo (bug #36580)
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/ps/functions/ps-add-note.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/ps/functions/ps-add-note.xml
diff -u phpdoc/en/reference/ps/functions/ps-add-note.xml:1.5
phpdoc/en/reference/ps/functions/ps-add-note.xml:1.6
--- phpdoc/en/reference/ps/functions/ps-add-note.xml:1.5 Fri Mar 3
12:31:04 2006
+++ phpdoc/en/reference/ps/functions/ps-add-note.xml Fri Mar 3 12:42:34 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
<refentry id="function.ps-add-note">
<refnamediv>
@@ -23,16 +23,10 @@
</methodsynopsis>
<para>
Adds a note at a certain position on the page. Notes are like little
-<<<<<<< ps-add-note.xml
rectangular sheets with text on it, which can be placed anywhere on
a page. They
are shown either folded or unfolded. If unfolded, the specified icon
-=======
- rectangular sheets with text on it, which can be place somewhere on
- a page. The notes
- are shown either folded or unfolded. If unfolded the specified icon
->>>>>>> 1.4
- is used as placeholder.
+ is used as a placeholder.
</para>
<para>
The note will not be visible if the document is printed or viewed but
