INTEGRATION: CWS hcshared07 (1.8.30); FILE MERGED

2006/12/04 15:57:31 ufi 1.8.30.1: changed files

1 files changed, 26 insertions, 47 deletions

diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index 827334e654..23051d0b4f 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.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: protection.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.9 $
  *
- *  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: vg $ $Date: 2007-02-07 11:45:05 $
  *
- *  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 Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, 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.
  *
- *  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): _______________________________________
+ *    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="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-20T15:50:47">UFI: added Spec doc "Import Password Protected MS Office Files"
+<lastedited date="2006-11-27T10:55:45">UFI: added Spec doc "Import Password Protected MS Office Files"
 dedr: reviewed</lastedited>
 </history>
 </meta>
@@ -85,12 +65,13 @@ dedr: reviewed</lastedited>
 <bookmark_value>graphics;protecting</bookmark_value>
 <bookmark_value>frames;protecting</bookmark_value>
 <bookmark_value>sections;protecting</bookmark_value>
-</bookmark><comment>mw made "form ..." a two level entry</comment>
+<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
+</bookmark><comment>mw made "form ..." a two level entry and added "Microsoft Office;..."</comment>
 <paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="XML format">XML format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
 <table id="tbl_id3145071">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -273,9 +254,7 @@ dedr: reviewed</lastedited>
 </tablecell>
 </tablerow>
 </table>
-
-<paragraph role="heading" id="hd_id3151336" xml-lang="en-US" level="2" l10n="U" oldref="65">Protect Access to Servers Through WebDAV and FTP</paragraph>
-<embed href="text/shared/01/password_main.xhp#password_text"/>
+<comment>removed webdav text, see i71792</comment>
 <paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
 <paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
 <table id="tbl_id4497512">