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

docs/ChangeLog

+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>

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