diff options
author | Matthias Clasen <mclasen@redhat.com> | 2016-10-07 06:19:07 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2016-10-07 10:34:50 -0400 |
commit | bbe5980c5412337687cac8d648d5ad069086ccae (patch) | |
tree | 2f6bd3c1a64a89bfde90730c86a5bebf2833b345 /docs | |
parent | b337b405a35b7457850fce5b76a9446c4386d403 (diff) | |
download | gtk+-bbe5980c5412337687cac8d648d5ad069086ccae.tar.gz |
Make docs parallel installable
This addresses gdk and gtk docs.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/reference/gdk/Makefile.am | 4 | ||||
-rw-r--r-- | docs/reference/gdk/gdk-docs.sgml | 2 | ||||
-rw-r--r-- | docs/reference/gdk/gdk4-sections.txt (renamed from docs/reference/gdk/gdk3-sections.txt) | 0 | ||||
-rw-r--r-- | docs/reference/gdk/gdk4.types (renamed from docs/reference/gdk/gdk3.types) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/Makefile.am | 28 | ||||
-rw-r--r-- | docs/reference/gtk/gtk-docs.sgml | 20 | ||||
-rw-r--r-- | docs/reference/gtk/gtk-query-immodules-4.0.xml (renamed from docs/reference/gtk/gtk-query-immodules-3.0.xml) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-demo-application.xml (renamed from docs/reference/gtk/gtk3-demo-application.xml) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-demo.xml (renamed from docs/reference/gtk/gtk3-demo.xml) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-icon-browser.xml (renamed from docs/reference/gtk/gtk3-icon-browser.xml) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-sections.txt (renamed from docs/reference/gtk/gtk3-sections.txt) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-widget-factory.xml (renamed from docs/reference/gtk/gtk3-widget-factory.xml) | 0 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4.types.in (renamed from docs/reference/gtk/gtk3.types.in) | 0 | ||||
-rw-r--r-- | docs/reference/libgail-util/Makefile.am | 4 | ||||
-rw-r--r-- | docs/reference/libgail-util/gail-libgail-util3.types | 0 | ||||
-rw-r--r-- | docs/reference/libgail-util/gail-libgail-util4-sections.txt (renamed from docs/reference/libgail-util/gail-libgail-util3-sections.txt) | 0 |
16 files changed, 29 insertions, 29 deletions
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index d86a188784..4e62ea38eb 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.6 # The name of the module. -DOC_MODULE=gdk3 +DOC_MODULE=gdk4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gdk-docs.sgml @@ -61,7 +61,7 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS) +GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-4.la $(GDK_DEP_LIBS) # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS=--output-format=xml --name-space=gdk diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index a34b30c155..19125711c1 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -6,7 +6,7 @@ ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>GDK 3 Reference Manual</title> + <title>GDK 4 Reference Manual</title> <releaseinfo> This document is for the GDK 3 library, version &version; The latest versions can be found online at diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk4-sections.txt index f26c22d3c6..f26c22d3c6 100644 --- a/docs/reference/gdk/gdk3-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt diff --git a/docs/reference/gdk/gdk3.types b/docs/reference/gdk/gdk4.types index 115f6e4bcf..115f6e4bcf 100644 --- a/docs/reference/gdk/gdk3.types +++ b/docs/reference/gdk/gdk4.types diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 5a88a12453..fc490cdc4b 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.6 # The name of the module. -DOC_MODULE=gtk3 +DOC_MODULE=gtk4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gtk-docs.sgml @@ -270,8 +270,8 @@ CPPFLAGS += \ -UGTK_DISABLE_SINGLE_INCLUDES GTKDOC_LIBS = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) @@ -291,14 +291,14 @@ content_files = \ drawing-model.xml \ getting_started.xml \ glossary.xml \ - gtk3-demo-application.xml \ - gtk3-demo.xml \ - gtk3-icon-browser.xml \ - gtk3-widget-factory.xml \ + gtk4-demo-application.xml \ + gtk4-demo.xml \ + gtk4-icon-browser.xml \ + gtk4-widget-factory.xml \ gtk-builder-tool.xml \ gtk-encode-symbolic-svg.xml \ gtk-launch.xml \ - gtk-query-immodules-3.0.xml \ + gtk-query-immodules-4.0.xml \ gtk-query-settings.xml \ gtk-update-icon-cache.xml \ input-handling.xml \ @@ -498,19 +498,19 @@ endif include $(top_srcdir)/gtk-doc.make # Other files to distribute -EXTRA_DIST += version.xml.in gtk3.types.in +EXTRA_DIST += version.xml.in gtk4.types.in ######################################################################## man_MANS = \ - gtk-query-immodules-3.0.1 \ + gtk-query-immodules-4.0.1 \ gtk-update-icon-cache.1 \ gtk-encode-symbolic-svg.1 \ gtk-launch.1 \ - gtk3-demo.1 \ - gtk3-demo-application.1 \ - gtk3-widget-factory.1 \ - gtk3-icon-browser.1 \ + gtk4-demo.1 \ + gtk4-demo-application.1 \ + gtk4-widget-factory.1 \ + gtk4-icon-browser.1 \ broadwayd.1 \ gtk-builder-tool.1 \ gtk-query-settings.1 diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 8c962aeb07..f0d89857a0 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -8,13 +8,13 @@ ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>GTK+ 3 Reference Manual</title> + <title>GTK+ 4 Reference Manual</title> <releaseinfo> - This document is for the GTK+ 3 library, version &version;. + This document is for the GTK+ 4 library, version &version;. The latest versions can be found online at - <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>. - If you are looking for the older GTK+ 2 series of libraries, - see <ulink role="online-location" url="http://developer.gnome.org/gtk2/">http://developer.gnome.org/gtk2/</ulink>. + <ulink role="online-location" url="http://developer.gnome.org/gtk4/">http://developer.gnome.org/gtk4/</ulink>. + If you are looking for the older GTK+ 3 series of libraries, + see <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>. </releaseinfo> </bookinfo> @@ -410,11 +410,11 @@ <part> <title>GTK+ Tools</title> - <xi:include href="gtk3-demo.xml" /> - <xi:include href="gtk3-demo-application.xml" /> - <xi:include href="gtk3-widget-factory.xml" /> - <xi:include href="gtk3-icon-browser.xml" /> - <xi:include href="gtk-query-immodules-3.0.xml" /> + <xi:include href="gtk4-demo.xml" /> + <xi:include href="gtk4-demo-application.xml" /> + <xi:include href="gtk4-widget-factory.xml" /> + <xi:include href="gtk4-icon-browser.xml" /> + <xi:include href="gtk-query-immodules-4.0.xml" /> <xi:include href="gtk-update-icon-cache.xml" /> <xi:include href="gtk-encode-symbolic-svg.xml" /> <xi:include href="gtk-builder-tool.xml" /> diff --git a/docs/reference/gtk/gtk-query-immodules-3.0.xml b/docs/reference/gtk/gtk-query-immodules-4.0.xml index 5ebaac7a81..5ebaac7a81 100644 --- a/docs/reference/gtk/gtk-query-immodules-3.0.xml +++ b/docs/reference/gtk/gtk-query-immodules-4.0.xml diff --git a/docs/reference/gtk/gtk3-demo-application.xml b/docs/reference/gtk/gtk4-demo-application.xml index 37b97fa0c4..37b97fa0c4 100644 --- a/docs/reference/gtk/gtk3-demo-application.xml +++ b/docs/reference/gtk/gtk4-demo-application.xml diff --git a/docs/reference/gtk/gtk3-demo.xml b/docs/reference/gtk/gtk4-demo.xml index d2eacb69b5..d2eacb69b5 100644 --- a/docs/reference/gtk/gtk3-demo.xml +++ b/docs/reference/gtk/gtk4-demo.xml diff --git a/docs/reference/gtk/gtk3-icon-browser.xml b/docs/reference/gtk/gtk4-icon-browser.xml index 6583f7d23e..6583f7d23e 100644 --- a/docs/reference/gtk/gtk3-icon-browser.xml +++ b/docs/reference/gtk/gtk4-icon-browser.xml diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk4-sections.txt index e6a4147d07..e6a4147d07 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt diff --git a/docs/reference/gtk/gtk3-widget-factory.xml b/docs/reference/gtk/gtk4-widget-factory.xml index fa5d21d9a2..fa5d21d9a2 100644 --- a/docs/reference/gtk/gtk3-widget-factory.xml +++ b/docs/reference/gtk/gtk4-widget-factory.xml diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk4.types.in index 9f7d51234e..9f7d51234e 100644 --- a/docs/reference/gtk/gtk3.types.in +++ b/docs/reference/gtk/gtk4.types.in diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am index 263471d9b8..35f073c785 100644 --- a/docs/reference/libgail-util/Makefile.am +++ b/docs/reference/libgail-util/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.7 # The name of the module. -DOC_MODULE=gail-libgail-util3 +DOC_MODULE=gail-libgail-util4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml @@ -22,7 +22,7 @@ AM_CPPFLAGS = \ -I$(top_builddir) \ $(DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-3.la +GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-4.la # gtkdoc-mkdb related varaibles MKDB_OPTIONS = diff --git a/docs/reference/libgail-util/gail-libgail-util3.types b/docs/reference/libgail-util/gail-libgail-util3.types deleted file mode 100644 index e69de29bb2..0000000000 --- a/docs/reference/libgail-util/gail-libgail-util3.types +++ /dev/null diff --git a/docs/reference/libgail-util/gail-libgail-util3-sections.txt b/docs/reference/libgail-util/gail-libgail-util4-sections.txt index 1ef8ad444a..1ef8ad444a 100644 --- a/docs/reference/libgail-util/gail-libgail-util3-sections.txt +++ b/docs/reference/libgail-util/gail-libgail-util4-sections.txt |