diff options
| author | Warren Young <warren@etr-usa.com> | 2013-05-06 21:20:41 +0000 |
|---|---|---|
| committer | Warren Young <warren@etr-usa.com> | 2013-05-06 21:20:41 +0000 |
| commit | 170c43cf3f18516849bb89703b1ad97444a20f27 (patch) | |
| tree | 17cc6604a0789c4750125d82c7bdec0deb802362 | |
| parent | c679469487593e214b3496eb8428c08a32ca30df (diff) | |
| download | cygnal-170c43cf3f18516849bb89703b1ad97444a20f27.tar.gz cygnal-170c43cf3f18516849bb89703b1ad97444a20f27.tar.bz2 cygnal-170c43cf3f18516849bb89703b1ad97444a20f27.zip | |
Reverted XInclude in cygwin-api.in.xml from an XInclude to a DOCTOOL
include. You can't mix the two fragment inclusion mechanisms within
a single document because of the way it interacts with autoconf "build
in separate tree" mechanism. Either work separately, but they fail when
you try to use them together due to the way doctool chooses output
directories for its generated files.
| -rw-r--r-- | winsup/doc/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/doc/cygwin-api.in.xml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index acd6b0a8f..98000d034 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,9 @@ +2013-05-06 Warren Young <warren@etr-usa.com> + + * cygwin-api.in.xml (bookinfo): Reverted XInclude for legal.xml + fragment to a DOCTOOL include. + + 2013-05-03 Christopher Faylor <me.cygwin2013@cgf.cx> * Makefile (FAQ_SOURCES): Use wildcard function to find sources in @@ -6,7 +12,7 @@ 2013-05-01 Warren Young <warren@etr-usa.com> * bodysnatcher.pl: Created - * Makefile.in (faq/faq.body): Added target to create this file from + * Mak6file.in (faq/faq.body): Added target to create this file from faq/faq.html using new bodysnatcher.pl script. 2013-05-01 Warren Young <warren@etr-usa.com> diff --git a/winsup/doc/cygwin-api.in.xml b/winsup/doc/cygwin-api.in.xml index 726798ef2..3fee468dc 100644 --- a/winsup/doc/cygwin-api.in.xml +++ b/winsup/doc/cygwin-api.in.xml @@ -7,7 +7,7 @@ <bookinfo> <date>1998-08-31</date> <title>Cygwin API Reference</title> - <xi:include href="legal.xml"/> +DOCTOOL-INSERT-legal </bookinfo> <toc></toc> |