source/text/shared/00/edit_menu.xhp | 5 +++ source/text/shared/01/02230100.xhp | 2 + source/text/shared/01/02230150.xhp | 5 +++ source/text/shared/01/02230200.xhp | 2 + source/text/shared/01/02230400.xhp | 4 +- source/text/shared/01/02230500.xhp | 10 +++--- source/text/shared/01/02240000.xhp | 5 +-- source/text/swriter/track_changes_toolbar.xhp | 43 +++++++++++++++++++------- 8 files changed, 57 insertions(+), 19 deletions(-)
New commits: commit 80f1bca2adc9b5b0b63d266943779a1c0ae08ce2 Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Mon Mar 14 10:54:28 2022 -0300 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Mon Mar 14 15:01:26 2022 +0100 Improve track changes help pages Change-Id: I04ee3cd429e96d1830c1038337a88a3a2dcf8e9c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131544 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp index 273a923e5..13bbc3404 100644 --- a/source/text/shared/00/edit_menu.xhp +++ b/source/text/shared/00/edit_menu.xhp @@ -172,10 +172,15 @@ <paragraph role="paragraph" id="par_id3153878" xml-lang="en-US"><variable id="rotliniefilter">Choose <menuitem>Edit - Track Changes - Manage - Filter</menuitem> tab.</variable></paragraph> <paragraph role="paragraph" id="par_id3151281" xml-lang="en-US"><variable id="einfuegen">Choose <menuitem>Edit - Track Changes - Merge Document</menuitem>.</variable></paragraph> <paragraph role="paragraph" id="par_id3153224" xml-lang="en-US"><variable id="dvergl">Choose <menuitem>Edit - Track Changes - Compare Document</menuitem>.</variable></paragraph> + +<paragraph role="paragraph" id="par_id561647263926698"><variable id="protect">Choose <menuitem>Edit - Track Changes - Protect</menuitem></variable></paragraph> + <section id="comment"> <paragraph role="paragraph" id="par_id3148773" xml-lang="en-US">Choose <menuitem>Edit - Track Changes - Comment</menuitem>.</paragraph> <paragraph role="paragraph" id="par_id3149488" xml-lang="en-US">Choose <menuitem>Edit - Track Changes - Manage - List</menuitem> tab.<br/>Click an entry in the list and open the context menu.<br/>Choose <emph>Edit Comment</emph>.</paragraph> </section> + + <section id="find"> <paragraph role="paragraph" id="par_id31562971" xml-lang="en-US">Choose <menuitem>Edit - Find</menuitem>.</paragraph> <paragraph role="paragraph" id="par_id31545031" xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+F</keycode></paragraph> diff --git a/source/text/shared/01/02230100.xhp b/source/text/shared/01/02230100.xhp index 2db299b0f..72d2a830b 100644 --- a/source/text/shared/01/02230100.xhp +++ b/source/text/shared/01/02230100.xhp @@ -36,6 +36,8 @@ </section> <section id="howtoget"> <embed href="text/shared/00/edit_menu.xhp#aufzeichnen"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_record_changes"/> </section> <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US"><switchinline select="appl"> <caseinline select="WRITER">If you choose <emph>Edit - Track Changes - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the <emph>Options</emph> dialog box.</caseinline></switchinline></paragraph> diff --git a/source/text/shared/01/02230150.xhp b/source/text/shared/01/02230150.xhp index 2efadc76e..2b004d63e 100644 --- a/source/text/shared/01/02230150.xhp +++ b/source/text/shared/01/02230150.xhp @@ -34,6 +34,11 @@ <h1 id="hd_id3154349"><link href="text/shared/01/02230150.xhp" name="Protect Changes">Protect Changes</link></h1> <paragraph role="paragraph" id="par_id3150794" xml-lang="en-US"><ahelp hid=".">Prevents a user from deactivating the record changes feature, or from accepting or rejecting changes unless the user enters a password.</ahelp></paragraph> </section> +<section id="howtoget"> + <embed href="text/shared/00/edit_menu.xhp#protect"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_protect"/> +</section> <section id="relatedtopics"> <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/> <embed href="text/shared/guide/redlining.xhp#redlining"/> diff --git a/source/text/shared/01/02230200.xhp b/source/text/shared/01/02230200.xhp index f0190c268..3a1815654 100644 --- a/source/text/shared/01/02230200.xhp +++ b/source/text/shared/01/02230200.xhp @@ -43,6 +43,8 @@ </section> <section id="howtoget"> <embed href="text/shared/00/edit_menu.xhp#anzeigen"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_show_changes"/> </section> <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US">You can change the display properties of the markup elements by choosing <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link></caseinline></switchinline> <switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link></caseinline></switchinline> in the <emph>Options</emph> dialog box.</paragraph> diff --git a/source/text/shared/01/02230400.xhp b/source/text/shared/01/02230400.xhp index afa5ca708..74c01210d 100644 --- a/source/text/shared/01/02230400.xhp +++ b/source/text/shared/01/02230400.xhp @@ -39,7 +39,9 @@ </section> <section id="howtoget"> - <embed href="text/shared/00/edit_menu.xhp#rotlinie"/> + <embed href="text/shared/00/edit_menu.xhp#rotlinie"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_manage_changes"/> </section> <embed href="text/shared/01/02230401.xhp#list"/> <embed href="text/shared/01/02230402.xhp#filter"/> diff --git a/source/text/shared/01/02230500.xhp b/source/text/shared/01/02230500.xhp index b50d5ad70..1dccf43d9 100644 --- a/source/text/shared/01/02230500.xhp +++ b/source/text/shared/01/02230500.xhp @@ -30,13 +30,13 @@ <body> <section id="merge_documents"> <bookmark xml-lang="en-US" branch="hid/.uno:MergeDocuments" id="bm_id2244498" localize="false"/> -<paragraph role="heading" level="1" id="hd_id3149000" xml-lang="en-US"><link href="text/shared/01/02230500.xhp" name="Merge Document">Merge Document</link></paragraph> +<h1 id="hd_id3149000"><link href="text/shared/01/02230500.xhp" name="Merge Document">Merge Document</link></h1> <paragraph role="paragraph" id="par_id3154408" xml-lang="en-US"><variable id="dokzus"><ahelp hid=".uno:MergeDocuments" visibility="visible">Imports changes made to copies of the same document into the original document. Changes made to footnotes, headers, frames and fields are ignored.</ahelp></variable> Identical changes are merged automatically.</paragraph> </section> - <section id="howtoget"> - <embed href="text/shared/00/edit_menu.xhp#einfuegen"/> +<section id="howtoget"> + <embed href="text/shared/00/edit_menu.xhp#einfuegen"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_merge_docs"/> </section> - <switch select="appl"><case select="WRITER"> - </case></switch> </body> </helpdocument> diff --git a/source/text/shared/01/02240000.xhp b/source/text/shared/01/02240000.xhp index c5db1f9fe..8fef7ab09 100644 --- a/source/text/shared/01/02240000.xhp +++ b/source/text/shared/01/02240000.xhp @@ -36,13 +36,14 @@ </variable> The contents of the selected document are marked as deletions in the dialog that opens. If you want, you can insert the contents of the selected file into the current document by selecting the relevant deleted entries, clicking <emph>Reject</emph>, and then clicking <emph>Insert</emph>.</paragraph> </section> <section id="howtoget"> - <embed href="text/shared/00/edit_menu.xhp#dvergl"/> + <embed href="text/shared/00/edit_menu.xhp#dvergl"/> + <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track Changes</emph> toolbar, click</paragraph> + <embed href="text/swriter/track_changes_toolbar.xhp#icon_compare_doc"/> </section> <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/> <switch select="appl"> <case select="WRITER"> <warning id="par_id3153662">The contents of footnotes, headers, frames and fields are ignored.</warning> - </case> </switch> </body> diff --git a/source/text/swriter/track_changes_toolbar.xhp b/source/text/swriter/track_changes_toolbar.xhp index f80ada419..080a2d997 100644 --- a/source/text/swriter/track_changes_toolbar.xhp +++ b/source/text/swriter/track_changes_toolbar.xhp @@ -25,7 +25,9 @@ <paragraph role="paragraph" id="par_id261647012734234">Choose <menuitem>View - Toolbars - Track Changes</menuitem>.</paragraph> </section> <embed href="text/shared/01/02230200.xhp#showchanges"/> - <table id="tab_id751647013245369"> + + <section id="icon_show_changes"> + <table id="tab_id751647013245369"> <tablerow> <tablecell> <paragraph id="par_id221647013245370" role="paragraph"> @@ -36,9 +38,11 @@ <paragraph id="par_id31647013245373" role="paragraph" xml-lang="en-US">Show track changes</paragraph> </tablecell> </tablerow> - </table> + </table> + </section> - <embed href="text/shared/01/02230100.xhp#record_changes"/> + <embed href="text/shared/01/02230100.xhp#icon_record_changes"/> + <section id="icon_record_changes"> <table id="tab_id121647013362399"> <tablerow> <tablecell> @@ -50,8 +54,8 @@ <paragraph id="par_id781647013362404" role="paragraph" xml-lang="en-US">Record Changes</paragraph> </tablecell> </tablerow> - </table> - + </table> + </section> <h2 id="hd_id731647013552967">Previous Track Change</h2> <table id="tab_id701647013566068"> @@ -66,6 +70,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id551647013674361">Next Track Change</h2> <table id="tab_id891647013679439"> <tablerow> @@ -79,6 +84,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id421647013795427">Accept Track Change</h2> <table id="tab_id451647013785664"> <tablerow> @@ -92,6 +98,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id871647013918576">Reject Track Change</h2> <table id="tab_id701647013912300"> <tablerow> @@ -105,6 +112,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id991647014048136">Accept All Tracked Changes</h2> <table id="tab_id391647014053975"> <tablerow> @@ -118,6 +126,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id341647014115494">Reject All Tracked Changes</h2> <table id="tab_id631647014121790"> <tablerow> @@ -131,6 +140,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id901647014258055">Accept Track Change and select next one</h2> <table id="tab_id841647014293795"> <tablerow> @@ -144,6 +154,7 @@ </tablecell> </tablerow> </table> + <h2 id="hd_id451647014408416">Reject Track Change and select next one</h2> <table id="tab_id421647014413667"> <tablerow> @@ -159,7 +170,9 @@ </table> <embed href="text/shared/01/02230400.xhp#managechangeshead"/> - <table id="tab_id491647014498849"> + + <section id="icon_manage_changes"> + <table id="tab_id491647014498849"> <tablerow> <tablecell> <paragraph id="par_id721647014498850" role="paragraph"> @@ -170,7 +183,8 @@ <paragraph id="par_id641647014498854" role="paragraph" xml-lang="en-US">Manage Track Changes</paragraph> </tablecell> </tablerow> - </table> + </table> + </section> <embed href="text/shared/01/04050000.xhp#comment"/> <table id="tab_id211647018300376"> @@ -201,6 +215,7 @@ </table> <embed href="text/shared/01/02230150.xhp#red_protect"/> + <section id="icon_protect"> <table id="tab_id711647015406605"> <tablerow> <tablecell> @@ -212,10 +227,12 @@ <paragraph id="par_id901647015406609" role="paragraph" xml-lang="en-US">Protect Changes</paragraph> </tablecell> </tablerow> - </table> + </table> + </section> <embed href="text/shared/01/02240000.xhp#compare_document"/> - <table id="tab_id151647015829635"> + <section id="icon_compare_doc"> + <table id="tab_id151647015829635"> <tablerow> <tablecell> <paragraph id="par_id611647015829636" role="paragraph"> @@ -226,10 +243,13 @@ <paragraph id="par_id441647015829640" role="paragraph" xml-lang="en-US">Compare Document</paragraph> </tablecell> </tablerow> - </table> + </table> + </section> <embed href="text/shared/01/02230500.xhp#merge_documents"/> - <table id="tab_id101647019044606"> + + <section id="icon_merge_docs"> + <table id="tab_id101647019044606"> <tablerow> <tablecell> <paragraph id="par_id331647019044607" role="paragraph"> @@ -241,6 +261,7 @@ </tablecell> </tablerow> </table> + </section> </body> </helpdocument>