summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2007-08-31 13:28:02 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2007-08-31 13:28:02 +0000
commitafeae4b78f4000411132d88faa65b66c3849d355 (patch)
tree93db57570f1c1635e1fe792fd57046798d347638 /docs
parent515b142b2ade6ba0c97f42cf17f0b5880306e613 (diff)
downloadgdm-afeae4b78f4000411132d88faa65b66c3849d355.tar.gz
Sync with trunk. Patch from Brian Cameron <brian.cameron@sun.com>
2007-08-31 William Jon McCann <mccann@jhu.edu> * Makefile.am: Sync with trunk. Patch from Brian Cameron <brian.cameron@sun.com> svn path=/branches/mccann-gobject/; revision=5208
Diffstat (limited to 'docs')
-rw-r--r--docs/ChangeLog8
-rw-r--r--docs/Makefile.am13
2 files changed, 10 insertions, 11 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 1df5a3cd..72c7f741 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-31 William Jon McCann <mccann@jhu.edu>
+
+ * Makefile.am:
+ Sync with trunk.
+ Patch from Brian Cameron <brian.cameron@sun.com>
+
2007-05-04 Frederic Crozat <fcrozat@mandriva.com>
* C/gdm.xml:
@@ -15,8 +21,6 @@
2007-03-26 William Jon McCann <mccann@jhu.edu>
- reviewed by: <delete if not using a buddy>
-
* C/gdm.xml:
2007-03-11 Daniel Nylander <po@danielnylander.se>
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f619e57c..0c1d53d8 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,15 +2,10 @@ include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
DOC_MODULE = gdm
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml
-
-DOC_LINGUAS = es ko uk
-
-# Translations need migration to use gnome-doc-utils.
-# See page http://live.gnome.org/GnomeDocUtilsTranslationMigration
-SUBDIRS = . de es fr it ja zh_CN zh_HK zh_TW
+DOC_ENTITIES = legal.xml
+DOC_INCLUDES =
+DOC_LINGUAS = en_GB es fr ko oc sv uk
+# de it ja zh_CN zh_HK zh_TW need to be transitioned to gnome-doc-utils
man_MANS = gdm.1
-
EXTRA_DIST = gdm.1