diff --git a/ChangeLog b/ChangeLog index 763235d4ad..fc3e4958b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2002-10-28 Chris Lyttle + + * src/scm/help-topics-index.old: Moved old file to here for now + * src/scm/help-topics-index.scm: deleted the junk and put temp in + * doc/sgml/C/topic.dat: add help topic + * doc/sgml/C/Makefile.am: delete bunch of crud, add new crud yippie + * doc/sgml/Makefile.am: remove translations of docs + * doc/Makefile.am: remove html dir + * doc/sgml/C/guide.sgml: temp placeholder for new help + * doc/sgml/C/help.sgml: temp placeholder for new help + * configure.in: remove translated doc dirs from makefiles + 2002-10-28 David Hampton * src/gnome-utils/gnc-html.c: diff --git a/configure.in b/configure.in index fbd3c7276b..edf8ee978c 100644 --- a/configure.in +++ b/configure.in @@ -901,16 +901,8 @@ AC_OUTPUT( m4/Makefile intl/Makefile debian/Makefile doc/Makefile doc/examples/Makefile - doc/html/Makefile - doc/html/C/Makefile - doc/html/fr/Makefile - doc/html/fr/image/Makefile doc/sgml/Makefile doc/sgml/C/Makefile - doc/sgml/C/image/Makefile - doc/sgml/de_DE/Makefile - doc/sgml/es/Makefile - doc/sgml/pt_PT/Makefile doc-tools/Makefile intl-scm/Makefile lib/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index d7638ecd68..64e1e748f9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ docdir = ${GNC_DOC_INSTALL_DIR} -SUBDIRS = examples html sgml +SUBDIRS = examples sgml doc_DATA = \ README.francais \ diff --git a/doc/sgml/C/Makefile.am b/doc/sgml/C/Makefile.am index a86f027840..a6b7c2622a 100644 --- a/doc/sgml/C/Makefile.am +++ b/doc/sgml/C/Makefile.am @@ -1,95 +1,35 @@ -SUBDIRS = image +SUBDIRS = gnucash_helpdir = $(GNC_HELPDIR)/C GNUCASH_SGML_FILES = \ - bofa-mym.sgml \ - gnucash.sgml \ - xacc-about.sgml \ - xacc-accountedit.sgml \ - xacc-acctypes.sgml \ - xacc-account-hierarchy-creator.sgml \ - xacc-account-summary.sgml \ - xacc-apar.sgml \ - xacc-asset-liability-barcharts.sgml \ - xacc-asset-liability-piecharts.sgml \ - xacc-balancereport.sgml \ - xacc-balancesheet.sgml \ - xacc-calculator.sgml \ - xacc-chartofaccts.sgml \ - xacc-commodity.sgml \ - xacc-common-report-options.sgml \ - xacc-currencyhandling.sgml \ - xacc-dateinput.sgml \ - xacc-depreciation.sgml \ - xacc-dochack.sgml \ - xacc-doubleentry.sgml \ - xacc-euro.sgml \ - xacc-features.sgml \ - xacc-file-operations.sgml \ - xacc-gnome-mdi.sgml \ - xacc-gnucash-web-browser.sgml \ - xacc-gpl.sgml \ - xacc-incomeexpense.sgml \ - xacc-income-expense-barcharts.sgml \ - xacc-income-expense-piecharts.sgml \ - xacc-locatingtxns.sgml \ - xacc-mainwin.sgml \ - xacc-multicolumn-view-reports.sgml \ - xacc-net-worth-barchart.sgml \ - xacc-newacctwin.sgml \ - xacc-pnl.sgml \ - xacc-portfolio-report.sgml \ - xacc-price-editor.sgml \ - xacc-price-sources.sgml \ - xacc-preferences.sgml \ - xacc-print-check.sgml \ - xacc-print.sgml \ - xacc-qif-import.sgml \ - xacc-quicken.sgml \ - xacc-quickstart.sgml \ - xacc-recnwin.sgml \ - xacc-regwin-kbd.sgml \ - xacc-regwin.sgml \ - xacc-repdev.sgml \ - xacc-reports.sgml \ - xacc-scheme.sgml \ - xacc-stock-price-report.sgml \ - xacc-sxeditor.sgml \ - xacc-tax-report.sgml \ - xacc-toplevel.sgml \ - xacc-trans-report.sgml \ - xacc-txf-categories.sgml \ - xacc-txf-export.sgml \ - xacc-txf-export-anomalies.sgml \ - xacc-userdocs.sgml \ - xacc-whats-new.sgml \ - xacc-y2k.sgml + help.sgml \ + guide.sgml -gnucash_html_dir = $(top_srcdir)/doc/html/C - -GNUCASH_HTML_FILES = \ - $(gnucash_html_dir)/xacc-tax-report-example.html - -install-data-local: gnucash/index.html gnucash/help-search-index.db +install-data-local: gnucash/help.html gnucash/index.html gnucash/help-search-index.db $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir) - $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/image + $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/figures $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/stylesheet-images $(INSTALL_DATA) $(srcdir)/topic.dat \ $(DESTDIR)$(gnucash_helpdir)/topic.dat - -$(INSTALL_DATA) gnucash/help-search-index.db \ + -$(INSTALL_DATA) $(srcdir)/help-search-index.db \ $(DESTDIR)$(gnucash_helpdir)/help-search-index.db - -(for file in gnucash/*.html; do \ + -(for file in help/*.html; do \ basefile=`basename $$file` \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gnucash_helpdir)/$$basefile; \ done) - -(for file in gnucash/*.css; do \ + -(for file in guide/*.html; do \ basefile=`basename $$file` \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gnucash_helpdir)/$$basefile; \ done) - -(for file in gnucash/stylesheet-images/*.gif; do \ + -(for file in guide/*.css; do \ + basefile=`basename $$file` \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gnucash_helpdir)/$$basefile; \ + done) + -(for file in guide/stylesheet-images/*.gif; do \ basefile=`basename $$file` \ $(INSTALL_DATA) \ $(srcdir)/$$file \ @@ -115,51 +55,40 @@ uninstall-local: EXTRA_DIST = \ topic.dat -manual-html: gnucash/index.html -manual-dvi: gnucash/gnucash.dvi -manual-ps: gnucash/gnucash.ps -manual-rtf: gnucash/gnucash.rtf -manual-all: manual-html manual-ps manual-rtf - -all: manual-html - clean: - rm -rf gnucash - rm -rf gnucash.junk - -gnucash/gnucash.dvi: $(GNUCASH_SGML_FILES) - db2dvi ${srcdir}/gnucash.sgml - -gnucash/gnucash.ps: $(GNUCASH_SGML_FILES) - db2ps ${srcdir}/gnucash.sgml - -gnucash/gnucash.rtf: $(GNUCASH_SGML_FILES) - db2rtf ${srcdir}/gnucash.sgml + rm -rf guide + rm -rf guide.junk + rm -rf help + rm -rf help.junk gnucash/index.html: $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) - -(db2html -V %root-filename%=index ${srcdir}/gnucash.sgml \ - && cp $(GNUCASH_HTML_FILES) gnucash \ - && mkdir -p gnucash/image \ - && cp $(srcdir)/image/*.png gnucash/image || exit 1) + -(db2html -V %root-filename%=index -u ${srcdir}/guide.sgml || exit 1) +gnucash/help.html: $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) + -(db2html -V %root-filename%=help -u ${srcdir}/help.sgml || exit 1) + gnucash/help-search-index.db: $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) - -(cd gnucash && \ - rm -f help-search-index.db && \ - ../$(top_srcdir)/doc-tools/build-help-index \ - ../$(top_srcdir)/doc-tools/dbadd help-search-index.db *.html) + -(rm -f help-search-index.db && \ + $(top_srcdir)/doc-tools/build-help-index \ + $(top_srcdir)/doc-tools/dbadd help-search-index.db help/*.html \ + guide/*.html || exit 1) -dist-hook: +dist-hook: gnucash/help.html gnucash/index.html gnucash/help-search-index.db mkdir $(distdir)/gnucash - mkdir $(distdir)/gnucash/image + mkdir $(distdir)/gnucash/figures mkdir $(distdir)/gnucash/stylesheet-images - -(if test -f gnucash.sgml; then dir=.; \ + -(if test -f guide.sgml; then dir=.; \ else dir="${srcdir}"; fi; \ for file in $(GNUCASH_SGML_FILES); do \ cp $${dir}/$$file $(distdir)/$$file; \ done) - -(if test -f gnucash/index.html; then dir=.; \ + -(if test -f guide/index.html; then dir=.; \ else dir="${srcdir}"; fi; \ - cp $${dir}/gnucash/*.html $(distdir)/gnucash; \ - cp $${dir}/gnucash/image/*.png $(distdir)/gnucash/image; \ - cp $${dir}/gnucash/*.css $(distdir)/gnucash; \ - cp $${dir}/gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images) + cp $${dir}/help/*.html $(distdir)/gnucash; \ + cp $${dir}/help/figures/*.png $(distdir)/gnucash/figures; \ + cp $${dir}/help/*.css $(distdir)/gnucash; \ + cp $${dir}/help/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images) \ + cp $${dir}/guide/*.html $(distdir)/gnucash; \ + cp $${dir}/guide/figures/*.png $(distdir)/gnucash/figures; \ + cp $${dir}/guide/*.css $(distdir)/gnucash; \ + cp $${dir}/guide/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images) diff --git a/doc/sgml/C/guide.sgml b/doc/sgml/C/guide.sgml new file mode 100644 index 0000000000..04b93e4234 --- /dev/null +++ b/doc/sgml/C/guide.sgml @@ -0,0 +1,20 @@ + + +GnuCash User Manual + +
+ +About + + + +Introduction + + +This is a temporary placeholder until the new help is added. + + +
+ + diff --git a/doc/sgml/C/help.sgml b/doc/sgml/C/help.sgml new file mode 100644 index 0000000000..6e4e06848b --- /dev/null +++ b/doc/sgml/C/help.sgml @@ -0,0 +1,20 @@ + + +GnuCash User Manual + +
+ +About Help + + + +Introduction + + +This is a temporary placeholder until the new help is added. + + +
+ + diff --git a/doc/sgml/C/topic.dat b/doc/sgml/C/topic.dat index 188a1e21be..626acca037 100644 --- a/doc/sgml/C/topic.dat +++ b/doc/sgml/C/topic.dat @@ -1 +1,2 @@ index.html GnuCash Users Guide +help.html GnuCash Help diff --git a/doc/sgml/Makefile.am b/doc/sgml/Makefile.am index 86d34f6149..2d935f0507 100644 --- a/doc/sgml/Makefile.am +++ b/doc/sgml/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = C de_DE es pt_PT +SUBDIRS = C EXTRA_DIST = \ .cvsignore diff --git a/src/scm/help-topics-index.old b/src/scm/help-topics-index.old new file mode 100644 index 0000000000..091fc5b60d --- /dev/null +++ b/src/scm/help-topics-index.old @@ -0,0 +1,59 @@ +(((N_ "GnuCash Manual") "gnc-help:index.html" + (((N_ "Getting Started") "" + (((N_ "Welcome") "gnc-help:xacc-quickstart.html" #f) + ((N_ "Remedial Accounting 101") + "gnc-help:xacc-remedial-accounting.html" #f) + ((N_ "Setting up Accounts") "gnc-help:xacc-new-account-tree.html" #f) + ((N_ "Importing Data") "gnc-help:xacc-data-from-existing.html" #f))) + ((N_ "Basic Setup") "" + (((N_ "Gnome MDI") "gnc-help:xacc-gnome-mdi.html" #f) + ((N_ "Account Window") "gnc-help:xacc-mainwin.html" #f) + ((N_ "Double Entry") "gnc-help:xacc-doubleentry.html" #f) + ((N_ "QIF Import") "gnc-help:xacc-qif-import.html" + (((N_ "Quicken") "gnc-help:xacc-quicken.html" #f) + ((N_ "MYM") "gnc-help:bofa-mym.html" #f)))) + ((N_ "Preferences") "gnc-help:xacc-preferences.html" #f)) + ((N_ "Accounts") "" + (((N_ "Types") "gnc-help:xacc-acctypes.html" #f) + ((N_ "Vs. Categories") "gnc-help:xacc-quickencats.html" #f) + ((N_ "Income/Expense") "gnc-help:xacc-incomeexpense.html" #f) + ((N_ "New Setup") "gnc-help:xacc-newacctwin.html" + (((N_ "Commodity") "gnc-help:xacc-commodity.html" #f))) + ((N_ "Chart of") "gnc-help:xacc-chartofaccts.html" #f) + ((N_ "Editing") "gnc-help:xacc-accountedit.html" #f))) + ((N_ "Transactions") "" + (((N_ "Registers") "gnc-help:xacc-regwin.html" #f) + ((N_ "Shortcuts") "" + (((N_ "Date Input") "gnc-help:xacc-dateinput.html" #f) + ((N_ "Keyboard") "gnc-help:xacc-regwin-kbd.html" #f))) + ((N_ "Reconciliation") "gnc-help:xacc-recnwin.html" #f) + ((N_ "Search") "gnc-help:xacc-locatingtxns.html" #f))) + ((N_ "Record Keeping") "" + (((N_ "Check Printing") "gnc-help:xacc-print-check.html" #f) + ((N_ "Capital Gains") "gnc-help:xacc-depreciation.html" #f) + ((N_ "Depreciation") "gnc-help:xacc-depr.html" #f) + ((N_ "Currency") "gnc-help:xacc-currencyhandling.html" + ((N_ "Euro") "gnc-help:xacc-euro.html" #f)) + ((N_ "Business") "" + (((N_ "Payables/Receivables") "gnc-help:xacc-apar.html" #f) + ((N_ "Depreciation") "gnc-help:xacc-depreciation.html" #f))))) + ((N_ "Reports") "" + (((N_ "Overview") "gnc-help:xacc-reports.html" #f) + ((N_ "Types") "" + (((N_ "Balance Sheet") "gnc-help:xacc-balancesheet.html" #f) + ((N_ "Profit & Loss") "gnc-help:xacc-pnl.html" #f) + ((N_ "Transaction") "gnc-help:xacc-trans-report.html" #f) + ((N_ "Stock Portfolio") "gnc-help:xacc-portfolio-report.html" #f) + ((N_ "Balance Tracking") "gnc-help:xacc-balancereport.html" #f) + ((N_ "Tax Report") "gnc-help:xacc-tax-report.html" + (((N_ "TXF Export") "gnc-help:xacc-txf-export.html"#f) + ((N_ "TXF Categories") "gnc-help:xacc-txf-categories.html"#f) + ((N_ "TXF Anomalies") "gnc-help:xacc-txf-export-anomalies.html" #f))))) + ((N_ "Printing") "gnc-help:xacc-print.html" #f))))) + ((N_ "More on GnuCash") "" + (((N_ "Hacking Documentation") "gnc-help:xacc-dochack.html" #f) + ((N_ "GNU GPL") "gnc-help:xacc-gpl.html" #f))) + ((N_ "Report a bug") "http://www.linuxdevel.com/submit-bug.php" #f) + ((N_ "URL Tests") "" + (((N_ "gnucash.org") "http://www.gnucash.org" #f) + ((N_ "slashdot.org") "http://www.slashdot.org" #f)))) diff --git a/src/scm/help-topics-index.scm b/src/scm/help-topics-index.scm index 091fc5b60d..b3e1483892 100644 --- a/src/scm/help-topics-index.scm +++ b/src/scm/help-topics-index.scm @@ -1,59 +1,3 @@ (((N_ "GnuCash Manual") "gnc-help:index.html" - (((N_ "Getting Started") "" - (((N_ "Welcome") "gnc-help:xacc-quickstart.html" #f) - ((N_ "Remedial Accounting 101") - "gnc-help:xacc-remedial-accounting.html" #f) - ((N_ "Setting up Accounts") "gnc-help:xacc-new-account-tree.html" #f) - ((N_ "Importing Data") "gnc-help:xacc-data-from-existing.html" #f))) - ((N_ "Basic Setup") "" - (((N_ "Gnome MDI") "gnc-help:xacc-gnome-mdi.html" #f) - ((N_ "Account Window") "gnc-help:xacc-mainwin.html" #f) - ((N_ "Double Entry") "gnc-help:xacc-doubleentry.html" #f) - ((N_ "QIF Import") "gnc-help:xacc-qif-import.html" - (((N_ "Quicken") "gnc-help:xacc-quicken.html" #f) - ((N_ "MYM") "gnc-help:bofa-mym.html" #f)))) - ((N_ "Preferences") "gnc-help:xacc-preferences.html" #f)) - ((N_ "Accounts") "" - (((N_ "Types") "gnc-help:xacc-acctypes.html" #f) - ((N_ "Vs. Categories") "gnc-help:xacc-quickencats.html" #f) - ((N_ "Income/Expense") "gnc-help:xacc-incomeexpense.html" #f) - ((N_ "New Setup") "gnc-help:xacc-newacctwin.html" - (((N_ "Commodity") "gnc-help:xacc-commodity.html" #f))) - ((N_ "Chart of") "gnc-help:xacc-chartofaccts.html" #f) - ((N_ "Editing") "gnc-help:xacc-accountedit.html" #f))) - ((N_ "Transactions") "" - (((N_ "Registers") "gnc-help:xacc-regwin.html" #f) - ((N_ "Shortcuts") "" - (((N_ "Date Input") "gnc-help:xacc-dateinput.html" #f) - ((N_ "Keyboard") "gnc-help:xacc-regwin-kbd.html" #f))) - ((N_ "Reconciliation") "gnc-help:xacc-recnwin.html" #f) - ((N_ "Search") "gnc-help:xacc-locatingtxns.html" #f))) - ((N_ "Record Keeping") "" - (((N_ "Check Printing") "gnc-help:xacc-print-check.html" #f) - ((N_ "Capital Gains") "gnc-help:xacc-depreciation.html" #f) - ((N_ "Depreciation") "gnc-help:xacc-depr.html" #f) - ((N_ "Currency") "gnc-help:xacc-currencyhandling.html" - ((N_ "Euro") "gnc-help:xacc-euro.html" #f)) - ((N_ "Business") "" - (((N_ "Payables/Receivables") "gnc-help:xacc-apar.html" #f) - ((N_ "Depreciation") "gnc-help:xacc-depreciation.html" #f))))) - ((N_ "Reports") "" - (((N_ "Overview") "gnc-help:xacc-reports.html" #f) - ((N_ "Types") "" - (((N_ "Balance Sheet") "gnc-help:xacc-balancesheet.html" #f) - ((N_ "Profit & Loss") "gnc-help:xacc-pnl.html" #f) - ((N_ "Transaction") "gnc-help:xacc-trans-report.html" #f) - ((N_ "Stock Portfolio") "gnc-help:xacc-portfolio-report.html" #f) - ((N_ "Balance Tracking") "gnc-help:xacc-balancereport.html" #f) - ((N_ "Tax Report") "gnc-help:xacc-tax-report.html" - (((N_ "TXF Export") "gnc-help:xacc-txf-export.html"#f) - ((N_ "TXF Categories") "gnc-help:xacc-txf-categories.html"#f) - ((N_ "TXF Anomalies") "gnc-help:xacc-txf-export-anomalies.html" #f))))) - ((N_ "Printing") "gnc-help:xacc-print.html" #f))))) - ((N_ "More on GnuCash") "" - (((N_ "Hacking Documentation") "gnc-help:xacc-dochack.html" #f) - ((N_ "GNU GPL") "gnc-help:xacc-gpl.html" #f))) - ((N_ "Report a bug") "http://www.linuxdevel.com/submit-bug.php" #f) - ((N_ "URL Tests") "" - (((N_ "gnucash.org") "http://www.gnucash.org" #f) - ((N_ "slashdot.org") "http://www.slashdot.org" #f)))) + (((N_ "More on GnuCash") "gnc-help:help.html" #f) + ((N_ "Report a bug") "http://bugzilla.gnome.org" #f))))