source/text/shared/00/00000001.xhp       |   15 +++++++++++++--
 source/text/shared/optionen/01000000.xhp |   11 +++++++----
 source/text/shared/optionen/01010200.xhp |    2 ++
 source/text/shared/optionen/01010400.xhp |    2 ++
 source/text/shared/optionen/01010700.xhp |    7 ++++---
 source/text/shared/optionen/01020000.xhp |    1 +
 source/text/shared/optionen/01020100.xhp |    2 ++
 source/text/shared/optionen/01030300.xhp |   18 ++++++++++++------
 source/text/shared/optionen/01030500.xhp |    1 +
 source/text/shared/optionen/01110100.xhp |    1 +
 source/text/shared/optionen/01140000.xhp |    2 ++
 source/text/shared/optionen/java.xhp     |   12 +++++++-----
 12 files changed, 54 insertions(+), 20 deletions(-)

New commits:
commit a0b4db5f17e58f656d527b807e09ed02b04c2827
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
Date:   Wed May 30 18:30:50 2018 -0300

    tdf#58134 Some Options settings cannot be reset
    
    Add warnings in help pages when some options cannot be reset.
    
    This patch does not close the bug, which in some cases is a
    bug in the dialog controller.
    
    Change-Id: Ie6d0019a9c6611c2ad8784f593ceefa5748bf56b
    Reviewed-on: https://gerrit.libreoffice.org/55103
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/00/00000001.xhp 
b/source/text/shared/00/00000001.xhp
index 8e9696e4c..227348d3b 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -211,8 +211,8 @@
       </section>
       <section id="zurueck">
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optionsdialog/revert" 
id="bm_id4539933" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149670" role="heading" 
level="2">Back<comment>in Tools - Options</comment></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145068" 
role="paragraph"><ahelp hid="cui/ui/optionsdialog/revert">Resets modified 
values back to the $[officename] default values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149670" role="heading" 
level="2">Reset<comment>in Tools - Options</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3145068" role="paragraph"><ahelp 
hid="cui/ui/optionsdialog/revert">Resets changes made to the current tab to 
those applicable when this dialog was opened.</ahelp></paragraph>
       </section>
       <section id="zurueck2">
 <bookmark xml-lang="en-US" branch="hid/SFX2_HID_TABDLG_RESET_BTN" 
id="bm_id3151054" localize="false"/>
@@ -260,5 +260,16 @@
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id9345377" 
role="paragraph"><variable id="ShiftF1">Press Shift+F1 and point to a control 
to learn more about that control.
 </variable></paragraph>
+<section id="optionsbuttons">
+    <paragraph role="heading" id="hd_id631527692833772" level="2" 
xml-lang="en-US">Options dialog buttons</paragraph>
+    <paragraph role="heading" id="hd_id831527692839432" level="3" 
xml-lang="en-US">OK</paragraph>
+    <paragraph role="paragraph" id="par_id471527692844934" 
xml-lang="en-US">Save the changes in the page and close the Options 
dialog.</paragraph>
+    <paragraph role="heading" id="hd_id261527692850720" level="3" 
xml-lang="en-US">Cancel</paragraph>
+    <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#zurueck" />
+    <section id="optionsbuttonwarn01">
+        <paragraph xml-lang="en-US" id="par_id261527693436801" 
role="warning">Some options can't be reset once edited. Either edit back the 
changes manually or press <emph>Cancel</emph> and reopen the Options 
dialog.</paragraph>
+    </section>
+</section>
    </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01000000.xhp 
b/source/text/shared/optionen/01000000.xhp
index 51f5cdcf5..1481da439 100644
--- a/source/text/shared/optionen/01000000.xhp
+++ b/source/text/shared/optionen/01000000.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-       
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-       
+
+
 <meta>
       <topic id="textsharedoptionen01000000xml" indexer="include" 
status="PUBLISH">
          <title xml-lang="en-US" id="tit">Options</title>
@@ -43,7 +43,10 @@
       <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>
