tdf#135686 Refactor TSA Help page

+ other refactoring in Options

Change-Id: Idb0fe9dbf335f37d41cf2f7e43c8f4ff96dfd819
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100761
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

9 files changed, 121 insertions, 50 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 92c720da53..2f757db991 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -372,6 +372,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/signexistingpdf \
     helpcontent2/source/text/shared/01/securitywarning \
     helpcontent2/source/text/shared/01/selectcertificate \
+    helpcontent2/source/text/shared/01/timestampauth \
     helpcontent2/source/text/shared/01/webhtml \
     helpcontent2/source/text/shared/01/xformsdata \
     helpcontent2/source/text/shared/01/xformsdataadd \
@@ -516,6 +517,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/02/flowcharts \
     helpcontent2/source/text/shared/02/fontwork \
     helpcontent2/source/text/shared/02/limit \
+    helpcontent2/source/text/shared/02/namedialog \
     helpcontent2/source/text/shared/02/paintbrush \
     helpcontent2/source/text/shared/02/querypropdlg \
     helpcontent2/source/text/shared/02/stars \
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index 3e0efb2e69..fabd5d58ad 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -41,18 +41,19 @@
 <topic id="shared/text/shared/optionen/01000000.xhp">Options</topic>
 <topic id="shared/text/shared/optionen/01010100.xhp">User Data</topic>
 <topic id="shared/text/shared/optionen/01010200.xhp">General</topic>
-<topic id="shared/text/shared/optionen/01010300.xhp">Paths</topic>
-<topic id="shared/text/shared/optionen/01010400.xhp">Writing Aids</topic>
-<topic id="shared/text/shared/optionen/01010600.xhp">General</topic>
-<topic id="shared/text/shared/optionen/01010700.xhp">Fonts</topic>
 <topic id="shared/text/shared/optionen/01010800.xhp">View</topic>
 <topic id="shared/text/shared/optionen/01010900.xhp">Print Options</topic>
+<topic id="shared/text/shared/optionen/01010300.xhp">Paths</topic>
+<topic id="shared/text/shared/optionen/01010700.xhp">Fonts</topic>
+<topic id="shared/text/shared/optionen/01030300.xhp">Security</topic>
 <topic id="shared/text/shared/optionen/01012000.xhp">Application Colors</topic>
 <topic id="shared/text/shared/optionen/01013000.xhp">Accessibility</topic>
 <topic id="shared/text/shared/optionen/java.xhp">Advanced</topic>
 <topic id="shared/text/shared/optionen/expertconfig.xhp">Expert Configuration</topic>
 <topic id="shared/text/shared/optionen/BasicIDE.xhp">Basic IDE</topic>
 <topic id="shared/text/shared/optionen/opencl.xhp">OpenCL</topic>
+<topic id="shared/text/shared/optionen/01010400.xhp">Writing Aids</topic>
+<topic id="shared/text/shared/optionen/01010600.xhp">General</topic>
 <topic id="shared/text/shared/optionen/01020000.xhp">Load/Save options</topic>
 <topic id="shared/text/shared/optionen/01030000.xhp">Internet options</topic>
 <topic id="shared/text/shared/optionen/01040000.xhp">Text Document Options</topic>
@@ -108,6 +109,7 @@
                     <topic id="shared/text/shared/guide/digital_signatures.xhp">About Digital Signatures</topic>
                     <topic id="shared/text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</topic>
                     <topic id="shared/text/shared/01/ref_pdf_export_digital_signature.xhp">Digital Signatures in PDF Exports</topic>
+                    <topic id="shared/text/shared/01/timestampauth.xhp">Time Stamp Authorities</topic>
                     <topic id="shared/text/shared/01/signexistingpdf.xhp">Signing Existing PDFs</topic>
                     <topic id="swriter/text/shared/01/addsignatureline.xhp">Adding Signature Lines in Text Documents</topic>
                     <topic id="swriter/text/shared/01/signsignatureline.xhp">Signing Signature Lines in Text Documents</topic>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index 22a53eefea..6c83e692dc 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -260,10 +260,12 @@
 <section id="optionsbuttons">
 <h2 id="hd_id631527692833772">Options dialog buttons</h2>
 <h3 id="hd_id831527692839432">OK</h3>
