diff --git a/odk/docs/install.html b/odk/docs/install.html
index ef50895bf3a2..64e20178e8ef 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -68,8 +68,8 @@
| LibreOffice %PRODUCT_RELEASE%
installation |
The SDK works on top of an
- existing office installation and uses the same
- libraries as the office installation. |
+ existing LibreOffice installation and uses the same
+ libraries as the LibreOffice installation.
 |
@@ -228,12 +228,9 @@
| OFFICE_HOME |
Path to an existing
- LibreOffice base installation, e.g.
+ LibreOffice installation, e.g.
"/opt/libreoffice8". Be sure that it
- is not a user installation only. Exactly one
- of OFFICE_HOME and OO_SDK_URE_HOME must be
- set. The other should be either unset or set
- to an empty value. |
+ is not a user installation only.
| OO_SDK_NAME |
@@ -251,10 +248,7 @@
OO_SDK_URE_HOME |
Path to an existing UNO
Runtime Environment installation, e.g.
- "/opt/libreoffice/ure". Exactly one
- of OFFICE_HOME and OO_SDK_URE_HOME must be
- set. The other should be either unset or set
- to an empty value. |
+ "/opt/libreoffice/ure".
| OO_SDK_HOME |
@@ -321,11 +315,10 @@
SDK_AUTO_DEPLOYMENT |
If this variable is set, the
component examples are automatically deployed
- into the Office installation referenced by
- OFFICE_HOME. See also chapter
+ into the LibreOffice installation referenced
+ by OFFICE_HOME. See also chapter
"Extension Manager - unopkg"
- from the Developer's Guide. This variable is
- only relevant when OFFICE_HOME is set. |
+ from the Developer's Guide.
You must run the setsdkenv_XXX script
@@ -358,30 +351,24 @@
| OO_SDK_URE_BIN_DIR |
The path within the chosen
- office or URE installation where binary
- executables are located (e.g.,
- $OFFICE_HOME/program for an office
- installation, or $OO_SDK_URE_HOME/bin
- for a Unix URE installation). |
+ URE installation where binary executables are
+ located (e.g., $OO_SDK_URE_HOME/bin
+ for a Unix installation).
| OO_SDK_URE_LIB_DIR |
The path within the chosen
- office or URE installation where dynamic
- libraries are located (e.g.,
- $OFFICE_HOME/program for an office
- installation, or $OO_SDK_URE_HOME/lib
- for a Unix URE installation). |
+ URE installation where dynamic libraries are
+ located (e.g., $OO_SDK_URE_HOME/lib
+ for a Unix installation).
| OO_SDK_URE_JAVA_DIR |
The path within the chosen
- office or URE installation where Java JARs are
+ URE installation where Java JARs are
located (e.g.,
- $OFFICE_HOME/program/classes for an
- office installation, or
$OO_SDK_URE_HOME/share/java for a Unix
- URE installation). |
+ installation).
| CLASSPATH |
@@ -389,12 +376,11 @@
$OO_SDK_URE_JAVA_DIR/jurt.jar;
$OO_SDK_URE_JAVA_DIR/ridl.jar;
$OO_SDK_URE_JAVA_DIR/unoloader.jar;
- [$OO_SDK_URE_JAVA_DIR/unoil.jar;]
+ $OO_SDK_URE_JAVA_DIR/unoil.jar;
$CLASSPATH
The classpath will be set or extended to
the necessary jar files of the specified
- office installation. (unoil.jar is
- only included when OFFICE_HOME is set.)
+ LibreOffice installation.
@@ -402,8 +388,7 @@
=$OFFICE_HOME/program
This variable is used to find, for example,
the office type library and the UNO package
- deployment tool. This variable is only
- relevant when OFFICE_HOME is set.
+ deployment tool.
|
@@ -411,16 +396,14 @@
=$OFFICE_PROGRAM_PATH
This variable is used to ensure that the
new C++ UNO bootstrap mechanism uses the
- configured office installation of the SDK.
- Normally the bootstrap mechanism finds the
- default office installation for the user on
- the system. This variable is optional but is
- set from the scripts to ensure a homogeneous
- environment. Especially useful during
- development where you might have more than
- one office installation installed. This
- variable is only relevant when OFFICE_HOME
- is set.
+ configured LibreOffice installation of the
+ SDK. Normally the bootstrap mechanism finds
+ the default office installation for the user
+ on the system. This variable is optional but
+ is set from the scripts to ensure a
+ homogeneous environment. Especially useful
+ during development where you might have more
+ than one office installation installed.
|
@@ -452,8 +435,7 @@
- | When
- OO_SDK_URE_HOME is set, the script
+ | The script
additionally creates symbolic links to the
public dynamic libraries of the URE in
$OO_SDK_HOME/(solsparc|solintel)/lib,
@@ -487,8 +469,7 @@
|
- | When
- OO_SDK_URE_HOME is set, the script
+ | The script
additionally creates symbolic links to the
public dynamic libraries of the URE in
$OO_SDK_HOME/linux/lib, which are
|