[PHP-DEV] cvs: /phpdoc phpdoc.dcl /phpdoc Makefile.in /phpdoc/functions cpdf.sgml imap.sgml strings.sgml From: Stig Bakken (ssb <email protected>)
Date: 11/27/99

ssb Sat Nov 27 15:34:06 1999 EDT

  Added files:
    /phpdoc phpdoc.dcl

  Modified files:
    /phpdoc Makefile.in
    /phpdoc/functions cpdf.sgml imap.sgml strings.sgml
  Log:
  Validation fixes. Added a separate SGML declaration (phpdoc.dcl)
  to make sure we all use the same one.
  
  
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.20 phpdoc/Makefile.in:1.21
--- phpdoc/Makefile.in:1.20 Wed Sep 15 14:58:46 1999
+++ phpdoc/Makefile.in Sat Nov 27 15:34:04 1999
@@ -26,7 +26,7 @@
 # +----------------------------------------------------------------------+
 
 #
-# $Id: Makefile.in,v 1.20 1999/09/15 18:58:46 musone Exp $
+# $Id: Makefile.in,v 1.21 1999/11/27 20:34:04 ssb Exp $
 #
 
 VPATH= <email protected>@
@@ -208,7 +208,7 @@
         g++ -o makedoc makedoc.cc
 
 bigmanual.html: $(srcdir)/manual.sgml $(HTML_STYLESHEET)
- jade $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml $(srcdir)/manual.sgml > $@
+ jade $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml $(srcdir)/phpdoc.dcl $(srcdir)/manual.sgml > $@
 
 bigmanual.html.gz: bigmanual.html
         gzip -c $< > $@
@@ -221,15 +221,15 @@
 
 html/manual.html: $(srcdir)/manual.sgml $(HTML_STYLESHEET)
          <email protected> -d html || mkdir html
- jade $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/manual.sgml
+ jade $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdoc.dcl $(srcdir)/manual.sgml
 
 php/index.php: $(srcdir)/manual.sgml $(PHPWEB_STYLESHEET)
          <email protected> -d php || mkdir php
- -jade $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/manual.sgml
+ -jade $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdoc.dcl $(srcdir)/manual.sgml
 
 php3/manual.php3: $(srcdir)/manual.sgml $(PHPWEB_STYLESHEET)
          <email protected> -d php3 || mkdir php3
- -jade $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/manual.sgml
+ -jade $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdoc.dcl $(srcdir)/manual.sgml
 
 manual.txt: bigmanual.html
         lynx -nolist -dump file:`pwd`/bigmanual.html > manual.txt
@@ -244,7 +244,7 @@
         -rm -f $@ && (cd html; tar -cf - *.html) | gzip > manual.tar.gz
 
 howto.html: $(srcdir)/howto.sgml $(HOWTO_STYLESHEET) global.ent
- jade $(CATALOG) -d $(HOWTO_STYLESHEET) -t sgml $(srcdir)/howto.sgml
+ jade $(CATALOG) -d $(HOWTO_STYLESHEET) -t sgml $(srcdir)/phpdoc.dcl $(srcdir)/howto.sgml
 
 tex latex: $(srcdir)/manual.tex
 
@@ -253,10 +253,10 @@
 
 # General rules:
 .sgml.tex:
- jade $(CATALOG) -d $(PRINT_STYLESHEET) -t tex $<
+ jade $(CATALOG) -d $(PRINT_STYLESHEET) -t tex $(srcdir)/phpdoc.dcl $<
 
 .sgml.rtf:
- jade $(CATALOG) -d $(PRINT_STYLESHEET) -t rtf $<
+ jade $(CATALOG) -d $(PRINT_STYLESHEET) -t rtf $(srcdir)/phpdoc.dcl $<
 
 # runs three times -
 # 1. generates the dvi with a completely bogus table of contents
@@ -275,7 +275,7 @@
         ps2pdf -p $@ $<
 
 test: manual.sgml
- nsgmls -s $<
+ nsgmls -s $(srcdir)/phpdoc.dcl $<
 
 clean:
         ( \
Index: phpdoc/functions/cpdf.sgml
diff -u phpdoc/functions/cpdf.sgml:1.12 phpdoc/functions/cpdf.sgml:1.13
--- phpdoc/functions/cpdf.sgml:1.12 Thu Nov 25 02:00:23 1999
+++ phpdoc/functions/cpdf.sgml Sat Nov 27 15:34:05 1999
@@ -36,10 +36,10 @@
     the next releases (current version when this was written is 1.10).
     If you need this functionality use the pdflib module.</simpara>
 
- <note><simppara>
+ <note><simpara>
     The function <function>cpdf_set_font</function> has changed since PHP3
     to support asian fonts. The encoding parameter is no longer an integer
- but a string.</simppara></note>
+ but a string.</simpara></note>
 
    <simpara>
     One big advantage of ClibPDF over pdflib is the possibility to create
Index: phpdoc/functions/imap.sgml
diff -u phpdoc/functions/imap.sgml:1.11 phpdoc/functions/imap.sgml:1.12
--- phpdoc/functions/imap.sgml:1.11 Fri Nov 26 12:12:49 1999
+++ phpdoc/functions/imap.sgml Sat Nov 27 15:34:05 1999
@@ -396,7 +396,6 @@
       </tgroup>
      </table>
     </para>
- <para>
    </refsect1>
   </refentry>
 
Index: phpdoc/functions/strings.sgml
diff -u phpdoc/functions/strings.sgml:1.28 phpdoc/functions/strings.sgml:1.29
--- phpdoc/functions/strings.sgml:1.28 Mon Nov 22 14:24:09 1999
+++ phpdoc/functions/strings.sgml Sat Nov 27 15:34:05 1999
@@ -1873,6 +1873,7 @@
      string. <function>strtr</function> will always look for the
      longest possible match first and will *NOT* try to replace stuff
      that it has already worked on.
+ </para>
     <para>
      Examples:
      <informalexample> 

-- 
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: php-dev-unsubscribe <email protected>
For additional commands, e-mail: php-dev-help <email protected>
To contact the list administrators, e-mail: php-list-admin <email protected>