-  <paragraph role="paragraph" id="par_id471527692844934" xml-lang="en-US">Save the changes in the page and close the Options dialog.</paragraph>
+<paragraph role="paragraph" id="par_id471527692844934" xml-lang="en-US">Save the changes in the page and close the Options dialog.</paragraph>
 <h3 id="hd_id261527692850720">Cancel</h3>
-  <paragraph role="paragraph" id="par_id571527692855533" xml-lang="en-US">Close the Options dialog and discard all changes done.</paragraph>
-    <embed href="text/shared/00/00000001.xhp#reset"/>
+<paragraph role="paragraph" id="par_id571527692855533" xml-lang="en-US">Close the Options dialog and discard all changes done.</paragraph>
+<h3 id="hd_id321597440555403">Apply</h3>
+<paragraph role="paragraph" id="par_id51597440622057">Applies the modified or selected values without closing the Options dialog.</paragraph>
+<embed href="text/shared/00/00000001.xhp#reset"/>
 <section id="optionsbuttonwarn01">
 <warning id="par_id261527693436801">Some options cannot be reset once edited. Either edit back the changes manually or click <emph>Cancel</emph> and reopen the <emph>Options</emph> dialog.</warning>
 </section>
diff --git a/source/text/shared/01/05200200.xhp b/source/text/shared/01/05200200.xhp
index 24a6feb0be..9d7192573e 100644
--- a/source/text/shared/01/05200200.xhp
+++ b/source/text/shared/01/05200200.xhp
@@ -30,50 +30,46 @@
 <section id="linienstile">
 <bookmark xml-lang="en-US" branch="hid/CUI_HID_LINE_DEF" id="bm_id3150467" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/@@nowidget@@" id="bm_id3150467" localize="false"/>
-<paragraph role="heading" id="hd_id3148919" xml-lang="en-US" level="1"><link href="text/shared/01/05200200.xhp" name="Line Styles">Line Styles</link></paragraph>
+<h1 id="hd_id3148919"><link href="text/shared/01/05200200.xhp" name="Line Styles">Line Styles</link></h1>
 <paragraph role="paragraph" id="par_id3150146" xml-lang="en-US"><ahelp hid="HID_LINE_DEF">Edit or create dashed or dotted line styles.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00040502.xhp#linienstile"/>
 </section>
-<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2">Properties</paragraph>
+<h2 id="hd_id3147617">Properties</h2>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/LB_LINESTYLES" id="bm_id3147212" localize="false"/>
-<paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="3">Line style</paragraph>
+<h3 id="hd_id3146873">Line style</h3>
 <paragraph role="paragraph" id="par_id3146807" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/LB_LINESTYLES">Select the style of line that you want to create.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/LB_TYPE_1" id="bm_id3151097" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/LB_TYPE_2" id="bm_id3152895" localize="false"/>
-<paragraph role="heading" id="hd_id3149948" xml-lang="en-US" level="3">Type</paragraph>
+<h3 id="hd_id3149948">Type</h3>
 <paragraph role="paragraph" id="par_id3149031" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/LB_TYPE_2">Select the combination of dashes and dots that you want.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/NUM_FLD_1" id="bm_id3146067" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/NUM_FLD_2" id="bm_id3154230" localize="false"/>
-<paragraph role="heading" id="hd_id3148731" xml-lang="en-US" level="3">Number</paragraph>
+<h3 id="hd_id3148731">Number</h3>
 <paragraph role="paragraph" id="par_id3155351" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/NUM_FLD_2">Enter the number of times that you want a dot or a dash to appear in a sequence.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/MTR_FLD_LENGTH_1" id="bm_id3153935" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/MTR_FLD_LENGTH_2" id="bm_id3149283" localize="false"/>
-<paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="3">Length</paragraph>
+<h3 id="hd_id3154422">Length</h3>
 <paragraph role="paragraph" id="par_id3149640" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/MTR_FLD_LENGTH_2">Enter the length of the dash.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/MTR_FLD_DISTANCE" id="bm_id3156414" localize="false"/>