-      </section>
+     </section>
+     <embed href="text/shared/00/00000001.xhp#optionsbuttons"/>
+      <paragraph role="heading" id="hd_id551527692881035" level="3" 
xml-lang="en-US">Help</paragraph>
+      <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>
       <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>
diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index 451ca98bb..0cc76bd24 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -41,6 +41,7 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#rsave"/>
       </section>
+      <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
       <paragraph xml-lang="en-US" id="hd_id3154824" role="heading" 
level="2">Load</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/load_settings" 
id="bm_id3150444" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153311" role="heading" level="3">Load 
user-specific settings with the document</paragraph>
@@ -156,5 +157,6 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/saveas" 
id="bm_id3152775" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149527" role="heading" level="3">Always 
save as</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/saveas">Specifies how documents of the type selected on 
the left will always be saved as this file type. You may select another file 
type for the current document in the <emph>Save as</emph> 
dialog.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
    </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01010400.xhp 
b/source/text/shared/optionen/01010400.xhp
index 522ba85d8..4f6694b23 100644
--- a/source/text/shared/optionen/01010400.xhp
+++ b/source/text/shared/optionen/01010400.xhp
@@ -45,6 +45,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#writingaids"/>
 </section>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/lingumodules" 
id="bm_id3147653" localize="false"/>
 <paragraph role="heading" id="hd_id3149096" xml-lang="en-US" 
level="2">Available Language Modules</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US"><ahelp 
hid="cui/ui/optlingupage/lingumodules">Contains the installed language 
modules.</ahelp></paragraph>
@@ -136,5 +137,6 @@
 <paragraph role="heading" id="hd_id3155900" xml-lang="en-US" 
level="3">Hyphenate special regions</paragraph>
 <paragraph role="paragraph" id="par_id3155098" xml-lang="en-US">Specifies that 
hyphenation will also be carried out in footnotes, headers and 
footers.</paragraph>
 </section>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01010700.xhp 
b/source/text/shared/optionen/01010700.xhp
index 6ebfe438e..5ed7a42c0 100644
--- a/source/text/shared/optionen/01010700.xhp
+++ b/source/text/shared/optionen/01010700.xhp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <helpdocument version="1.0">
-       
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,8 +19,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-       
+
+
 <meta>
 <topic id="textsharedoptionen01010700xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Fonts</title>
@@ -42,6 +42,7 @@
 <embed href="text/shared/00/00000406.xhp#schriers"/>
 </section>
 <paragraph role="note" id="par_id3145610" xml-lang="en-US">Font replacement 
also affects the display of fonts on the $[officename] user 
interface.</paragraph>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/usetable" 
id="bm_id1615039" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="2">Apply 
replacement table</paragraph>
 <paragraph role="paragraph" id="par_id3159413" xml-lang="en-US"><ahelp 
hid="cui/ui/optfontspage/usetable">Enables the font replacement settings that 
you define.</ahelp></paragraph>
diff --git a/source/text/shared/optionen/01020000.xhp 
b/source/text/shared/optionen/01020000.xhp
index 706c3a600..cb66bbf8b 100644
--- a/source/text/shared/optionen/01020000.xhp
+++ b/source/text/shared/optionen/01020000.xhp
@@ -43,5 +43,6 @@
   <embed href="text/shared/optionen/01130200.xhp#office1"/>
   <embed href="text/shared/optionen/01030500.xhp#html"/>
   <embed href="text/shared/00/00000001.xhp#zurueck"/>
+  <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
  </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01020100.xhp 
b/source/text/shared/optionen/01020100.xhp
index 5f92db51b..61f5d5264 100644
--- a/source/text/shared/optionen/01020100.xhp
+++ b/source/text/shared/optionen/01020100.xhp
@@ -39,6 +39,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#internet1"/>
 </section>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 <paragraph role="heading" id="hd_id3147577" xml-lang="en-US" 
