AllLangHelp_shared.mk | 1
source/text/shared/00/00000004.xhp | 111 ++++++++++------------
source/text/shared/guide/redlining.xhp | 11 +-
source/text/shared/guide/redlining_accept.xhp | 6 -
source/text/shared/guide/redlining_doccompare.xhp | 12 --
source/text/shared/guide/redlining_docmerge.xhp | 12 --
source/text/shared/guide/redlining_enter.xhp | 9 -
source/text/shared/guide/redlining_navigation.xhp | 9 -
source/text/shared/guide/redlining_protect.xhp | 22 +---
source/text/shared/guide/redlining_versions.xhp | 12 --
source/text/shared/optionen/01040800.xhp | 64 ++++++++++++
11 files changed, 158 insertions(+), 111 deletions(-)
New commits:
commit 94dcf7ef3fdb4f4722d2cc3d3d8a5713bf45d7b3
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Aug 13 14:22:52 2020 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Aug 16 19:07:16 2020 +0200
tdf#135688 Help page for Comparison Options
Change-Id: I51c60ebfd39e5d90025cea1cea74a9a3dd3ce0ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100822
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 2f757db99..570523c05 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -798,6 +798,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/optionen/01040500 \
helpcontent2/source/text/shared/optionen/01040600 \
helpcontent2/source/text/shared/optionen/01040700 \
+ helpcontent2/source/text/shared/optionen/01040800 \
helpcontent2/source/text/shared/optionen/01040900 \
helpcontent2/source/text/shared/optionen/01041000 \
helpcontent2/source/text/shared/optionen/01041100 \
diff --git a/source/text/shared/00/00000004.xhp
b/source/text/shared/00/00000004.xhp
index 8397e05be..a0b6d49e4 100644
--- a/source/text/shared/00/00000004.xhp
+++ b/source/text/shared/00/00000004.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
-
<helpdocument version="1.0">
<meta>
<topic id="textshared0000000004xml" indexer="exclude" status="PUBLISH">
@@ -32,22 +27,22 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3160447" xml-lang="en-US"
level="1"><variable id="wie">To access this command...
-</variable></paragraph>
+<h1 id="hd_id3160447"><variable id="wie">To access this command...
+</variable></h1>
<section id="related">
<paragraph role="related" id="par_id3147212" xml-lang="en-US"><variable
id="related"><emph>Related Topics</emph>
</variable></paragraph>
</section>
-<paragraph role="heading" id="hd_id161521663319917" level="3"
xml-lang="en-US"><variable id="samplefile">Open file with
example:</variable></paragraph>
+<h3 id="hd_id161521663319917"><variable id="samplefile">Open file with
example:</variable></h3>
<section id="sytextfarbe">
<table id="tbl_id3156421">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154689" xml-lang="en-US">
<image id="img_id3152427" src="cmd/sc_color.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3152427" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146067" xml-lang="en-US">Font
Color</paragraph>
</tablecell>
</tablerow>
@@ -57,12 +52,12 @@
<section id="sytxtfarbe">
<table id="tbl_id3153624">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US">
<image id="img_id3149716" src="cmd/sc_color.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3149716" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US">Font
Color</paragraph>
</tablecell>
</tablerow>
@@ -72,12 +67,12 @@
<section id="syeinzeilig">
<table id="tbl_id3154751">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US">
<image id="img_id3146957" src="cmd/sc_justifypara.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3146957" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US">Line spacing:
1</paragraph>
</tablecell>
</tablerow>
@@ -87,12 +82,12 @@
<section id="syeineinhalbzeilig">
<table id="tbl_id3154317">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US">
<image id="img_id3163802" src="cmd/sc_spacepara15.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US">Line spacing:
1.5</paragraph>
</tablecell>
</tablerow>
@@ -102,12 +97,12 @@
<section id="syzweizeilig">
<table id="tbl_id3149233">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150131" xml-lang="en-US">
<image id="img_id3153252" src="cmd/sc_spacepara2.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3153252" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152824" xml-lang="en-US">Line spacing:
2</paragraph>
</tablecell>
</tablerow>
@@ -117,12 +112,12 @@
<section id="syhochstellen">
<table id="tbl_id3155583">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149820" xml-lang="en-US">
<image id="img_id3153126" src="cmd/sc_superscript.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3153126" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145121"
xml-lang="en-US">Superscript</paragraph>
</tablecell>
</tablerow>
@@ -132,12 +127,12 @@
<section id="sytiefstellen">
<table id="tbl_id3149514">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147077" xml-lang="en-US">
<image id="img_id3155135" src="cmd/sc_subscript.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3155135" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151385"
xml-lang="en-US">Subscript</paragraph>
</tablecell>
</tablerow>
@@ -147,12 +142,12 @@
<section id="sylistil">
<table id="tbl_id3147559">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US">
<image id="img_id3149294" src="media/helpimg/feldurch.png" width="0.9374inch"
height="0.2398inch"><alt id="alt_id3149294" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152772" xml-lang="en-US">Line
Style</paragraph>
</tablecell>
</tablerow>
@@ -162,12 +157,12 @@
<section id="sylifarbe">
<table id="tbl_id3150541">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153379" xml-lang="en-US">
<image id="img_id3148401" src="media/helpimg/feldcolo.png" width="1.0417inch"
height="0.2398inch"><alt id="alt_id3148401" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US">Line
Color</paragraph>
</tablecell>
</tablerow>
@@ -177,12 +172,12 @@
<section id="sylibreite">
<table id="tbl_id3143231">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US">
<image id="img_id3149807" src="media/helpimg/feldbrei.png" width="0.6563inch"
height="0.2189inch"><alt id="alt_id3149807" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3163044" xml-lang="en-US">Line
Width</paragraph>
</tablecell>
</tablerow>
@@ -192,12 +187,12 @@
<section id="syflaechenstil">
<table id="tbl_id3157320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154154" xml-lang="en-US">
<image id="img_id3145152" src="media/helpimg/swh00117.png" width="2.0835inch"
height="0.2398inch"><alt id="alt_id3145152" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150650" xml-lang="en-US">Area Style /
Filling</paragraph>
</tablecell>
</tablerow>
@@ -207,12 +202,12 @@
<section id="syvertikaloben">
<table id="tbl_id3147352">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US">
<image id="img_id3147502" src="cmd/sc_aligntop.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3147502" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148557" xml-lang="en-US">Align
Top</paragraph>
</tablecell>
</tablerow>
@@ -222,12 +217,12 @@
<section id="syvertikalunten">
<table id="tbl_id3145271">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US">
<image id="img_id3150410" src="cmd/sc_cellvertbottom.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3150410" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US">Align
Bottom</paragraph>
</tablecell>
</tablerow>
@@ -237,12 +232,12 @@
<section id="syvertikalmitte">
<table id="tbl_id3145590">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153097" xml-lang="en-US">
<image id="img_id3153363" src="cmd/sc_alignvcenter.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3153363" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150873" xml-lang="en-US">Align Center
Vertically</paragraph>
</tablecell>
</tablerow>
@@ -252,12 +247,12 @@
<section id="syhinzufuegen">
<table id="tbl_id3147326">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US">
<image id="img_id3159123" src="svx/res/nu01.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3159123" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147418"
xml-lang="en-US">Apply</paragraph>
</tablecell>
</tablerow>
@@ -267,12 +262,12 @@
<section id="syentfernen">
<table id="tbl_id3163717">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US">
<image id="img_id3145364" src="svx/res/nu02.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3145364" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148617"
xml-lang="en-US">Cancel</paragraph>
</tablecell>
</tablerow>
@@ -281,12 +276,12 @@
</section>
<table id="tbl_id3153845">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US">
<image id="img_id3154096" src="svtools/res/up_small.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3154096" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US">Up One
Level</paragraph>
</tablecell>
</tablerow>
@@ -294,12 +289,12 @@
<table id="tbl_id3155850">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149412" xml-lang="en-US">
<image id="img_id3153279" src="fpicker/res/fp014.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3153279" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154064" xml-lang="en-US">Create New
Directory</paragraph>
</tablecell>
</tablerow>
@@ -308,12 +303,12 @@
<section id="syuebergeordneterordner2">
<table id="tbl_id3159130">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153221" xml-lang="en-US">
<image id="img_id3153334" src="svtools/res/up_small.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3153334" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145646" xml-lang="en-US">Up One
Level</paragraph>
</tablecell>
</tablerow>
@@ -323,12 +318,12 @@
<section id="syneuenordnererstellen2">
<table id="tbl_id3153203">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US">
<image id="img_id3148833" src="fpicker/res/fp014.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3148833" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153005" xml-lang="en-US">Create New
Folder</paragraph>
</tablecell>
</tablerow>
@@ -338,12 +333,12 @@
<section id="nopfli">
<table id="tbl_id3146900">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156361" xml-lang="en-US">
<image id="img_id3150656" src="res/sc06301.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3150656" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US"><ahelp
hid=".">Go to the previous comment</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -353,12 +348,12 @@
<section id="nopfre">
<table id="tbl_id3148481">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151357" xml-lang="en-US">
<image id="img_id3154363" src="res/sc06300.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3154363" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US"><ahelp
hid=".">Go to the next comment</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -368,12 +363,12 @@
<section id="syopenfile">
<table id="tbl_id3148914">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3083285" xml-lang="en-US">
<image id="img_id3147100" src="cmd/sc_open.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3147100" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US">Open
File</paragraph>
</tablecell>
</tablerow>
@@ -383,12 +378,12 @@
<section id="sysichern">
<table id="tbl_id3145151">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151189" xml-lang="en-US">
<image id="img_id3156318" src="cmd/sc_saveas.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3156318" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US">Save
As</paragraph>
</tablecell>
</tablerow>
@@ -398,12 +393,12 @@
<section id="pdf">
<table id="tbl_id3145295">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152946" xml-lang="en-US">
<image id="img_id3155904" src="cmd/sc_exportdirecttopdf.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3155904" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US">Export
Directly as PDF</paragraph>
</tablecell>
</tablerow>
diff --git a/source/text/shared/guide/redlining.xhp
b/source/text/shared/guide/redlining.xhp
index 4cd60155b..724029a74 100644
--- a/source/text/shared/guide/redlining.xhp
+++ b/source/text/shared/guide/redlining.xhp
@@ -33,17 +33,17 @@
<bookmark_value>review function; recording changes
example</bookmark_value>
<bookmark_value>Track Changes, see review function</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3150499" role="heading"
level="1"><variable id="redlining"><link href="text/shared/guide/redlining.xhp"
name="Recording and Displaying Changes">Recording and Displaying Changes</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id4013794" role="note">The review
function is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
+<h1 id="hd_id3150499"><variable id="redlining"><link
href="text/shared/guide/redlining.xhp" name="Recording and Displaying
Changes">Recording and Displaying Changes</link>
+</variable></h1>
+ <note id="par_id4013794">The review function is available in
%PRODUCTNAME for text documents and spreadsheet documents.</note>
<paragraph xml-lang="en-US" id="par_id3153681" role="paragraph">When
several authors are working on the same text or spreadsheet, the review
function records and displays who made the various changes. On the final edit
of the document, it is then possible to look at each individual change and
decide whether it should be accepted or rejected.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147008" role="paragraph">For
example: You are an editor and are delivering your latest report. But before
publication the report must be read by the senior editor and the proofreader,
and both will add their changes. The senior editor writes "clarify" after one
paragraph and crosses out another entirely. The proofreader corrects the
spelling of your document.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph">The
edited document comes back to you, and you can incorporate or ignore the
suggestions of the two reviewers.</paragraph>
<paragraph xml-lang="en-US" id="par_id3146957" role="paragraph">Let's
say you also emailed a copy of the report to a good friend and colleague who
has done research on a similar topic in the past. You asked for a few
suggestions, and the document is now returned by email with your colleague's
suggestions.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147088" role="paragraph">As all
your colleagues and the managers in your company work with $[officename], you
can produce a final version of the document from the results you get
back.</paragraph>
- <embed href="text/shared/00/00000004.xhp#related"/>
+ <section id="relatedtopics">
<switch select="appl">
- <case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+ <case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
</switch>
<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
@@ -51,5 +51,6 @@
<embed
href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
<embed
href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/redlining_accept.xhp
b/source/text/shared/guide/redlining_accept.xhp
index fa791afcb..dbfea1cae 100644
--- a/source/text/shared/guide/redlining_accept.xhp
+++ b/source/text/shared/guide/redlining_accept.xhp
@@ -30,12 +30,12 @@
<bookmark xml-lang="en-US" branch="index"
id="bm_id3150247"><bookmark_value>changes; accepting or
rejecting</bookmark_value>
<bookmark_value>review function;accepting or rejecting changes</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150247" xml-lang="en-US"
level="1"><variable id="redlining_accept"><link
href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting
Changes">Accepting or Rejecting Changes</link>
-</variable></paragraph>
+<h1 id="hd_id3150247"><variable id="redlining_accept"><link
href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting
Changes">Accepting or Rejecting Changes</link>
+</variable></h1>
<paragraph role="paragraph" id="par_id1491134" xml-lang="en-US">The review
function is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_id1110200810120034" xml-lang="en-US">In Writer
text documents you can also accept or reject changes by choosing commands from
the context menu.</paragraph>
+<note id="par_id1110200810120034">In Writer text documents you can also accept
or reject changes by choosing commands from the context menu.</note>
</case>
</switch>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US">When you edit
a document in which others have made changes, you can accept or reject the
changes individually or all together.</paragraph>
diff --git a/source/text/shared/guide/redlining_doccompare.xhp
b/source/text/shared/guide/redlining_doccompare.xhp
index 996b16409..3f9161a4d 100644
--- a/source/text/shared/guide/redlining_doccompare.xhp
+++ b/source/text/shared/guide/redlining_doccompare.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_doccomparexml" indexer="include"
status="PUBLISH">
@@ -36,9 +33,9 @@
<bookmark_value>changes;comparing to original</bookmark_value>
<bookmark_value>review function; comparing documents</bookmark_value>
</bookmark><comment>mw made "comparing..." a two level entry</comment>
-<paragraph role="heading" id="hd_id3154788" xml-lang="en-US"
level="1"><variable id="redlining_doccompare"><link
href="text/shared/guide/redlining_doccompare.xhp" name="Comparing Versions of a
Document">Comparing Versions of a Document</link>
-</variable></paragraph>
-<paragraph role="note" id="par_id4186223" xml-lang="en-US">The review function
is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
+<h1 id="hd_id3154788"><variable id="redlining_doccompare"><link
href="text/shared/guide/redlining_doccompare.xhp" name="Comparing Versions of a
Document">Comparing Versions of a Document</link>
+</variable></h1>
+<note id="par_id4186223">The review function is available in %PRODUCTNAME for
text documents and spreadsheet documents.</note>
<paragraph role="paragraph" id="par_id3995178" xml-lang="en-US">Imagine you
have some co-authors or reviewers who collaborate with you writing your
original document. One day you send out copies of your document to all
reviewers. You ask them to edit the copy and send it back.</paragraph>
<paragraph role="paragraph" id="par_id9948423" xml-lang="en-US">Normally, the
reviewers enable change tracking by <emph>Edit - Track Changes - Record</emph>
and you can easily see the changes.</paragraph>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US">If one of the
authors has made changes to a document without recording them, you can compare
the changed document to your original document.</paragraph>
@@ -56,7 +53,7 @@
<paragraph role="listitem" id="par_id3145674" xml-lang="en-US">You can now
accept or reject the insertions and deletions. At the end you may save the
reviewer's document as a new original with a new name.</paragraph>
</listitem>
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<switch select="appl">
<case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
@@ -65,5 +62,6 @@
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/redlining_docmerge.xhp
b/source/text/shared/guide/redlining_docmerge.xhp
index 0716d545c..3a31a80dc 100644
--- a/source/text/shared/guide/redlining_docmerge.xhp
+++ b/source/text/shared/guide/redlining_docmerge.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_docmergexml" indexer="include"
status="PUBLISH">
@@ -34,9 +31,9 @@
<bookmark_value>merging; documents</bookmark_value>
<bookmark_value>versions;merging document versions</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3154230" xml-lang="en-US"
level="1"><variable id="redlining_docmerge"><link
href="text/shared/guide/redlining_docmerge.xhp" name="Merging Versions">Merging
Versions</link>
-</variable></paragraph>
-<paragraph role="note" id="par_id2136295" xml-lang="en-US">The review function
is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
+<h1 id="hd_id3154230"><variable id="redlining_docmerge"><link
href="text/shared/guide/redlining_docmerge.xhp" name="Merging Versions">Merging
Versions</link>
+</variable></h1>
+<note id="par_id2136295">The review function is available in %PRODUCTNAME for
text documents and spreadsheet documents.</note>
<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US">When a
document has been edited by more than one person, it is possible to merge the
edited copies into the original. The only requirement is that the documents
differ only and exclusively in the recorded changes - all other original text
must be identical.</paragraph>
<list type="ordered">
<listitem>
@@ -53,7 +50,7 @@
<paragraph role="listitem" id="par_id3154749" xml-lang="en-US">After you merge
the documents you will see the recorded changes from the copy in the original
document.</paragraph>
</listitem>
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<switch select="appl">
<case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
@@ -62,5 +59,6 @@
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/redlining_enter.xhp
b/source/text/shared/guide/redlining_enter.xhp
index a04318a93..397aa4fdf 100644
--- a/source/text/shared/guide/redlining_enter.xhp
+++ b/source/text/shared/guide/redlining_enter.xhp
@@ -32,9 +32,9 @@
<bookmark_value>comments; on changes</bookmark_value>
<bookmark_value>review function;tracking changes</bookmark_value>
</bookmark><comment>UFI: deleted index review function;recording
changes</comment><comment>MW changed "settings;tracking changes" </comment>
-<paragraph xml-lang="en-US" id="hd_id3155364" role="heading"
level="1"><variable id="redlining_enter"><link
href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording
Changes</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id7271645" role="note">The review
function is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
+<h1 id="hd_id3155364"><variable id="redlining_enter"><link
href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording
Changes</link>
+</variable></h1>
+ <note id="par_id7271645">The review function is available in
%PRODUCTNAME for text documents and spreadsheet documents.</note>
<paragraph xml-lang="en-US" id="par_id3145669" role="paragraph">Not all
changes are recorded. For example, the changing of a tab stop from align left
to align right is not recorded. However, all usual changes made by a
proofreader are recorded, such as additions, deletions, text alterations, and
usual formatting.</paragraph>
<table id="tbl_id3147399">
<tablerow>
@@ -68,7 +68,7 @@
<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US">To stop
recording changes, choose <emph>Edit - Track Changes - Record</emph> again. The
check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US">In a text
document, you can highlight all lines that you have changed with an additional
colored marking. This can be in the form of a red line in the margin, for
example.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US">To change the
settings for tracking changes, choose <switchinline select="sys"><caseinline
select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME
Writer</emph> - <link href="text/shared/optionen/01040700.xhp"
name="Changes"><emph>Changes</emph></link> or on the <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc</emph>
- <link href="text/shared/optionen/01060600.xhp"
name="Changes"><emph>Changes</emph></link>.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<switch select="appl">
<case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
@@ -77,5 +77,6 @@
<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/redlining_navigation.xhp
b/source/text/shared/guide/redlining_navigation.xhp
index 044db6b3b..455005b6c 100644
--- a/source/text/shared/guide/redlining_navigation.xhp
+++ b/source/text/shared/guide/redlining_navigation.xhp
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
/*
* Copyright 2012 LibreOffice contributors.
@@ -23,16 +22,16 @@
<bookmark_value>changes; navigating</bookmark_value>
<bookmark_value>review function; navigating changes</bookmark_value>
</bookmark>
- <paragraph id="par_id3153880" role="heading" xml-lang="en-US"
level="1"><variable id="redlining_navigation"><link
href="text/shared/guide/redlining_navigation.xhp" name="Navigating
Changes">Navigating Changes</link></variable></paragraph>
- <paragraph id="par_id3153881" role="note" xml-lang="en-US">This
feature is Writer-specific.</paragraph>
+ <h1 id="par_id3153880"><variable id="redlining_navigation"><link
href="text/shared/guide/redlining_navigation.xhp" name="Navigating
Changes">Navigating Changes</link></variable></h1>
+ <note id="par_id3153881">This feature is Writer-specific.</note>
<paragraph id="par_id3153882" role="paragraph" xml-lang="en-US">There
are two available commands to navigate changes in a Writer document:</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:NextTrackedChange"
id="bm_next_tracked_change" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/.uno:PreviousTrackedChange"
id="bm_previous_tracked_change" localize="false"/>
<list type="unordered">
<listitem>
- <bookmark xml-lang="en-US" branch="hid/.uno:NextTrackedChange"
id="bm_next_tracked_change" localize="false"/>
<paragraph id="par_id3153883" role="listitem"
xml-lang="en-US"><emph>Edit - Track Changes - Next</emph>: <ahelp
hid=".uno:NextTrackedChange">Jumps to and selects the next change in the
document, if any.</ahelp></paragraph>
</listitem>
<listitem>
- <bookmark xml-lang="en-US"
branch="hid/.uno:PreviousTrackedChange" id="bm_previous_tracked_change"
localize="false"/>
<paragraph id="par_id3153884" role="listitem"
xml-lang="en-US"><emph>Edit - Track Changes - Previous</emph>: <ahelp
hid=".uno:PreviousTrackedChange">Jumps to and selects the previous change in
the document, if any.</ahelp></paragraph>
</listitem>
</list>
diff --git a/source/text/shared/guide/redlining_protect.xhp
b/source/text/shared/guide/redlining_protect.xhp
index 1b62482f7..014357029 100644
--- a/source/text/shared/guide/redlining_protect.xhp
+++ b/source/text/shared/guide/redlining_protect.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_protectxml" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">Protecting Records</title>
@@ -29,18 +24,18 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index"
id="bm_id3159201"><bookmark_value>changes; protecting</bookmark_value>
<bookmark_value>protecting; recorded changes</bookmark_value>
<bookmark_value>records; protecting</bookmark_value>
<bookmark_value>review function;protecting records</bookmark_value>
</bookmark>
<comment>mw added an index entry</comment>
- <paragraph xml-lang="en-US" id="hd_id3159201" role="heading"
level="1"><variable id="redlining_protect"><link
href="text/shared/guide/redlining_protect.xhp" name="Protecting
Changes">Protecting Changes</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id1631824" role="note">The review
function is available in %PRODUCTNAME for text documents and spreadsheet
documents.</paragraph>
+ <h1 id="hd_id3159201"><variable id="redlining_protect"><link
href="text/shared/guide/redlining_protect.xhp" name="Protecting
Changes">Protecting Changes</link>
+</variable></h1>
+ <note id="par_id1631824">The review function is available in %PRODUCTNAME
for text documents and spreadsheet documents.</note>
<paragraph xml-lang="en-US" id="par_id3154751" role="paragraph">To protect
the changes made in a document during editing, choose <emph>Edit - Track
Changes - Protect</emph>. To turn off the function or to accept or reject
changes it is necessary to enter the correct password first.</paragraph>
<list type="ordered">
<listitem>
@@ -50,7 +45,7 @@
<paragraph xml-lang="en-US" id="par_id3153345" role="listitem">Enter a
password consisting of at least one character and confirm it. Click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
- <embed href="text/shared/00/00000004.xhp#related"/>
+ <section id="relatedtopics">
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<switch select="appl">
<case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
@@ -59,5 +54,6 @@
<embed
href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/redlining_versions.xhp
b/source/text/shared/guide/redlining_versions.xhp
index a888cbdab..8b86ac495 100644
--- a/source/text/shared/guide/redlining_versions.xhp
+++ b/source/text/shared/guide/redlining_versions.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_versionsxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Version Management</title>
@@ -33,13 +28,12 @@
<bookmark_value>documents; version management</bookmark_value>
<bookmark_value>version management</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3154230" xml-lang="en-US"
level="1"><variable id="redlining_versions"><link
href="text/shared/guide/redlining_versions.xhp" name="Version
Management">Version Management</link>
-</variable></paragraph>
+<h1 id="hd_id3154230"><variable id="redlining_versions"><link
href="text/shared/guide/redlining_versions.xhp" name="Version
Management">Version Management</link>
+</variable></h1>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US">The
<emph>File</emph> menu contains a <link href="text/shared/01/01190000.xhp"
name="Versions"><emph>Versions</emph></link> command that enables you to save
multiple versions of a document in the same file.</paragraph>
<paragraph role="paragraph" id="par_id3149399" xml-lang="en-US">You can choose
to view individual versions of a document, or you can display the differences
between versions with color markings.</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US">In the dialog
to open a document, you can select from a combo box which version of this
document you want to open.</paragraph>
<section id="relatedtopics">
-<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<switch select="appl">
<case select="WRITER"><embed
href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
diff --git a/source/text/shared/optionen/01040800.xhp
b/source/text/shared/optionen/01040800.xhp
new file mode 100644
index 000000000..d3f82c5c6
--- /dev/null
+++ b/source/text/shared/optionen/01040800.xhp
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<meta>
+ <topic id="writercomparisonoptions" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Comparison Options</title>
+ <filename>/text/shared/optionen/01040800.xhp</filename>
+ </topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id481597340419434">
+ <bookmark_value>document comparison;options</bookmark_value>
+ <bookmark_value>comparison;automatic</bookmark_value>
+ <bookmark_value>comparison;by word</bookmark_value>
+ <bookmark_value>comparison;by character</bookmark_value>
+ <bookmark_value>document comparison;random ID</bookmark_value>
+</bookmark>
+<section id="comparisonoption">
+ <bookmark id="bm_id491597320214148" xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/OptComparison" localize="false"/>
+ <h1 id="hd_id801597320214148"><variable id="comparisonoptionh1"><link
href="text/shared/optionen/01040800.xhp" name="Comparison">Document Comparison
Options</link></variable></h1>
+ <paragraph id="par_id761597320214148" role="paragraph">Defines the
comparison options for the document.</paragraph>
+</section>
+<embed href="text/shared/need_help.xhp#needhelp"/>
+<section id="howtoget">
+ <paragraph role="paragraph" id="par_id101597332748471">Open a text
document, choose <switchinline select="sys"><caseinline
select="MAC"><menuitem>%PRODUCTNAME -
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools -
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME
Writer - Comparison</menuitem>.</paragraph>
+</section>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcomparison/auto"
id="bm_id281597339608371" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/byword" id="bm_id251597339615074"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/bycharacter"
id="bm_id411597339702192" localize="false"/>
+<h2 id="hd_id421597320817511">Compare documents</h2>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id821597320851919"
role="listitem"><emph>Automatic</emph>: Uses traditional algorithm for document
comparison (default).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id771597320878668" role="listitem"><emph>By
word</emph>: compares documents segmenting contents word by word.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id431597320905536" role="listitem"><emph>By
characters</emph>: compares documents segmenting contents character by
character. You can define the minimal number of character for the
comparison.</paragraph>
+ </listitem>
+</list>
+
+<h2 id="hd_id521597320824763">Random Number to improve accuracy of document
comparison</h2>
+ <paragraph role="paragraph" id="par_id411597332706569">Introduce an
identifier to improve accuracy of document comparison when done by word or by
characters.</paragraph>
+ <note id="par_id631597333767341">These options are enabled when the Compare
documents options are by words or by characters.</note>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/useRSID" id="bm_id881597339774766"
localize="false"/>
+<h3 id="hd_id601597323591520">Take it into account when comparing</h3>
+ <paragraph role="paragraph" id="par_id191597335836486">Activates the
document comparison using By word and By character options.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/ignore" id="bm_id271597339816767"
localize="false"/>
+<h3 id="hd_id1001597323596761">Ignore pieces of length</h3>
+ <paragraph role="paragraph" id="par_id751597333853235">Set the minimum
number of characters to trigger a valid comparison.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcomparison/storeRSID"
id="bm_id191597339851120" localize="false"/>
+<h3 id="hd_id291597323603653">Store it when changing the document</h3>
+ <paragraph role="paragraph" id="par_id421597332757267">Stores the random
number in the document.</paragraph>
+</body>
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