-<paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="3">Spacing</paragraph>
+<h3 id="hd_id3093440">Spacing</h3>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/MTR_FLD_DISTANCE">Enter the amount of space that you want to leave between dots or dashes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/CBX_SYNCHRONIZE" id="bm_id3147250" localize="false"/>
-<paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="3">Fit to line width</paragraph>
+<h3 id="hd_id3155805">Fit to line width</h3>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/CBX_SYNCHRONIZE">Automatically adjusts the entries relative to the length of the line.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/BTN_ADD" id="bm_id3152551" localize="false"/>
-<paragraph role="heading" id="hd_id3155355" xml-lang="en-US" level="2">Add</paragraph>
-<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/BTN_ADD">Creates a new line style using the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/namedialog/NameDialog" id="bm_id3145313" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/namedialog/@@nowidget@@" id="bm_id3145313" localize="false"/>
-<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US"><ahelp hid=".">Enter a name.</ahelp></paragraph>
+<h2 id="hd_id3155355">Add</h2>
+<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/BTN_ADD">Creates a new line style using the current settings.</ahelp> Enter a name for the new line style.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/BTN_MODIFY" id="bm_id3147011" localize="false"/>
-<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2">Modify</paragraph>
+<h2 id="hd_id3155893">Modify</h2>
 <paragraph role="paragraph" id="par_id3157863" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/BTN_LOAD" id="bm_id3149812" localize="false"/>
-<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2">Load line style table</paragraph>
+<h2 id="hd_id3147275">Load line style table</h2>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/BTN_LOAD">Imports a list of line styles.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/linestyletabpage/BTN_SAVE" id="bm_id3149579" localize="false"/>
-<paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2">Save line style table</paragraph>
+<h2 id="hd_id3148642">Save line style table</h2>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US"><ahelp hid="cui/ui/linestyletabpage/BTN_SAVE">Saves the current list of line styles, so that you can load it again later.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 </body>
diff --git a/source/text/shared/01/ref_pdf_export_digital_signature.xhp b/source/text/shared/01/ref_pdf_export_digital_signature.xhp
index c395f805b1..8fff630a00 100644
--- a/source/text/shared/01/ref_pdf_export_digital_signature.xhp
+++ b/source/text/shared/01/ref_pdf_export_digital_signature.xhp
@@ -19,6 +19,7 @@
     <bookmark xml-lang="en-US" branch="index" id="bm_id761574111929927">
 <bookmark_value>PDF export;digital signature</bookmark_value>
 <bookmark_value>PDF export;sign PDF document</bookmark_value>
+<bookmark_value>PDF export;time stamp</bookmark_value>
     </bookmark>
     <section id="pdfexportdigitalsignature">
         <bookmark xml-lang="en-US" branch="hid/filter/ui/pdfsignpage/pdfsignpage" id="bm_id18720359" localize="false"/>
@@ -69,11 +70,8 @@
     <paragraph id="par_id11371501" role="paragraph" xml-lang="en-US"><ahelp hid=".">These three fields allow you to optionally enter additional information about the digital signature that will be applied to the PDF (Where, by whom and why it was made). It will be embedded in the appropriate PDF fields and will be visible to anyone viewing the PDF. Each or all of the three fields may be left blank.</ahelp></paragraph>
     <bookmark xml-lang="en-US" branch="hid/filter/ui/pdfsignpage/tsa" id="bm_id18849147" localize="false"/>
 
-    <h3 id="hd_id14661702">Time Stamp Authority</h3>
-    <paragraph id="par_id17868892" role="paragraph" xml-lang="en-US"><ahelp hid=".">Allows you to optionally select a Time Stamping Authority (TSA) URL. </ahelp></paragraph>
+    <h2 id="hd_id741597437077367" localize="false"><embedvar href="text/shared/01/timestampauth.xhp#timestampauthorityh1"/></h2>
     <paragraph id="par_id29089022" role="paragraph" xml-lang="en-US">During the PDF signing process, the TSA will be used to obtain a digitally signed timestamp that is then embedded in the signature. This (RFC 3161) timestamp will allow anyone viewing the PDF to verify when the document was signed.</paragraph>
-    <paragraph id="par_id39089022" role="paragraph" xml-lang="en-US">The list of TSA URLs that can be selected is maintained under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
-                </caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - Security - TSAs</emph>.</paragraph>
     <paragraph id="par_id49089022" role="paragraph" xml-lang="en-US">If no TSA URL is selected (the default), the signature will not be timestamped, but will use the current time from your local computer.</paragraph>
     <section id="relatedtopics">
         <paragraph role="paragraph" id="par_id421574099757770" localize="false"><embedvar href="text/shared/01/ref_pdf_export_general.xhp#pdfexportgeneralh1"/></paragraph>