level="2">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US">Defines the 
settings for the <link href="text/shared/00/00000002.xhp#proxy" name="proxy 
server">proxy server</link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/proxymode" 
id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" 
xml-lang="en-US" level="3">Proxy server</paragraph>
@@ -63,5 +64,6 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/httpsport" 
id="bm_id3139439" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/ftpport" 
id="bm_id3147229" localize="false"/>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US"><ahelp 
hid="cui/ui/optproxypage/ftpport">Type the port for the corresponding proxy 
server.</ahelp> The maximum value of a port number is fixed at 
65535.</paragraph>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01030300.xhp 
b/source/text/shared/optionen/01030300.xhp
index 941100ec1..48a2ea5aa 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -41,19 +41,25 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#scripting"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/options" 
id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" 
xml-lang="en-US" level="2">Options</paragraph>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/options" 
id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" 
xml-lang="en-US" level="2">Security Options and Warnings</paragraph>
 <paragraph role="paragraph" id="par_idN10644" xml-lang="en-US"><ahelp 
hid=".">Opens the "Security Options and Warnings" dialog.</ahelp></paragraph>
 
 <paragraph role="heading" id="hd_id4076357" xml-lang="en-US" 
level="2">Passwords for web connections</paragraph>
 <paragraph role="paragraph" id="par_id8231757" xml-lang="en-US">You can enter 
a master password to enable easy access to sites that require a user name and 
password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/savepassword" 
id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" 
xml-lang="en-US" level="3">Persistently save passwords protected by a master 
password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/savepassword" 
id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" 
xml-lang="en-US" level="3">Persistently save passwords for web 
connections</paragraph>
 <paragraph role="paragraph" id="par_id1909848" xml-lang="en-US"><ahelp 
hid=".">If enabled, %PRODUCTNAME will securely store all passwords that you use 
to access files from web servers. You can retrieve the passwords from the list 
after you enter the master password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/masterpassword" 
id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" 
xml-lang="en-US" level="3">Master Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/masterpassword" 
id="bm_id9989013" localize="false"/>
+<paragraph role="heading" id="hd_id3901791" xml-lang="en-US" 
level="3">Protected by a master password (recommended)</paragraph>
+<paragraph role="paragraph" id="par_id31527711486980" xml-lang="en-US">Check 
to enable all connections passwords to be protected by a master 
password.</paragraph>
+<paragraph role="heading" id="hd_id141527711343312" level="3" 
xml-lang="en-US">Master Password</paragraph>
 <paragraph role="paragraph" id="par_id4571977" xml-lang="en-US"><ahelp 
hid=".">Opens the Enter Master Password dialog.</ahelp></paragraph>
+
 <paragraph role="paragraph" id="par_id5216223" xml-lang="en-US"><ahelp 
hid="uui/ui/setmasterpassworddlg/password1" visibility="hidden">Enter the 
master password.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id7067171" xml-lang="en-US"><ahelp 
hid="uui/ui/setmasterpassworddlg/password2" visibility="hidden">Enter the 
master password again.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/uui/ui/masterpassworddlg/MasterPasswordDialog" id="bm_id2005981" 
localize="false"/><paragraph role="paragraph" id="par_id7499313" 
xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the master password 
to continue.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/connections" 
id="bm_id2005777" localize="false"/><paragraph role="heading" id="hd_id3283486" 
xml-lang="en-US" level="3">Connections</paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/uui/ui/masterpassworddlg/MasterPasswordDialog" id="bm_id2005981" 
localize="false"/>
+<paragraph role="paragraph" id="par_id7499313" xml-lang="en-US"><ahelp hid="." 
visibility="hidden">Enter the master password to continue.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/connections" 
id="bm_id2005777" localize="false"/><paragraph role="heading" id="hd_id3283486" 
xml-lang="en-US" level="3">Connections...</paragraph>
 <paragraph role="paragraph" id="par_id3472090" xml-lang="en-US"><ahelp 
hid=".">Asks for the master password. If master password is correct, shows the 
Stored Web Connection Information dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/cui/ui/storedwebconnectiondialog/StoredWebConnectionDialog" 
id="bm_id48525" localize="false"/><paragraph role="paragraph" 
id="par_id3289590" xml-lang="en-US">The Stored Web Connection Information 
dialog shows a list of web sites and user names that you entered previously. 
You can select any entry and remove it from the list. You can view the password 
for the selected entry.</paragraph><comment>Remove</comment>
 <bookmark xml-lang="en-US" 
