r1910 - in branches/1.1: . doc

[des at projects.linpro.no]

Author: des
Date: 2007-08-20 21:49:59 +0200 (Mon, 20 Aug 2007)
New Revision: 1910

Modified:
   branches/1.1/
   branches/1.1/doc/Makefile.am
Log:
Merged revisions 1909 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1909 | des | 2007-08-20 21:49:38 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Even more files...
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907,1909

Modified: branches/1.1/doc/Makefile.am
===================================================================
--- branches/1.1/doc/Makefile.am	2007-08-20 19:49:38 UTC (rev 1909)
+++ branches/1.1/doc/Makefile.am	2007-08-20 19:49:59 UTC (rev 1910)
@@ -5,9 +5,16 @@
 	changes-1.1.html \
 	changes-1.1.1.html
 
+XML = \
+	changes-1.0.3-1.0.4.xml \
+	changes-1.0.4-1.1.xml \
+	changes-1.1-1.1.1.xml \
+	${CHANGELOGS:.html=.xml}
+
 all: ${CHANGELOGS}
 
-EXTRA_DIST = ${CHANGELOGS} changes.css changes-html.xsl
+EXTRA_DIST = ${CHANGELOGS} ${XML} \
+	changes.css changes-html.xsl
 
 CLEANFILES = ${CHANGELOGS}
 
@@ -16,4 +23,4 @@
 .xml.html:
 	${XSLTPROC} --xinclude -o $@ $<
 
-${CHANGELOGS}:  changes-html.xsl
+${CHANGELOGS}: changes-html.xsl