gnucash-docs maint: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Mon Apr 11 13:56:19 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/4751e484 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/87a10840 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/180d159b (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/87b77b8f (commit)



commit 4751e4843b170e8f0b342e8ef6f755c68eed85ff
Merge: 180d159b 87a10840
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Apr 11 19:52:11 2022 +0200

    Merge remote-tracking branch 'cwehli/maint' into maint


commit 87a108404bc2236c838d57ca0650a51b18cef875
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Apr 2 13:24:06 2022 +0200

    gitignore: Cleanup

diff --git a/.gitignore b/.gitignore
index cb75bde3..d7604384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,6 @@
-# We filter only autotools artefacts.
 # Use a separate build directory!
-# For other purposes adjust "$XDG_CONFIG_HOME/git/ignore!
+# Have a look at https://wiki.gnucash.org/wiki/Documentation_Improvement#Initial_Steps.
+#
+# If /your/ tools add files into the source tree, adjust /your/ "$XDG_CONFIG_HOME/git/ignore"
+# or "$GIT_DIR/info/exclude" as described at https://git-scm.com/docs/gitignore!
 
-#absolute:
-/INSTALL
-/aclocal.m4
-/autom4te.cache/
-/config.guess
-/config.sub
-/configure
-/install-sh
-/ltmain.sh
-/missing
-/build
-/guide/pt/Auxiliary files/
-/home/pmra/Documents/6.Translations/GnuCash/gnucash-docs/gnucash-docs/guide/pt/figures100
-
-#relative:
-Makefile.in

commit 180d159bae0d1c4de66cbd07e53abfc5c985f087
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Mar 29 20:29:48 2022 +0200

    gnc-docbookx.dtd, Optimize links to Selinger's docs

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 2411aaeb..0e029953 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -164,7 +164,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY url-yh-hlp "https://help.yahoo.com/">  <!-- Append the desired topic -->
 
 <!-- c) URLs of Authors -->
-<!ENTITY url-selinger "https://www.mathstat.dal.ca/~selinger/">
-<!ENTITY tit-sel-tut "&url-selinger;accounting/tutorial.html">
-<!ENTITY tit-sel-gnc "&url-selinger;accounting/gnucash.html">
+<!ENTITY url-selinger "https://www.mathstat.dal.ca/~selinger/accounting/">
+<!ENTITY ulink-sel-tut '<ulink url="&url-selinger;tutorial"><foreignphrase>Tutorial on multiple currency accounting</foreignphrase></ulink>'>
+<!ENTITY ulink-sel-gnc '<ulink url="&url-selinger;gnucash"><foreignphrase>Multiple currency accounting in GnuCash</foreignphrase></ulink>'>
 
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index f50aea2e..1493c87a 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -1036,10 +1036,8 @@ TODO -->
     <title>Automatically Recording Currency Transactions using Trading Accounts</title>
 
     <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
-      trading accounts is described in <ulink url="&url-selinger;accounting/tutorial.html">
-      &tit-sel-tut;</ulink> by Peter Selinger. A second tutorial
-      <ulink url="&url-selinger;accounting/gnucash.html">&tit-sel-gnc;</ulink> by Peter Selinger
-      describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
+      trading accounts is described in &ulink-sel-tut; by Peter Selinger. A second tutorial
+      &ulink-sel-gnc; describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
     </para>
 
     <para>Trading accounts are not enabled by default in &app;. To enable them go to
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index bdc70313..f6f2e15c 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -47,8 +47,7 @@
       </para>
 
       <para>Für eine vollständige Anleitung zu <guilabel>Devisenhandels</guilabel>-Konten können Sie einen
-        Blick <ulink url="&url-selinger;accounting/tutorial.html"> auf dieses Tutorial von Peter
-        Selinger (in englischer Sprache)</ulink> werfen.
+        Blick auf das &ulink-sel-tut; von Peter Selinger (in englischer Sprache) werfen.
       </para>
     </note>
   </sect1>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 6916d675..97480593 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -13156,9 +13156,8 @@ Entrate
             .
           </para>
 
-          <para>For a complete guide on <guilabel>trading</guilabel> accounts, see
-            <foreignphrase><ulink url="&url-selinger;accounting/tutorial.html">
-            &tit-sel-tut;</ulink> by</foreignphrase> Peter Selinger.
+          <para>Per una guida completa sui conti per il <guilabel>trading</guilabel> si
+            consiglia di consultare la guida &ulink-sel-tut; di Peter Selinger (in inglese).
           </para>
         </note>
       </sect1>
diff --git a/guide/it/it.po b/guide/it/it.po
index 57b9fbd9..0a277831 100644
--- a/guide/it/it.po
+++ b/guide/it/it.po
@@ -14908,12 +14908,10 @@ msgstr ""
 #: C/gnucash-guide.xml:40(para)
 msgid ""
 "For a complete guide on <guilabel>trading</guilabel> accounts you can take a "
-"look <ulink url=\"&url-selinger;"
-"accounting/tutorial.html\">&tit-sel-tut;</ulink> by Peter Selinger."
+"look &ulink-sel-tut; by Peter Selinger."
 msgstr ""
 "Per una guida completa sui conti per il <guilabel>trading</guilabel> si "
-"consiglia di consultare la guida <ulink url=\"&url-selinger;"
-"accounting/tutorial.html\">&tit-sel-tut;</ulink> Peter Selinger (in inglese)."
+"consiglia di consultare la guida &ulink-sel-tut; di Peter Selinger (in inglese)."
 
 #: C/gnucash-guide.xml:49(para)
 msgid ""