branch="hid/cui/ui/storedwebconnectiondialog/remove" id="bm_id6843775" 
localize="false"/><paragraph role="paragraph" id="par_id7499008" 
xml-lang="en-US"><ahelp hid="." visibility="hidden">Removes the selected entry 
from the list.</ahelp></paragraph><comment>Remove All</comment>
@@ -62,7 +68,7 @@
 <paragraph role="heading" id="par_idN10687" xml-lang="en-US" level="2">Macro 
security</paragraph>
 <paragraph role="paragraph" id="par_idN1068B" xml-lang="en-US">Adjust the 
security level for executing macros and specify trusted macro 
authors.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/macro" 
id="bm_id3726920" localize="false"/>
-<paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3">Macro 
Security</paragraph>
+<paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3">Macro 
Security...</paragraph>
 <paragraph role="paragraph" id="par_idN10692" xml-lang="en-US"><ahelp 
hid="cui/ui/optsecuritypage/macro">Opens the <emph>Macro Security</emph> 
dialog.</ahelp></paragraph>
 <switch select="sys"><case select="WIN"><!-- Windows uses Crypto API, not NSS 
--></case><default>
 <paragraph role="heading" id="par_idN106870" xml-lang="en-US" 
level="2">Certificate Path</paragraph>
diff --git a/source/text/shared/optionen/01030500.xhp 
b/source/text/shared/optionen/01030500.xhp
index d40c203a2..e43776fb9 100644
--- a/source/text/shared/optionen/01030500.xhp
+++ b/source/text/shared/optionen/01030500.xhp
@@ -76,5 +76,6 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/opthtmlpage/charset" 
id="bm_id9777520" localize="false"/>
 <paragraph role="heading" id="hd_id3152960" xml-lang="en-US" 
level="3">Character set</paragraph>
 <paragraph role="paragraph" id="par_id3149018" xml-lang="en-US"><ahelp 
hid="cui/ui/opthtmlpage/charset">Select the appropriate character set for the 
export</ahelp>.</paragraph>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01110100.xhp 
b/source/text/shared/optionen/01110100.xhp
index c13ccc5a3..d10e3ea48 100644
--- a/source/text/shared/optionen/01110100.xhp
+++ b/source/text/shared/optionen/01110100.xhp
@@ -46,5 +46,6 @@
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US">This table is 
used as a means of replacing the chart colors for the selected data rows. For 
example, if you selected data row 6 and then click on the color green 8, the 
old color of the data row is replaced by green 8. The name of the selected 
color is shown below the color table.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optchartcolorspage/default" 
id="bm_id5361491" localize="false"/><paragraph role="heading" id="hd_id3147242" 
xml-lang="en-US" level="2">Default</paragraph>
 <paragraph role="paragraph" id="par_id3156347" xml-lang="en-US"><ahelp 
hid="cui/ui/optchartcolorspage/default">Restores the color settings that were 
defined when the program was installed.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01140000.xhp 
b/source/text/shared/optionen/01140000.xhp
index 74da14719..0b6e9e726 100644
--- a/source/text/shared/optionen/01140000.xhp
+++ b/source/text/shared/optionen/01140000.xhp
@@ -47,6 +47,7 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#sprachen"/>
       </section>
+      <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
       <paragraph xml-lang="en-US" id="hd_id3156042" role="heading" 
level="2">Language of</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlanguagespage/userinterface" 
id="bm_id7035737" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="3">User 
interface</paragraph>
@@ -102,5 +103,6 @@
 <bookmark xml-lang="en-US" 
branch="hid/cui/ui/optlanguagespage/ignorelanguagechange" id="bm_id295725" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3146148" role="heading" level="3">Ignore 
system input language</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149668" role="paragraph"><ahelp 
hid=".">Indicates whether changes to the system input language/keyboard will be 
ignored. If ignored, when new text is typed that text will follow the language 
of the document or current paragraph, not the current system 
language.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
    </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/java.xhp 
