summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-04 11:52:55 +0100
committerOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-04 12:18:13 +0100
commitb342fbeee805b4272d4a2b8015fd65c0d708046a (patch)
treec76426ee8b8bbdc082236c7adedcc6e10219c114
parente661fb9ccdc7d6bf364aa4a4e3b5e9f74acf8278 (diff)
tdf#133846 Inform where java is used
Change-Id: I68a9e5cc366a80094d6d97bb9310d61a16bfe6a5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111920 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/shared/optionen/java.xhp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/text/shared/optionen/java.xhp b/source/text/shared/optionen/java.xhp
index 1ee4b34667..c7571b631b 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -52,9 +52,10 @@
<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01"/>
<h2 id="par_idN1056B">Java options</h2>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optadvancedpage/javaenabled" id="bm_id68828391" localize="false"/>
-
+<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>
<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>