Changeset 31445 for trunk/doc-new


Ignore:
Timestamp:
Nov 24, 2007, 11:51:47 AM (12 years ago)
Author:
simon@…
Message:

doc-new: Merge changes from branches/simon-doc-test/doc-new 31176:31436. Thanks to Ryan Schmidt for his help.

Location:
trunk/doc-new
Files:
4 deleted
3 edited
5 copied

Legend:

Unmodified
Added
Removed
  • trunk/doc-new/Makefile

    r30920 r31445  
    44
    55# If your macports isn't installed in /opt/local you have to change PREFIX
    6 # here and update resources/macports.xsl to use your port installation!
     6# here and update man/resources/macports.xsl to use your port installation!
    77
    88
     
    1313GUIDE ?= guide
    1414MAN   ?= man
     15# source directories:
     16GUIDE-SRC ?= $(GUIDE)/xml
     17MAN-SRC   ?= $(MAN)/xml
    1518# result directories:
    1619GUIDE-RESULT ?= $(GUIDE)/html
    1720MAN-RESULT   ?= $(MAN)/man/
     21# man temporary directory:
     22MAN-TMP ?= $(MAN)/tmp
    1823
    1924# path to the docbook xsl files:
     
    4247        cp $(GUIDE)/resources/images/* $(GUIDE-RESULT)/
    4348        xsltproc --xinclude $(STRINGPARAMS) --output $(GUIDE-RESULT)/guide.html \
    44             $(GUIDE-XSL) $(GUIDE)/xml/guide.xml
     49            $(GUIDE-XSL) $(GUIDE-SRC)/guide.xml
    4550
    4651man:
    4752        mkdir -p $(MAN-RESULT)
    48         xsltproc --output $(MAN-RESULT) $(MAN-XSL) \
    49             $(MAN)/xml/portfile.7.xml \
    50             $(MAN)/xml/portfile-global.7.xml \
    51             $(MAN)/xml/portfile-phase.7.xml \
    52             $(MAN)/xml/portfile-startupitem.7.xml \
    53             $(MAN)/xml/portfile-tcl.7.xml \
    54             $(MAN)/xml/portgroup.7.xml \
    55             $(MAN)/xml/porthier.7.xml
     53        mkdir -p $(MAN-TMP)
     54        cp $(GUIDE-SRC)/portfile-*.xml $(MAN-TMP)
     55        sed -i "" 's|<section>|<refsection\>|g' $(MAN-TMP)/*
     56        sed -i "" 's|</section>|</refsection>|g' $(MAN-TMP)/*
     57        xsltproc --xinclude --output $(MAN-RESULT) $(MAN-XSL) \
     58            $(MAN-SRC)/portfile.7.xml \
     59            $(MAN-SRC)/portgroup.7.xml \
     60            $(MAN-SRC)/porthier.7.xml
     61        rm -r $(MAN-TMP)
    5662
    5763clean:
  • trunk/doc-new/guide/xml/portfileref.xml

    r30919 r31445  
    99  Tcl extensions.</para>
    1010
    11   <section id="reference.portfile">
    12     <title>Portfile</title>
    13 
    14     <xi:include href="../../man/xml/portfile.7.xml"
    15                 xmlns:xi="http://www.w3.org/2001/XInclude" />
    16   </section>
    17 
    18   <section id="reference.portfile.global">
    19     <title>Portfile Global</title>
    20 
    21     <xi:include href="../../man/xml/portfile-global.7.xml"
    22                 xmlns:xi="http://www.w3.org/2001/XInclude" />
    23   </section>
    24 
    25   <section id="reference.phase">
    26     <title>Portfile Phase</title>
    27 
    28     <xi:include href="../../man/xml/portfile-phase.7.xml"
    29                 xmlns:xi="http://www.w3.org/2001/XInclude" />
    30   </section>
    31 
    32   <section id="reference.startupitem">
    33     <title>Portfile Startupitem</title>
    34 
    35     <xi:include href="../../man/xml/portfile-startupitem.7.xml"
    36                 xmlns:xi="http://www.w3.org/2001/XInclude" />
    37   </section>
    38 
    39   <section id="reference.tcl">
    40     <title>Portfile Tcl</title>
    41 
    42     <xi:include href="../../man/xml/portfile-tcl.7.xml"
    43                 xmlns:xi="http://www.w3.org/2001/XInclude" />
    44   </section>
     11  <xi:include href="portfile-global-variables.7.xml"
     12              xmlns:xi="http://www.w3.org/2001/XInclude" />
     13
     14  <xi:include href="portfile-global-keywords.7.xml"
     15              xmlns:xi="http://www.w3.org/2001/XInclude" />
     16
     17  <xi:include href="portfile-phase.7.xml"
     18              xmlns:xi="http://www.w3.org/2001/XInclude" />
     19
     20  <xi:include href="portfile-startupitem.7.xml"
     21              xmlns:xi="http://www.w3.org/2001/XInclude" />
     22
     23  <xi:include href="portfile-tcl.7.xml"
     24              xmlns:xi="http://www.w3.org/2001/XInclude" />
     25
    4526
    4627  <section id="reference.portgroup">
  • trunk/doc-new/man/xml/portfile.7.xml

    r30445 r31445  
    2828  </refsection>
    2929
    30   <refsection>
    31     <title>Portfile man pages</title>
     30  <xi:include href="../tmp/portfile-global-variables.7.xml"
     31              xmlns:xi="http://www.w3.org/2001/XInclude" />
    3232
    33     <para>The Portfile man pages serve as a reference for all available
    34     Portfile keywords, variables, StartupItems, and Tcl extensions. This
    35     content is contained in four Portfile man pages:</para>
     33  <xi:include href="../tmp/portfile-global-keywords.7.xml"
     34              xmlns:xi="http://www.w3.org/2001/XInclude" />
    3635
    37     <para><citerefentry>
    38         <refentrytitle>portfile-global</refentrytitle>
     36  <xi:include href="../tmp/portfile-phase.7.xml"
     37              xmlns:xi="http://www.w3.org/2001/XInclude" />
    3938
    40         <manvolnum>7</manvolnum>
    41       </citerefentry>, <citerefentry>
    42         <refentrytitle>portfile-phase</refentrytitle>
     39  <xi:include href="../tmp/portfile-startupitem.7.xml"
     40              xmlns:xi="http://www.w3.org/2001/XInclude" />
    4341
    44         <manvolnum>7</manvolnum>
    45       </citerefentry>, <citerefentry>
    46         <refentrytitle>portfile-startupitem</refentrytitle>
    47 
    48         <manvolnum>7</manvolnum>
    49       </citerefentry>, <citerefentry>
    50         <refentrytitle>portfile-tcl</refentrytitle>
    51 
    52         <manvolnum>7</manvolnum>
    53       </citerefentry></para>
    54   </refsection>
     42  <xi:include href="../tmp/portfile-tcl.7.xml"
     43              xmlns:xi="http://www.w3.org/2001/XInclude" />
    5544
    5645  <refsection>
Note: See TracChangeset for help on using the changeset viewer.