From ea1f9db1ff560960ea58cc04d8bce45ec529929b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Mon, 2 Apr 2007 14:27:58 +0000
Subject: [PATCH] INTEGRATION: CWS hcshared08 (1.10.48); FILE MERGED 2007/01/31
 14:17:30 ufi 1.10.48.1: some changes

---
 .../explorer/database/dabawiz02jdbc.xhp       | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 92481e248f..a4e16fb1af 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -2,56 +2,36 @@
 <!--
  ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: dabawiz02jdbc.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.11 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2007-04-02 15:27:58 $
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
@@ -64,7 +44,7 @@
 </topic>
 <history>
 <created date="2004-07-28T15:55:36">UFI: Database Wizard JDBC page</created>
-<lastedited date="2006-04-28T13:07:45">DEDR: reviewed</lastedited>
+<lastedited date="2007-01-26T10:30:16">DEDR: reviewed</lastedited>
 </history>
 </meta>
 <body>
@@ -82,7 +62,7 @@
 <paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
 <switch select="sys">
 <case select="UNIX">
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW">On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the &lt;Oracle client&gt;/product/jdbc/lib/classes111.zip directory. You can also download the latest version of the version from the Oracle web site:</paragraph>
+<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="CHG">On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the &lt;Oracle client&gt;/product/jdbc/lib/classes111.zip directory. You can also download the latest version from the Oracle web site:</paragraph>
 <paragraph role="paragraph" id="par_idN1064E" xml-lang="en-US" l10n="NEW">http://otn.oracle.com/tech/java/sqlj_jdbc/content.html</paragraph>
 </case>
 </switch>