INTEGRATION: CWS hc680qq1 (1.7.6); FILE MERGED

2005/10/04 12:43:00 ufi 1.7.6.1: after cwsresync

1 files changed, 43 insertions, 22 deletions

diff --git a/helpcontent2/source/text/shared/guide/xforms.xhp b/helpcontent2/source/text/shared/guide/xforms.xhp
index 13dff0b17a..94d34d8d03 100755
--- a/helpcontent2/source/text/shared/guide/xforms.xhp
+++ b/helpcontent2/source/text/shared/guide/xforms.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: xforms.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.7 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:27:25 $
+ *  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,7 +62,7 @@
 </topic>
 <history>
 <created date="2004-08-12T09:58:56">UFI: XForms main guide</created>
-<lastedited date="2005-02-10T16:07:52">DEDR: Reviewed</lastedited>
+<lastedited date="2005-09-26T14:48:51">DEDR: Reviewed</lastedited>
 </history>
 </meta>
 <body>
@@ -52,6 +72,7 @@
 <bookmark_value>XML Forms</bookmark_value>
 <bookmark_value>XForms</bookmark_value>
 <bookmark_value>editing;XForms</bookmark_value>
+<bookmark_value>opening;XForms</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="par_idN106E5" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form Documents (XForms)</link></paragraph>
 <paragraph role="paragraph" id="par_idN106F5" xml-lang="en-US" l10n="NEW">XForms are a new type of web form that was developed by the World Wide Web Consortium. The XForm model is defined in Extensible Markup Language (XML). The model uses separate sections to describe what a form does and what a form looks like. You can view the specification for XForms at: <link href="http://www.w3.org/MarkUp/Forms/">http://www.w3.org/MarkUp/Forms/</link>.</paragraph>