summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-04 14:43:43 +0100
committerOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-04 20:04:42 +0100
commit9121a0732c01e71a1f5dea5a6d32ee03a3157703 (patch)
treed7ba94e3816b20192fb12975ef4f644292ec30a1
parentac3932ba6679a519bdee68fc3b750a0faa85f6f2 (diff)
tdf#133846 restrict Java bitness Help to WindowsHEADmaster
Change-Id: I69813601b657127f0fd6ad3ebd8e668e660815e0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111924 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/shared/optionen/java.xhp8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/text/shared/optionen/java.xhp b/source/text/shared/optionen/java.xhp
index c7571b631..a0f4d96d2 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -55,9 +55,13 @@
<note id="par_id181614855578590">The current list of %PRODUCTNAME modules and resources that depends on Java is available <link href="https://wiki.documentfoundation.org/Faq/General/015" name="Java wiki">in the wiki</link>.</note>
<h3 id="par_idN1057F">Use a Java runtime environment</h3>
<paragraph id="par_idN10583" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/optadvancedpage/javaenabled">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
- <tip id="par_id881614855922649">Make sure to install a JRE compatible with the %PRODUCTNAME architecture: 64 bits JRE for 64 bits %PRODUCTNAME and 32 bits JRE for 32 bits %PRODUCTNAME.</tip>
+<switch select="sys">
+<case select="WIN">
+<tip id="par_id881614855922649">Make sure to install a JRE compatible with the %PRODUCTNAME architecture: 64 bits JRE for 64 bits %PRODUCTNAME and 32 bits JRE for 32 bits %PRODUCTNAME.</tip>
+</case>
+<default></default>
+</switch>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optadvancedpage/javas" id="bm_id6775719" localize="false"/>
-
<h3 id="par_idN10610">Java runtime environments (JRE) already installed:</h3>
<paragraph id="par_idN10614" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/optadvancedpage/javas">Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart %PRODUCTNAME to use your changed setting.</ahelp> The path to the JRE is displayed beneath the list box.</paragraph>
<paragraph role="paragraph" id="par_id431600889434242">You can override the default JRE of the operating system with one of the following alternatives:</paragraph>