diff options
author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-09-23 17:13:02 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-09-24 17:23:34 +0200 |
commit | 5c5167dd5b99c013d4db759489c7beea3613a57a (patch) | |
tree | f55e46c436b0fa2a11a164be814e5af42a7dbaba | |
parent | ab4b270d35eb6db2f0e2408f33e7817a9a0e7ce0 (diff) |
tdf#109084 Give precisions on JRE config path
Change-Id: I280492becffbeaba0549d2b671422e64aa28b532
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103276
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r-- | source/text/shared/optionen/java.xhp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source/text/shared/optionen/java.xhp b/source/text/shared/optionen/java.xhp index 966a13aa4e..1ee4b34667 100644 --- a/source/text/shared/optionen/java.xhp +++ b/source/text/shared/optionen/java.xhp @@ -59,6 +59,24 @@ <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> +<list type="unordered"> + <listitem> + <paragraph id="par_id191600889458048" role="listitem">By setting the environment variable <literal>JAVA_HOME</literal>,</paragraph> + </listitem> + <listitem> + <paragraph id="par_id131600889466713" role="listitem">By adding a JRE to the <literal>$PATH</literal> variable,</paragraph> + </listitem> + <listitem> + <paragraph id="par_id501600889473339" role="listitem">By providing the configuration file <switchinline select="sys"> + <caseinline select="MAC"><literal>javasettings_macOS_X86_64.xml</literal></caseinline> + <caseinline select="WIN"><literal>javasettings_Windows_X86_64.xml</literal></caseinline> + <caseinline select="UNIX"><literal>javasettings_Linux_X86_64.xml</literal></caseinline> + <defaultinline><literal>javasettings_${_OS}_${_ARCH}.xml</literal></defaultinline> + </switchinline> in the folder <literal><instdir>/presets/config</literal>. + </paragraph> + </listitem> +</list> <bookmark xml-lang="en-US" branch="hid/cui/ui/optadvancedpage/add" id="bm_id5543382" localize="false"/> <h3 id="par_idN105A5">Add</h3> |