INTEGRATION: CWS hcshared07 (1.9.52); FILE MERGED

2007/01/11 09:31:43 ufi 1.9.52.2: last commitment
2007/01/02 15:51:11 ufi 1.9.52.1: zwischenstand

1 files changed, 25 insertions, 48 deletions

diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index 8e5f99e47e..03789edc5d 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.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: spadmin.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.10 $
  *
- *  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:28 $
  *
- *  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,26 +44,23 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T15:24:56">converted from old format - fpe</lastedited>
+<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
 <section id="chapter_all">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154422"><bookmark_value>printer programs under UNIX</bookmark_value>
-<bookmark_value>font programs under UNIX</bookmark_value>
-<bookmark_value>fax programs under UNIX</bookmark_value>
-<bookmark_value>spadmin</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154422"><bookmark_value>spadmin</bookmark_value>
 <bookmark_value>printers; adding, UNIX</bookmark_value>
 <bookmark_value>default printer; UNIX</bookmark_value>
 <bookmark_value>standard printer under UNIX</bookmark_value>
-<bookmark_value>faxes; connecting a fax printer under UNIX</bookmark_value>
+<bookmark_value>faxes; fax programs/fax printers under UNIX</bookmark_value>
 <bookmark_value>printers; faxes under UNIX</bookmark_value>
 <bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
 <bookmark_value>converters; PostScript, UNIX</bookmark_value>
 <bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
 <bookmark_value>fonts; adding under UNIX</bookmark_value>
 <bookmark_value>typefaces; adding under UNIX</bookmark_value>
-</bookmark>
+</bookmark><comment>mw deleted "printer programs under UNIX",  "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
 <paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
 <paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
 </variable></paragraph>