diff --git a/source/text/shared/01/timestampauth.xhp b/source/text/shared/01/timestampauth.xhp
new file mode 100644
index 0000000000..1310a3cf8e
--- /dev/null
+++ b/source/text/shared/01/timestampauth.xhp
@@ -0,0 +1,48 @@
+<?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="timestampauthoityhelp" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Time Stamp Authorities for Digital Signatures</title>
+    <filename>/text/shared/01/timestampauth.xhp</filename>
+  </topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id371597437796483">
+    <bookmark_value>time stamp;digital signature</bookmark_value>
+    <bookmark_value>digital signature;time stamp</bookmark_value>
+    <bookmark_value>time stamp authority</bookmark_value>
+    <bookmark_value>time stamp for PDF digital signature</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/tsaurldialog/TSAURLDialog" id="bm_id251597347799541" localize="false"/>
+<section id="timestampauthority">
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/tsas" id="bm_id37269201" localize="false"/>
+    <h1 id="hd_id901597433114069"><variable id="timestampauthorityh1"><link href="text/shared/01/timestampauth.xhp" name="tsa">Time Stamp Authority</link></variable></h1>
+    <paragraph id="par_id961597433114070" role="paragraph" xml-lang="en-US">Time Stamp Authorities (TSA) issue digitally signed timestamps (RFC 3161) that are optionally used during signed PDF export.</paragraph>
+</section>
+<paragraph role="paragraph" id="par_id571597434502189">Adding a trusted timestamp to an electronic signature provides a digital seal of data integrity and a trusted date and time of when the transaction took place. Recipients of documents with a trusted timestamp can verify when the document was digitally or electronically signed, as well as verify that the document was not altered after the date the timestamp vouches for.</paragraph>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id721597436315261">Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Security - TSAs</menuitem></paragraph>
+</section>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/tsaurldialog/urls"  id="bm_id171597438540975" localize="false"/>
+<h2 id="hd_id281597438357127">List of Time Stamp Authorities</h2>
+<paragraph role="paragraph" id="par_id701597438367251">Display the list of existing TSAs.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/tsaurldialog/add" id="bm_id921597438563568" localize="false"/>
+<h2 id="par_idN106871">Add</h2>
+<paragraph role="paragraph" id="par_idN1068B1" xml-lang="en-US">Opens the <link href="text/shared/02/namedialog.xhp" name="name dialog">Name dialog</link> to enter a new Time Stamping Authority URL.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/tsaurldialog/delete" id="bm_id541597438602560" localize="false"/>
+<h2 id="hd_id251597435168013">Delete</h2>
+  <paragraph role="paragraph" id="par_id381597435161810">Deletes the selected entry in the list. Deletion is immediate and does not display a confirmation dialog.</paragraph>
+<section id="relatedtopics">
+   <embed href="text/shared/01/ref_pdf_export_digital_signature.xhp#pdfexportdigitalsignatureh1"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/02/namedialog.xhp b/source/text/shared/02/namedialog.xhp
new file mode 100644
index 0000000000..4bb6b0438d
--- /dev/null
+++ b/source/text/shared/02/namedialog.xhp
@@ -0,0 +1,27 @@
+<?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="namedialoghelp" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Enter Name</title>
+    <filename>/text/shared/02/namedialog.xhp</filename>
+  </topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/namedialog/NameDialog" id="bm_id3145313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/namedialog/name_entry" id="bm_id3445313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/namedialog/@@nowidget@@" id="bm_id3145313" localize="false"/>
+<section id="namedialog">
+<h1 id="hd_id581597430248366"><variable id="namedialogh1"><link href="text/shared/02/namedialog.xhp" name="Name">Enter Name Dialog</link></variable></h1>
+<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US">Enter a name or any requested text on the label.</paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/optionen/01000000.xhp b/source/text/shared/optionen/01000000.xhp
index 1481da4398..e6a74db8e3 100644
--- a/source/text/shared/optionen/01000000.xhp
+++ b/source/text/shared/optionen/01000000.xhp
@@ -33,43 +33,42 @@
          <bookmark_value>settings; program configuration</bookmark_value>
 </bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id8304653" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
