From 7478ca6e1437301482578bfcfa168fa6ace45bb5 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 13 Jan 2014 23:20:08 -0600 Subject: [PATCH] Fix help handbook, man page, and location of html doc files. --- data/Makefile.am | 1 + data/doc/Makefile.am | 3 +++ {doc/en => data/doc}/compilation.html | 0 {doc/en => data/doc}/credits.html | 0 {doc/en => data/doc}/dirmerge.html | 0 {doc/en => data/doc}/dirmergeoptions.html | 0 {doc/en => data/doc}/dirmergevisible.html | 0 {doc/en => data/doc}/documentation.html | 0 {doc/en => data/doc}/dothemerge.html | 0 {doc/en => data/doc}/faq.html | 0 {doc/en => data/doc}/features.html | 0 {doc/en => data/doc}/find.html | 0 {doc/en => data/doc}/index.html | 0 {doc/en => data/doc}/installation.html | 0 {doc/en => data/doc}/interpretinginformation.html | 0 {doc/en => data/doc}/introduction.html | 0 {doc/en => data/doc}/kpart.html | 0 {doc/en => data/doc}/merging.html | 0 {doc/en => data/doc}/misc.html | 0 {doc/en => data/doc}/navigation.html | 0 {doc/en => data/doc}/opendialog.html | 0 {doc/en => data/doc}/options.html | 0 {doc/en => data/doc}/other.html | 0 {doc/en => data/doc}/pasteinput.html | 0 {doc/en => data/doc}/preprocessors.html | 0 {doc/en => data/doc}/printing.html | 0 {doc/en => data/doc}/requirements.html | 0 {doc/en => data/doc}/saving.html | 0 {doc/en => data/doc}/screenshots.html | 0 {doc/en => data/doc}/selections.html | 0 {doc/en => data/doc}/startingdirmerge.html | 0 doc/en/Makefile.am | 3 --- man/Makefile.am | 2 ++ {doc/en => man}/kdiff3.1 | 0 34 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/doc/Makefile.am rename {doc/en => data/doc}/compilation.html (100%) rename {doc/en => data/doc}/credits.html (100%) rename {doc/en => data/doc}/dirmerge.html (100%) rename {doc/en => data/doc}/dirmergeoptions.html (100%) rename {doc/en => data/doc}/dirmergevisible.html (100%) rename {doc/en => data/doc}/documentation.html (100%) rename {doc/en => data/doc}/dothemerge.html (100%) rename {doc/en => data/doc}/faq.html (100%) rename {doc/en => data/doc}/features.html (100%) rename {doc/en => data/doc}/find.html (100%) rename {doc/en => data/doc}/index.html (100%) rename {doc/en => data/doc}/installation.html (100%) rename {doc/en => data/doc}/interpretinginformation.html (100%) rename {doc/en => data/doc}/introduction.html (100%) rename {doc/en => data/doc}/kpart.html (100%) rename {doc/en => data/doc}/merging.html (100%) rename {doc/en => data/doc}/misc.html (100%) rename {doc/en => data/doc}/navigation.html (100%) rename {doc/en => data/doc}/opendialog.html (100%) rename {doc/en => data/doc}/options.html (100%) rename {doc/en => data/doc}/other.html (100%) rename {doc/en => data/doc}/pasteinput.html (100%) rename {doc/en => data/doc}/preprocessors.html (100%) rename {doc/en => data/doc}/printing.html (100%) rename {doc/en => data/doc}/requirements.html (100%) rename {doc/en => data/doc}/saving.html (100%) rename {doc/en => data/doc}/screenshots.html (100%) rename {doc/en => data/doc}/selections.html (100%) rename {doc/en => data/doc}/startingdirmerge.html (100%) create mode 100644 man/Makefile.am rename {doc/en => man}/kdiff3.1 (100%) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..d082367 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = doc diff --git a/data/doc/Makefile.am b/data/doc/Makefile.am new file mode 100644 index 0000000..2a4b61b --- /dev/null +++ b/data/doc/Makefile.am @@ -0,0 +1,3 @@ +kdiff3dir = ${kde_datadir}/kdiff3/doc + +kdiff3_DATA = compilation.html credits.html dirmerge.html dirmergeoptions.html dirmergevisible.html documentation.html dothemerge.html faq.html features.html find.html index.html installation.html interpretinginformation.html introduction.html kpart.html merging.html misc.html navigation.html opendialog.html options.html other.html pasteinput.html preprocessors.html printing.html requirements.html saving.html screenshots.html selections.html startingdirmerge.html diff --git a/doc/en/compilation.html b/data/doc/compilation.html similarity index 100% rename from doc/en/compilation.html rename to data/doc/compilation.html diff --git a/doc/en/credits.html b/data/doc/credits.html similarity index 100% rename from doc/en/credits.html rename to data/doc/credits.html diff --git a/doc/en/dirmerge.html b/data/doc/dirmerge.html similarity index 100% rename from doc/en/dirmerge.html rename to data/doc/dirmerge.html diff --git a/doc/en/dirmergeoptions.html b/data/doc/dirmergeoptions.html similarity index 100% rename from doc/en/dirmergeoptions.html rename to data/doc/dirmergeoptions.html diff --git a/doc/en/dirmergevisible.html b/data/doc/dirmergevisible.html similarity index 100% rename from doc/en/dirmergevisible.html rename to data/doc/dirmergevisible.html diff --git a/doc/en/documentation.html b/data/doc/documentation.html similarity index 100% rename from doc/en/documentation.html rename to data/doc/documentation.html diff --git a/doc/en/dothemerge.html b/data/doc/dothemerge.html similarity index 100% rename from doc/en/dothemerge.html rename to data/doc/dothemerge.html diff --git a/doc/en/faq.html b/data/doc/faq.html similarity index 100% rename from doc/en/faq.html rename to data/doc/faq.html diff --git a/doc/en/features.html b/data/doc/features.html similarity index 100% rename from doc/en/features.html rename to data/doc/features.html diff --git a/doc/en/find.html b/data/doc/find.html similarity index 100% rename from doc/en/find.html rename to data/doc/find.html diff --git a/doc/en/index.html b/data/doc/index.html similarity index 100% rename from doc/en/index.html rename to data/doc/index.html diff --git a/doc/en/installation.html b/data/doc/installation.html similarity index 100% rename from doc/en/installation.html rename to data/doc/installation.html diff --git a/doc/en/interpretinginformation.html b/data/doc/interpretinginformation.html similarity index 100% rename from doc/en/interpretinginformation.html rename to data/doc/interpretinginformation.html diff --git a/doc/en/introduction.html b/data/doc/introduction.html similarity index 100% rename from doc/en/introduction.html rename to data/doc/introduction.html diff --git a/doc/en/kpart.html b/data/doc/kpart.html similarity index 100% rename from doc/en/kpart.html rename to data/doc/kpart.html diff --git a/doc/en/merging.html b/data/doc/merging.html similarity index 100% rename from doc/en/merging.html rename to data/doc/merging.html diff --git a/doc/en/misc.html b/data/doc/misc.html similarity index 100% rename from doc/en/misc.html rename to data/doc/misc.html diff --git a/doc/en/navigation.html b/data/doc/navigation.html similarity index 100% rename from doc/en/navigation.html rename to data/doc/navigation.html diff --git a/doc/en/opendialog.html b/data/doc/opendialog.html similarity index 100% rename from doc/en/opendialog.html rename to data/doc/opendialog.html diff --git a/doc/en/options.html b/data/doc/options.html similarity index 100% rename from doc/en/options.html rename to data/doc/options.html diff --git a/doc/en/other.html b/data/doc/other.html similarity index 100% rename from doc/en/other.html rename to data/doc/other.html diff --git a/doc/en/pasteinput.html b/data/doc/pasteinput.html similarity index 100% rename from doc/en/pasteinput.html rename to data/doc/pasteinput.html diff --git a/doc/en/preprocessors.html b/data/doc/preprocessors.html similarity index 100% rename from doc/en/preprocessors.html rename to data/doc/preprocessors.html diff --git a/doc/en/printing.html b/data/doc/printing.html similarity index 100% rename from doc/en/printing.html rename to data/doc/printing.html diff --git a/doc/en/requirements.html b/data/doc/requirements.html similarity index 100% rename from doc/en/requirements.html rename to data/doc/requirements.html diff --git a/doc/en/saving.html b/data/doc/saving.html similarity index 100% rename from doc/en/saving.html rename to data/doc/saving.html diff --git a/doc/en/screenshots.html b/data/doc/screenshots.html similarity index 100% rename from doc/en/screenshots.html rename to data/doc/screenshots.html diff --git a/doc/en/selections.html b/data/doc/selections.html similarity index 100% rename from doc/en/selections.html rename to data/doc/selections.html diff --git a/doc/en/startingdirmerge.html b/data/doc/startingdirmerge.html similarity index 100% rename from doc/en/startingdirmerge.html rename to data/doc/startingdirmerge.html diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index cd97965..fc2671d 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,5 +1,2 @@ KDE_DOCS = kdiff3 KDE_LANG = en -man1_MANS=kdiff3.1 - - diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..0cb1466 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,2 @@ +man_MANS = kdiff3.1 +EXTRA_DIST = $(man_MANS) diff --git a/doc/en/kdiff3.1 b/man/kdiff3.1 similarity index 100% rename from doc/en/kdiff3.1 rename to man/kdiff3.1