INTEGRATION: CWS hc680fin (1.4.2); FILE MERGED

2005/11/23 08:31:20 ufi 1.4.2.2: *** empty log message ***
2005/11/08 13:48:19 ufi 1.4.2.1: *** empty log message ***

1 files changed, 46 insertions, 26 deletions

diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index 48ee802e3b..d9be177d37 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: 05020000.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.6 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: obo $ $Date: 2006-03-28 13:29:17 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  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.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  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
  *
- *    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.
+ *  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.
+ *
+ *  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.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    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
  *
  ************************************************************************-->
 	
@@ -42,13 +62,13 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-30T16:18:57">converted from old format - fpe</lastedited>
+<lastedited date="2005-11-22T09:51:36">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
 <section id="relationen">
 <bookmark xml-lang="en-US" branch="hid/HID_CTL_RELATIONTAB" id="bm_id3153345" localize="false"/>
-<paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05020000.xhp" name="Relations">Relations</link></paragraph>
+<paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05020000.xhp" name="Relations">Relationships</link></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146957"><bookmark_value>relational databases</bookmark_value>
 </bookmark>
 <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="2">This command opens the <emph>Relation Design </emph>window, which allows you to define relationships between various database tables.</paragraph>
@@ -56,14 +76,14 @@
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="HID_CTL_RELATIONTAB">Here you can link together tables from the current database through common data fields.</ahelp> Click the <emph>New Relation</emph> icon to create the relationships, or simply drag-and-drop with the mouse.</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000450.xhp#relationen"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
 <paragraph role="note" id="par_id3145316" xml-lang="en-US" l10n="U" oldref="3">This function is only available if you are working with a relational database.</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="4">If you click the <emph>Relation Design</emph> command in the context menu of the table container, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click the <emph>Add Tables</emph> icon. The <link href="text/shared/02/14020100.xhp" name="Add Tables">Add Tables</link> dialog opens in which you can select the tables that you want.</paragraph>
+<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click the <emph>Add Tables</emph> icon. The <link href="text/shared/02/14020100.xhp" name="Add Tables">Add Tables</link> dialog opens in which you can select the tables that you want.</paragraph>
 <embed href="text/shared/00/00000450.xhp#sytabelle"/>
-<paragraph role="note" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="17">If the <emph>Relation Design</emph> window is open, the selected tables cannot be modified, even in table Design Mode. This ensures that tables are not changed while the relations are being created.</paragraph>
+<paragraph role="note" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="17">If the <emph>Relation Design</emph> window is open, the selected tables cannot be modified, even in Table Design mode. This ensures that tables are not changed while the relations are being created.</paragraph>
 <paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="5">The selected tables are shown in the top area of the design view. You can close a table window through the context menu or with the Delete key.</paragraph>
 <embed href="text/shared/explorer/database/02010100.xhp#darstellungaendern"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148922"><bookmark_value>primary keys;inserting</bookmark_value>
 <bookmark_value>keys;primary keys</bookmark_value>
-<bookmark_value>external keys</bookmark_value>
+<bookmark_value>external keys in relational databases</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3148922" xml-lang="en-US" level="2" l10n="U" oldref="6">Primary key and other key</paragraph>
 <paragraph role="paragraph" id="par_id3149168" xml-lang="en-US" l10n="U" oldref="7">If you want to define a relation among the different tables, you should enter a <link href="text/shared/00/00000005.xhp#primaerschluessel" name="primary key">primary key</link> that clearly identifies a data field of the existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as an external key.</paragraph>