hcshared25: before rebase

author: Uwe Fischer <ufi@openoffice.org> 2010-04-23 09:47:01 +0200
committer: Uwe Fischer <ufi@openoffice.org> 2010-04-23 09:47:01 +0200
commit: ced3a4d3aaac5c79e6e859a3cecf24dc5a6d95a2 (patch)
tree: 5e1eaf76edc461a2c14614509b4cb5abe44875e9 /helpcontent2/source/text/shared/guide
parent: 610a764b4a828ed9af64f0d7565900c02fe5de26 (diff)
3 files changed, 25 insertions, 105 deletions
diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp
index ef89e4879c..4455968b8e 100755
--- a/helpcontent2/source/text/shared/guide/border_table.xhp
+++ b/helpcontent2/source/text/shared/guide/border_table.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,9 +40,9 @@
 </topic>
 </meta>
 <body>
-  
-  
-  
+
+
+
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value>
 <bookmark_value>tables in spreadsheets;defining borders</bookmark_value>
 <bookmark_value>borders; for tables</bookmark_value>
@@ -50,7 +50,7 @@
 <bookmark_value>defining;table borders</bookmark_value>
 </bookmark>
   <comment>mw deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link> 
+  <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2" l10n="U" oldref="1">Setting a Predefined Border Style</paragraph>
   <list type="ordered">
@@ -76,6 +76,10 @@
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
    </listitem>
+      <listitem>
+    <paragraph xml-lang="en-US" id="par_id31594132" role="listitem" l10n="NEW">If you select more than one row or column, you can change the middle lines between rows or columns. Select the middle markers in the <emph>User-defined</emph> area.</paragraph>
+   </listitem>
+
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3153526" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
    </listitem>
@@ -90,19 +94,19 @@
    </listitem>
   </list>
   <section id="relatedtopics">
-   
-   
+
+
 <switch select="appl">
-   
+
 <case select="WRITER">
    <embed href="text/swriter/guide/border_object.xhp#border_object"/>
    <embed href="text/swriter/guide/border_page.xhp#border_page"/>
-   
+
 </case>
-   
+
 </switch>
    <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-   
+
   </section>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index 2a994c5411..79f667244f 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
+<title id="tit" xml-lang="en-US">Setting up Printer and Fax Under UNIX Based Platforms</title>
 <filename>/text/shared/guide/spadmin.xhp</filename>
 </topic>
 </meta>
@@ -48,14 +48,12 @@
 <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><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>
 <section id="chapter_body">
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers, faxes and fonts for use with the $[officename] software.</paragraph>
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph>
 <list type="unordered">
 <listitem>
@@ -67,7 +65,7 @@
 </list>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
 <paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
-<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="285">The system administrator can also add fonts for all users in the server installation. However, these fonts are available only after restarting the $[officename] software.</paragraph>
+
 <paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
 <paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
@@ -223,88 +221,6 @@
 </list>
 <paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
 <paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
-<paragraph role="heading" id="hd_id3156195" xml-lang="en-US" level="2" l10n="U" oldref="143">Installing Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="144">When you are working with the $[officename] software you might notice that a different number of fonts is provided depending on the document type being used. This is because not all of the fonts can be used in every case.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="145">Therefore, only those fonts will be shown in the font selection box when working with a text document which can also be printed, as it is assumed that you will only want to use those fonts that you can actually have printed on paper.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157982" xml-lang="en-US" l10n="CHG" oldref="146">In an HTML document or in Web layout, only fonts that are available on screen are offered.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="147">On the other hand, when working with spreadsheets and drawings you will be able to use all of the fonts that can be either printed or shown on the screen.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="148">The $[officename] software tries to match the display on screen to the printout (WYSIWYG = what you see is what you get). Possible problems are shown in the bottom of the dialog <emph>Format - Character</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3156353" xml-lang="en-US" level="3" l10n="U" oldref="314">Adding Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="315">You can integrate additional fonts in the $[officename] software. Fonts which you integrate are available exclusively to the $[officename] software and can be used with various Xservers without your having to install them there. To make the fonts available to other programs as well, proceed as usual by adding the fonts to your Xserver. The $[officename] software can display and print out PostScript Type1 fonts as well as TrueType fonts (including TrueType Collections).</paragraph>
-<paragraph role="paragraph" id="par_id3156174" xml-lang="en-US" l10n="U" oldref="316">To integrate additional fonts in the $[officename] software, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="357">Go to the {install_path}/program directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151127" xml-lang="en-US" l10n="U" oldref="317">Enter: ./spadmin</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149072" xml-lang="en-US" l10n="U" oldref="318">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156341" xml-lang="en-US" l10n="U" oldref="319">The dialog lists all fonts added for the $[officename] software. You can select and remove fonts using the <emph>Remove</emph> button or add new fonts with the <emph>Add</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="320">Click <emph>Add</emph>. The <emph>Add Fonts</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="321">Enter the directory from which you want to add the fonts. Press the <emph>...</emph> button and select the directory from the path selection dialog or enter the directory directly.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="322">A list of the fonts from this directory appears. Select the fonts you want to add. To add all the fonts, click <emph>Select All</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="323">With the <emph>Create soft links only</emph> check box you can determine whether the fonts are to be copied into the $[officename] directory or only symbolic links are to be created there. If the fonts to be added are on a data medium that is not always available (such as a CD-ROM), you must copy the fonts.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="324">Click OK. The fonts will now be added.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="325">In the case of a server installation, the fonts are installed in that installation if possible. If the user has no write access rights, the fonts will be installed in the corresponding user installation so that only the user who installed them can access them.</paragraph>
-<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="3" l10n="U" oldref="326">Deleting Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="327">To delete fonts, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="328">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="329">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="330">All fonts added to the $[officename] software are listed in the dialog that now appears. Select the fonts you want to delete and click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153242" xml-lang="en-US" l10n="U" oldref="331">You can delete only the fonts that have been added for the $[officename] software.</paragraph>
-<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="332">Renaming Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="U" oldref="333">You can also rename fonts added for the $[officename] software. This is especially useful for fonts that contain several localized names.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="334">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="335">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="336">Select the fonts you want to rename and click <emph>Rename</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="337">Enter a new name in the dialog that appears. If the font contains several names, these names will serve as suggestions in the combo box where you enter the new name.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155521" xml-lang="en-US" l10n="U" oldref="338">Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="339">If you select several fonts to rename, one dialog appears for each selected font.</paragraph>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="340">If you have selected a TrueType Collection (TTC), one dialog appears for each of the fonts contained in it.</paragraph>
 </section>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index 1b928a5c08..ebecbb15c6 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguidestartcenterxhp" indexer="include">
          <title xml-lang="en-US" id="tit">Start Center</title>
@@ -45,7 +45,7 @@
 <paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document or a file dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
@@ -85,6 +85,6 @@
 <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
-<paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
+
    </body>
 </helpdocument>
 \ No newline at end of file
author	Uwe Fischer <ufi@openoffice.org>	2010-04-23 09:47:01 +0200
committer	Uwe Fischer <ufi@openoffice.org>	2010-04-23 09:47:01 +0200
commit	ced3a4d3aaac5c79e6e859a3cecf24dc5a6d95a2 (patch)
tree	5e1eaf76edc461a2c14614509b4cb5abe44875e9 /helpcontent2/source/text/shared/guide
parent	610a764b4a828ed9af64f0d7565900c02fe5de26 (diff)