diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.in | 39 | ||||
| -rw-r--r-- | gnome2-accessibility-guide/C/dtconfig.xml | 4 | ||||
| -rw-r--r-- | gnome2-accessibility-guide/C/gnome-access-guide.xml | 4 | ||||
| -rw-r--r-- | gnome2-accessibility-guide/Makefile.am | 15 | ||||
| -rw-r--r-- | gnome2-system-admin-guide/C/system-admin-guide.xml | 3 | ||||
| -rw-r--r-- | gnome2-system-admin-guide/Makefile.am | 21 | ||||
| -rw-r--r-- | gnome2-user-guide/C/user-guide.xml | 4 | ||||
| -rw-r--r-- | gnome2-user-guide/Makefile.am | 17 |
10 files changed, 83 insertions, 49 deletions
@@ -1,3 +1,16 @@ +2006-02-18 Shaun McCance <shaunm@gnome.org> + + * Makefile.am: + * configure.in: + * gnome2-accessibility-guide/Makefile.am: + * gnome2-accessibility-guide/C/dtconfig.xml: + * gnome2-accessibility-guide/C/gnome-access-guide.xml: + * gnome2-system-admin-guide/Makefile.am: + * gnome2-system-admin-guide/C/system-admin-guide.xml: + * gnome2-user-guide/Makefile.am: + * gnome2-user-guide/C/user-guide.xml: + - Converting to gnome-doc-utils + 2006-02-12 Brent Smith <gnome@nextreality.net> * gnome2-accessibility-guide/C/ChangeLog: diff --git a/Makefile.am b/Makefile.am index db6260e..793e43d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ -SUBDIRS = \ - gnome2-user-guide \ - gnome2-accessibility-guide \ +SUBDIRS = \ + gnome2-user-guide \ + gnome2-accessibility-guide \ gnome2-system-admin-guide -EXTRA_DIST = gnome-user-docs.spec COPYING-DOCS xmldocs.make omf.make +EXTRA_DIST = COPYING-DOCS gnome-doc-utils.make + +DISTCLEANFILES = gnome-doc-utils.make + +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --git a/configure.in b/configure.in index d6d25d7..05c09a6 100644 --- a/configure.in +++ b/configure.in @@ -1,46 +1,17 @@ -AC_INIT(gnome2-user-guide) +AC_INIT([gnome2-user-docs], [2.8.1], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs]) +AM_INIT_AUTOMAKE -SCROLLKEEPER_REQUIRED=0.3.11 -AC_SUBST(SCROLLKEEPER_REQUIRED) - -AM_INIT_AUTOMAKE(gnome2-user-docs, 2.8.1) +GNOME_DOC_INIT AM_MAINTAINER_MODE -dnl ==================================== -dnl = Begin tests for scrollkeeper -dnl ==================================== -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga) -fi -dnl ==================================== -dnl = End tests for scrollkeeper -dnl ==================================== - -dnl ==================================== -dnl = Test whether jw is installed -dnl ==================================== -AC_PATH_PROG(JW,jw,no) -if test x$JW = xno; then - HAVE_JW="no" -else - HAVE_JW="yes" -fi -AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") -AC_SUBST(HAVE_JW) -dnl ==================================== -dnl = End tests for jw -dnl ==================================== - +PKG_CHECK_MODULES(GNOME2_USER_DOCS, [ gnome-doc-utils >= 0.5.6 ]) AC_OUTPUT([ Makefile gnome-user-docs.spec gnome2-user-guide/Makefile -gnome2-user-guide/C/Makefile gnome2-accessibility-guide/Makefile -gnome2-accessibility-guide/C/Makefile gnome2-system-admin-guide/Makefile -gnome2-system-admin-guide/C/Makefile ]) diff --git a/gnome2-accessibility-guide/C/dtconfig.xml b/gnome2-accessibility-guide/C/dtconfig.xml index 783f816..e4d8566 100644 --- a/gnome2-accessibility-guide/C/dtconfig.xml +++ b/gnome2-accessibility-guide/C/dtconfig.xml @@ -369,7 +369,7 @@ following functions:</para> </row> <row> <entry colname="colspec0" valign="top"> -<para>−</para> +<para>-</para> </entry> <entry colname="colspec1" valign="top"> <para>Tertiary mouse button</para> @@ -381,7 +381,7 @@ following functions:</para> <para>The toggle mouse button key enable the currently selected mouse button until the <guilabel>Mouse button click</guilabel> key is pressed. This allows you to perform drag and drop operations.</para> -<para>The <guilabel>Mouse button click</guilabel> emulates the currently selected mouse button. Pressing <keycap>/</keycap>, <keycap>*</keycap> or <keycap>−</keycap> will change the behaviour of this. The currently selected mouse button can be seen in the <application>Keyboard Accessibility Status</application> panel application, discussed in <xref linkend="dtconfig-21"/>.</para> +<para>The <guilabel>Mouse button click</guilabel> emulates the currently selected mouse button. Pressing <keycap>/</keycap>, <keycap>*</keycap> or <keycap>-</keycap> will change the behaviour of this. The currently selected mouse button can be seen in the <application>Keyboard Accessibility Status</application> panel application, discussed in <xref linkend="dtconfig-21"/>.</para> <note> <para>The <guilabel>Primary mouse button</guilabel> is the left mouse button for right handed people. The <guilabel>Secondary mouse button</guilabel> is the right mouse button and the <guilabel>Tertiary mouse button</guilabel> is the middle mouse button.</para> diff --git a/gnome2-accessibility-guide/C/gnome-access-guide.xml b/gnome2-accessibility-guide/C/gnome-access-guide.xml index 7231fbf..06a0d56 100644 --- a/gnome2-accessibility-guide/C/gnome-access-guide.xml +++ b/gnome2-accessibility-guide/C/gnome-access-guide.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ <!ENTITY gnomeversion "2.14"> <!ENTITY manrevision "2.14.0"> @@ -37,7 +37,7 @@ <holder>ME-THE-TRANSLATOR (Latin translation)</holder> </copyright> --> - <publisher> + <publisher role="maintainer"> <publishername>GNOME Documentation Project</publishername> </publisher> &LEGAL; diff --git a/gnome2-accessibility-guide/Makefile.am b/gnome2-accessibility-guide/Makefile.am index 1487d19..3958687 100644 --- a/gnome2-accessibility-guide/Makefile.am +++ b/gnome2-accessibility-guide/Makefile.am @@ -1,2 +1,15 @@ -SUBDIRS = C +include $(top_srcdir)/gnome-doc-utils.make +dist-hook: doc-dist-hook +DOC_MODULE = gnome-access-guide +DOC_ENTITIES = \ + accessintro.xml \ + ats.xml \ + dtconfig.xml \ + keynav.xml \ + preface.xml \ + sysadmin.xml \ + themes.xml \ + legal.xml + +DOC_LINGUAS = diff --git a/gnome2-system-admin-guide/C/system-admin-guide.xml b/gnome2-system-admin-guide/C/system-admin-guide.xml index 4a986ea..f543262 100644 --- a/gnome2-system-admin-guide/C/system-admin-guide.xml +++ b/gnome2-system-admin-guide/C/system-admin-guide.xml @@ -10,7 +10,6 @@ <!ENTITY themes SYSTEM "themes.xml"> <!ENTITY fontconfig SYSTEM "fontconfig.xml"> <!ENTITY mimetypes SYSTEM "mimetypes.xml"> - <!ENTITY gdm SYSTEM "gdm.xml"> <!ENTITY screensavers SYSTEM "screensavers.xml"> <!ENTITY sessions SYSTEM "sessions.xml"> <!ENTITY help SYSTEM "help.xml"> @@ -42,7 +41,7 @@ <holder>ME-THE-TRANSLATOR (Latin translation)</holder> </copyright> --> - <publisher> + <publisher role="maintainer"> <publishername> GNOME Documentation Project </publishername> </publisher> &LEGAL; diff --git a/gnome2-system-admin-guide/Makefile.am b/gnome2-system-admin-guide/Makefile.am index 1487d19..df1b864 100644 --- a/gnome2-system-admin-guide/Makefile.am +++ b/gnome2-system-admin-guide/Makefile.am @@ -1,2 +1,21 @@ -SUBDIRS = C +include $(top_srcdir)/gnome-doc-utils.make +dist-hook: doc-dist-hook +DOC_MODULE = system-admin-guide +DOC_ENTITIES = \ + appendixa.xml \ + appendixb.xml \ + fontconfig.xml \ + gconf.xml \ + glossary.xml \ + help.xml \ + lockdown.xml \ + menustructure.xml \ + mimetypes.xml \ + performance.xml \ + screensavers.xml \ + sessions.xml \ + themes.xml \ + legal.xml + +DOC_LINGUAS = diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml index fd0224f..569a287 100644 --- a/gnome2-user-guide/C/user-guide.xml +++ b/gnome2-user-guide/C/user-guide.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?><!-- -*- indent-tabs-mode: nil -*- --> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ <!ENTITY gnomeversion "2.14"> <!ENTITY manrevision "2.14.0"> @@ -42,7 +42,7 @@ <holder>ME-THE-TRANSLATOR (Latin translation)</holder> </copyright> --> - <publisher> + <publisher role="maintainer"> <publishername>GNOME Documentation Project</publishername> </publisher> diff --git a/gnome2-user-guide/Makefile.am b/gnome2-user-guide/Makefile.am index 1487d19..96732b9 100644 --- a/gnome2-user-guide/Makefile.am +++ b/gnome2-user-guide/Makefile.am @@ -1,2 +1,17 @@ -SUBDIRS = C +include $(top_srcdir)/gnome-doc-utils.make +dist-hook: doc-dist-hook +DOC_MODULE = user-guide +DOC_ENTITIES = \ + glossary.xml \ + gosbasic.xml \ + goscustdesk.xml \ + goseditmainmenu.xml \ + gosnautilus.xml \ + gosoverview.xml \ + gospanel.xml \ + gosstartsession.xml \ + gostools.xml \ + legal.xml + +DOC_LINGUAS = |