+<h1 id="hd_id3153665"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></h1>
          <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN10607" role="note">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+      <note id="par_idN10607">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME.</note>
 <bookmark xml-lang="en-US" branch="hid/CUI_HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3125863" role="paragraph"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
       <section id="howtoget">
-         <embed href="text/shared/00/00000406.xhp#optionen"/>
-         <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note">Note for macOS users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your macOS main menu. Both menu entries open the Options dialog box.</paragraph>
+          <paragraph role="paragraph" id="par_id61597440155071"><switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline></paragraph>
      </section>
      <embed href="text/shared/00/00000001.xhp#optionsbuttons"/>
-      <paragraph role="heading" id="hd_id551527692881035" level="3" xml-lang="en-US">Help</paragraph>
+      <h3 id="hd_id551527692881035">Help</h3>
       <paragraph role="paragraph" id="par_id831527692885723" xml-lang="en-US">Opens the help contents for the Options page displayed.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
+      <h2 id="hd_id3159149"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></h2>
       <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
-      <paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
+      <h2 id="hd_id3145787"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></h2>
       <embed href="text/shared/optionen/01020000.xhp#laden"/>
-      <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
+      <h2 id="hd_id3153726"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></h2>
       <embed href="text/shared/optionen/01150000.xhp#typotext"/>
-      <paragraph xml-lang="en-US" id="hd_id3153188" role="heading" level="2"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
+      <h2 id="hd_id3153188"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></h2>
       <embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
-      <paragraph xml-lang="en-US" id="hd_id3150104" role="heading" level="2"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
+      <h2 id="hd_id3150104"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></h2>
       <embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
-      <paragraph xml-lang="en-US" id="hd_id3154918" role="heading" level="2"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
+      <h2 id="hd_id3154918"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></h2>
       <embed href="text/shared/optionen/01060000.xhp#allgemein"/>
-      <paragraph xml-lang="en-US" id="hd_id3153142" role="heading" level="2"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
+      <h2 id="hd_id3153142"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></h2>
       <embed href="text/shared/optionen/01070000.xhp#allgemein"/>
-      <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="2"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
+      <h2 id="hd_id3147434"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></h2>
       <embed href="text/shared/optionen/01080000.xhp#allgemein"/>
-      <paragraph xml-lang="en-US" id="hd_id3154732" role="heading" level="2"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
+      <h2 id="hd_id3154732"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></h2>
       <embed href="text/shared/optionen/01090000.xhp#druckentext"/>
-      <paragraph xml-lang="en-US" id="hd_id3149420" role="heading" level="2"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Base</link></paragraph>
+      <h2 id="hd_id3149420"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Base</link></h2>
       <embed href="text/shared/optionen/01160000.xhp#daten"/>
-      <paragraph xml-lang="en-US" id="hd_id3155418" role="heading" level="2"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
+      <h2 id="hd_id3155418"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></h2>
       <embed href="text/shared/optionen/01110000.xhp#farbe"/>
-      <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
+      <h2 id="hd_id3150872"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></h2>
       <embed href="text/shared/optionen/01030000.xhp#laden"/>
    </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp
index b56ff6d8f5..e20452937f 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -75,10 +75,7 @@
 <h3 id="par_idN1068E0">Certificate</h3>
 <paragraph role="paragraph" id="par_idN106920" xml-lang="en-US"><ahelp hid="cui/ui/optsecuritypage/cert">Opens the <emph>Certificate Path</emph> dialog.</ahelp></paragraph>
 </default></switch>
-<h2 id="par_idN106871">TSAs</h2>
-<paragraph role="paragraph" id="par_idN1068B1" xml-lang="en-US">Allows you to maintain a list of Time Stamping Authority (TSA) URLs. TSAs issue digitally signed timestamps (RFC 3161) that are optionally used during signed PDF export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/tsas" id="bm_id37269201" localize="false"/>
-<h3 id="par_idN1068E1">TSAs</h3>
-<paragraph role="paragraph" id="par_idN106921" xml-lang="en-US"><ahelp hid="cui/ui/optsecuritypage/tsas">Opens the <emph>Time Stamping Authority URLs</emph> dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/tsaurldialog/dialog-action_area1" id="bm_id251597347799541" localize="false"/>
+<embed href="text/shared/02/namedialog.xhp#timestampauthority"/>
 </body>
 </helpdocument>