b/source/text/shared/optionen/java.xhp
index 45af368df..b7c98310a 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -30,6 +30,7 @@
 
 <section id="advanced">
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optadvancedpage/OptAdvancedPage" 
id="bm_id6882839" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optionsdialog/help" 
id="bm_id30195" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id4077578">
   <bookmark_value>Java;setting options</bookmark_value>
   <bookmark_value>experimental features</bookmark_value>
@@ -42,9 +43,10 @@
 <paragraph id="par_idN10568" role="paragraph" xml-lang="en-US">Specifies the 
support options for Java applications in %PRODUCTNAME, including which Java 
Runtime Environment (JRE) to use. It also specifies whether to use experimental 
(unstable) features such as macro recording and access expert 
configuration.</paragraph>
 </section>
 
-<section id="howtoget"><embed href="text/shared/00/00000406.xhp#advanced"/>
+<section id="howtoget">
+    <embed href="text/shared/00/00000406.xhp#advanced"/>
 </section>
-
+<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
 <paragraph id="par_idN1056B" role="heading" xml-lang="en-US" level="2">Java 
options</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optadvancedpage/javaenabled" 
id="bm_id68828391" localize="false"/>
 
@@ -67,13 +69,13 @@
 <paragraph id="par_idN105AD" role="heading" xml-lang="en-US" level="3">Class 
Path</paragraph>
 <paragraph id="par_idN10686" role="paragraph" xml-lang="en-US"><ahelp 
hid="cui/ui/optadvancedpage/classpath">Opens the <link 
href="text/shared/optionen/javaclasspath.xhp">Class Path</link> 
dialog.</ahelp></paragraph>
 
-<paragraph id="hd_id3148618" role="heading" xml-lang="en-US" 
level="2">Optional (unstable) options</paragraph>
+<paragraph id="hd_id3148618" role="heading" xml-lang="en-US" 
level="2">Optional Features</paragraph>
 
 <paragraph id="hd_id3148619" role="heading" xml-lang="en-US" level="3"><ahelp 
hid="cui/ui/optadvancedpage/experimental">Enable experimental 
features</ahelp></paragraph>
-<paragraph id="par_id3156344" role="paragraph" xml-lang="en-US">It enables 
features that are not yet complete or contain known bugs. The list of these 
features is different version by version, or even it can be empty.</paragraph>
+<paragraph id="par_id3156344" role="paragraph" xml-lang="en-US">Enables 
features that are not yet complete or may contain known bugs. The list of these 
features is different version by version, or even it can be empty.</paragraph>
 
 <paragraph id="hd_id3148610" role="heading" xml-lang="en-US" level="3"><ahelp 
hid="cui/ui/optadvancedpage/macrorecording">Enable macro 
recording</ahelp></paragraph>
-<paragraph id="par_id3156345" role="paragraph" xml-lang="en-US">It enables 
macro recording, so the <link href="text/shared/guide/macro_recording.xhp" 
name="Tools - Macros - Record Macro"><item type="menuitem">Tools - Macros - 
Record Macro</item></link> menu item will be available.</paragraph>
+<paragraph id="par_id3156345" role="paragraph" xml-lang="en-US">Enables macro 
recording. The <link href="text/shared/guide/macro_recording.xhp" name="Tools - 
Macros - Record Macro"><item type="menuitem">Tools - Macros - Record 
Macro</item></link> menu item is available.</paragraph>
 
 <paragraph id="hd_id0609201521211497" role="heading" xml-lang="en-US" 
level="2"><link href="text/shared/optionen/expertconfig.xhp">Expert 
Configuration</link></paragraph>
 <paragraph id="par_id0609201521444658" role="paragraph" 
xml-lang="en-US"><ahelp hid="cui/ui/optadvancedpage/expertconfig">Opens the 
Expert Configuration dialog for advanced settings and configuration of 
%PRODUCTNAME.</ahelp></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to