diff --git a/guide/ja/ch_currency.xml b/guide/ja/ch_currency.xml
index c2b4c373..ef92b146 100644
--- a/guide/ja/ch_currency.xml
+++ b/guide/ja/ch_currency.xml
@@ -40,9 +40,8 @@
         にある<guilabel>勘定科目</guilabel>タブで有効にすることができます。
       </para>
 
-      <para><guilabel>投機</guilabel>勘定科目の完全なガイドについては<ulink
-url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;
-        by Peter Selinger</ulink>を参照してください。
+      <para><guilabel>投機</guilabel>勘定科目の完全なガイドについては &ulink-sel-tut;
+        by Peter Selinger を参照してください。
       </para>
     </note>
   </sect1>
diff --git a/guide/pt/ch_currency.xml b/guide/pt/ch_currency.xml
index fffaa308..c380402e 100644
--- a/guide/pt/ch_currency.xml
+++ b/guide/pt/ch_currency.xml
@@ -43,8 +43,7 @@
       </para>
 
       <para>Para um guia completo sobre <guilabel>contas de bolsa</guilabel>, pode seguir este
-        <foreignphrase><ulink url="&url-selinger;accounting/tutorial.html">
-        &tit-sel-tut;</ulink></foreignphrase> por Peter Selinger.
+        &ulink-sel-tut; por Peter Selinger.
       </para>
     </note>
   </sect1>
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index 8570de1f..8ccda907 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -1062,9 +1062,8 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
     <title>Automatically Recording Currency Transactions using Trading Accounts</title>
 
     <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
-      trading accounts is described in <ulink url="&url-selinger;accounting/tutorial.html">
-      &tit-sel-tut;</ulink> by Peter Selinger. A second tutorial
-      <ulink url="&url-selinger;accounting/gnucash.html"> &tit-sel-gnc;</ulink> by Peter Selinger
+      trading accounts is described in &ulink-sel-tut; by Peter Selinger. A second tutorial
+      &ulink-sel-gnc; by Peter Selinger
       describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
     </para>
 
diff --git a/manual/C/Help_ch_Customize.xml b/manual/C/Help_ch_Customize.xml
index 3d2ea2f3..ba0311c0 100755
--- a/manual/C/Help_ch_Customize.xml
+++ b/manual/C/Help_ch_Customize.xml
@@ -1385,7 +1385,7 @@ Translators:
         </para>
 
         <tip>
-          <para>To avoid several problems on multiple currency accounting read Peter Selinger's <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
+          <para>To avoid several problems on multiple currency accounting read Peter Selinger's &ulink-sel-tut;.
           </para>
         </tip>
       </sect3>
diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index 46b04f72..49b99d6d 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -468,9 +468,8 @@
               <para>Devisenhandelskonten repräsentieren/gleichen aus das schwebende Ergebnis Ihres Wertpapier- und
                 Devisenhandels. Sobald sie den ersten Kauf tätigen, etwa Umtausch Ihrer
                 Heimwährung in die des Urlaubslandes, wird für beide Währungen ein Konto
-                angelegt, sofern es nicht bereits existiert. Die Details sind in
-                <ulink url="&tit-sel-tut;"></ulink> und <ulink url="&tit-sel-gnc;"></ulink> in
-                Englisch beschrieben.
+                angelegt, sofern es nicht bereits existiert. Die Details hat Peter Selinger in
+                &ulink-sel-tut; und &ulink-sel-gnc; beschrieben (nur in englischer Sprache verfügbar).
               </para>
             </entry>
 
diff --git a/manual/de/Help_ch_Customize.xml b/manual/de/Help_ch_Customize.xml
index dbd94c9b..2f8be07a 100644
--- a/manual/de/Help_ch_Customize.xml
+++ b/manual/de/Help_ch_Customize.xml
@@ -2220,8 +2220,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
             <tip>
               <para>Um verschiedene Probleme bei der Buchführung in mehreren Währungen zu vermeiden, lesen Sie Peter
-                Selinger's
-                <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
+                Selingers &ulink-sel-tut;.
               </para>
             </tip>
           </listitem>
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index 10d66fd3..666fba93 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -24751,7 +24751,7 @@ make doc
 
           <tip>
             <para>To avoid several problems on multiple currency accounting read Peter Selinger's
-              <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
+              &ulink-sel-tut;.
             </para>
           </tip>
         </sect3>
diff --git a/manual/pt/Help_ch_Customize.xml b/manual/pt/Help_ch_Customize.xml
index 6ec199a0..31dc704d 100644
--- a/manual/pt/Help_ch_Customize.xml
+++ b/manual/pt/Help_ch_Customize.xml
@@ -1422,7 +1422,7 @@
 
         <tip>
           <para>&untranslated-pt; To avoid several problems on multiple currency accounting read Peter Selinger's
-            <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
+            &ulink-sel-tut;.
           </para>
         </tip>
       </sect3>



Summary of changes:
 .gitignore                            | 22 ++++------------------
 docbook/gnc-docbookx.dtd              |  6 +++---
 guide/C/ch_currency.xml               |  6 ++----
 guide/de/ch_currency.xml              |  3 +--
 guide/it/gnucash-guide.xml            |  5 ++---
 guide/it/it.po                        |  6 ++----
 guide/ja/ch_currency.xml              |  5 ++---
 guide/pt/ch_currency.xml              |  3 +--
 guide/ru/ch_currency.xml              |  5 ++---
 manual/C/Help_ch_Customize.xml        |  2 +-
 manual/de/Help_ch_Account-Actions.xml |  5 ++---
 manual/de/Help_ch_Customize.xml       |  3 +--
 manual/it/gnucash-help.xml            |  2 +-
 manual/pt/Help_ch_Customize.xml       |  2 +-
 14 files changed, 25 insertions(+), 50 deletions(-)



More information about the gnucash-changes mailing list