Git commit 08a873c711ecfecf7991e63c06c0014ef1e10ac5 by Dag Andersen. Committed on 28/02/2020 at 12:00. Pushed by danders into branch 'master'.
Port commit 2722bab8ca05af6b62fc596a04aaf6c3976d8824 by Yuri Chornoivan Failed due to restructuring M +1 -1 doc/contexthelp.docbook M +5 -5 doc/creatingodtreporttemplates.docbook https://commits.kde.org/calligraplan/08a873c711ecfecf7991e63c06c0014ef1e10ac5 diff --git a/doc/contexthelp.docbook b/doc/contexthelp.docbook index a0bd5018..36df0b57 100644 --- a/doc/contexthelp.docbook +++ b/doc/contexthelp.docbook @@ -1,7 +1,7 @@ <sect1 id="context-help"><title>Context Help</title> <para>Many functions and views have help and hints that can be displayed with the <emphasis>What's This</emphasis> function. </para> - <para>You can activate it with the menu entry <menuchoice><guimenu>Help</guimenu><guimenuitem>WhatsThis</guimenuitem></menuchoice> or keboard shortcut <keycombo>&Shift;<keycap>F1</keycap></keycombo>. + <para>You can activate it with the menu entry <menuchoice><guimenu>Help</guimenu><guimenuitem>WhatsThis</guimenuitem></menuchoice> or keyboard shortcut <keycombo>&Shift;<keycap>F1</keycap></keycombo>. </para> <para>In dialogs it is activated by pressing the <varname>?</varname> in the dialogs title bar. </para> diff --git a/doc/creatingodtreporttemplates.docbook b/doc/creatingodtreporttemplates.docbook index b489e539..2b02e215 100644 --- a/doc/creatingodtreporttemplates.docbook +++ b/doc/creatingodtreporttemplates.docbook @@ -33,13 +33,13 @@ </para> <para>These variables have the following format: </para> - <para>tableTasks.<replaceable>property</replaceable> = <replaceable>property identifer</replaceable> + <para>tableTasks.<replaceable>property</replaceable> = <replaceable>property identifier</replaceable> </para> <para>where: </para> <itemizedlist> <listitem><para><guilabel>property</guilabel> makes the user field name unique.</para></listitem> - <listitem><para><guilabel>property identity</guilabel> identifies the property in the data group.</para></listitem> + <listitem><para><guilabel>property identifier</guilabel> identifies the property in the data group.</para></listitem> </itemizedlist> </sect4> <sect4 id="chart-data"><title>Chart Data</title> @@ -56,7 +56,7 @@ <itemizedlist> <listitem><para><replaceable>name</replaceable> must start with <guilabel>chart</guilabel> (⪚ chartBudgetCost)</para></listitem> <listitem><para><replaceable>data group</replaceable></para></listitem> - <listitem><para><guilabel>property identity</guilabel> identifies the property in the data group.</para></listitem> + <listitem><para><guilabel>comma separated list of data properties</guilabel> identifies the properties in the data group.</para></listitem> </itemizedlist> <para>E.g.: </para> @@ -648,7 +648,7 @@ <para>Shutdown Account</para> </entry> <entry> - <para>Accoutn for shutdown cost</para> + <para>Account for shutdown cost</para> </entry> </row> <row> @@ -714,7 +714,7 @@ <para>Start Time</para> </entry> <entry> - <para>Shceduled start time</para> + <para>Scheduled start time</para> </entry> </row> <row>