[Libreoffice-commits] help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/shared/optionen/java.xhp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b342fbeee805b4272d4a2b8015fd65c0d708046a
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Mar 4 11:52:55 2021 +0100
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Thu Mar 4 12:18:13 2021 +0100

    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 at libreoffice.org>

diff --git a/source/text/shared/optionen/java.xhp b/source/text/shared/optionen/java.xhp
index 1ee4b3466..c7571b631 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>