diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-27 08:22:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-27 08:22:39 +0000 |
| commit | 9924db8b2403f0442a922fc4fbd91246c3d245ca (patch) | |
| tree | 8e0ad4ffcb1ee186be881a50feb4e50e64d44c57 | |
| parent | 3f4b073022bb4208be778c930cdd43e78eed410f (diff) | |
INTEGRATION: CWS eoladabas_DEV300 (1.5.218); FILE MERGED
2008/01/23 14:25:34 oj 1.5.218.4: #149980# base fixes
2008/01/23 09:33:35 oj 1.5.218.3: #149980# revert remove
2008/01/23 09:30:44 oj 1.5.218.2: #149980# revert remove
2007/08/10 08:39:13 ufi 1.5.218.1: 149980
| -rw-r--r-- | helpcontent2/source/text/shared/explorer/database/30000000.xhp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp index 954ece42d4..50e324a51b 100644 --- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp +++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp @@ -7,9 +7,9 @@ * * $RCSfile: 30000000.xhp,v $fileonly,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2007-09-21 10:02:24 $ + * last change: $Author: obo $ $Date: 2008-02-27 09:22:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,8 +46,9 @@ </topic> </meta> <body> -<switch select="distrib"> -<case select="COMMERCIAL"><paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph> +<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph> +<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph> +<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph> <paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph> <paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph> <paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph> @@ -139,10 +140,5 @@ <paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph> </listitem> </list> -</case> -<default> -<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph> -<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph> -</default> -</switch></body> +</body> </helpdocument> |