summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.H.M. Dassen (Ray) <jdassen@src.gnome.org>2004-08-19 16:22:40 +0000
committerJ.H.M. Dassen (Ray) <jdassen@src.gnome.org>2004-08-19 16:22:40 +0000
commit41fa1c80d90182580fd09c769a5cbd8a979c8035 (patch)
treed1e1665f5bdc3d94796e83ddb09fd0c88df88a9e
parent0eaa1d2a3964340c521238197728835e3f77978b (diff)
downloadgconf-41fa1c80d90182580fd09c769a5cbd8a979c8035.tar.gz
Backport from HEAD: Add FAQ and DTD to distribution
-rw-r--r--ChangeLog5
-rw-r--r--doc/Makefile.am3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f928390..40655ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-19 J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+ Backport from HEAD:
+ * doc/Makefile.am: Add FAQ and DTD to distribution.
+
2004-08-10 Mark McLoughlin <mark@skynet.ie>
* gconf/gconftool.c: (main): set the umask for
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a46b96da..89dd7f9a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,4 +8,5 @@ man_MANS = gconftool-2.1
EXTRA_DIST = \
$(SchemasDTD_DATA) \
- $(man_MANS)
+ $(man_MANS) \
+ FAQ.txt gconf-1.0.dtd