summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 13:38:40 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 13:38:40 +0000
commitf4c833c75f335eacd9486f8d621840101ac27d3f (patch)
tree442174c907449d6bd0c8fadf4b10740a3acd4615 /helpcontent2/source/text/swriter
parente02c26894d8afcb76f25a862a7b57efb7d2c2488 (diff)
INTEGRATION: CWS hc680pp1 (1.4.34); FILE MERGED
2005/10/04 12:40:40 ufi 1.4.34.3: after cwsresync 2005/10/04 08:08:10 ufi 1.4.34.2: RESYNC: (1.4-1.5); FILE MERGED 2005/07/05 13:17:42 ufi 1.4.34.1: *** empty log message ***
Diffstat (limited to 'helpcontent2/source/text/swriter')
-rw-r--r--helpcontent2/source/text/swriter/guide/globaldoc.xhp10
1 files changed, 6 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/guide/globaldoc.xhp b/helpcontent2/source/text/swriter/guide/globaldoc.xhp
index 422f3b50bc..7381623752 100644
--- a/helpcontent2/source/text/swriter/guide/globaldoc.xhp
+++ b/helpcontent2/source/text/swriter/guide/globaldoc.xhp
@@ -5,9 +5,9 @@
*
* $RCSfile: globaldoc.xhp,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 02:35:35 $
+ * last change: $Author: kz $ $Date: 2005-10-05 14:38:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -42,11 +42,12 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T12:14:49">UFI: fixed #i25344# - FPE: fixed #110245#</lastedited>
+<lastedited date="2005-08-16T14:12:41">UFI: fixed #i25344# - FPE: fixed #110245#</lastedited>
</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145246"><bookmark_value>master documents</bookmark_value>
+<bookmark_value>subdocuments</bookmark_value>
<bookmark_value>central documents</bookmark_value>
<bookmark_value>subsidiary documents</bookmark_value>
<bookmark_value>documents; master documents and subdocuments</bookmark_value>
@@ -135,7 +136,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3148949" xml-lang="en-US" l10n="E">
-<image id="img_id3148959" src="sw/imglst/sc20246.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148959" xml-lang="en-US">Icon</alt>
+<image id="img_id3148959" src="sw/imglst/sc20246.png" width="5.64mm" height="5.64mm"><alt id="alt_id3148959" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -144,6 +145,7 @@
</tablerow>
</table>
+<paragraph role="note" id="par_idN10C40" xml-lang="en-US" l10n="NEW">When you insert an object like a frame or a picture into a master document, do not anchor the object "to page". Instead, set the anchor "to paragraph" on the <emph>Format - (Object type) - Type</emph> tab page, and then set the object's position relative to "Entire Page" in the <emph>Horizontal</emph> and <emph>Vertical</emph> list boxes.</paragraph>
<paragraph role="heading" id="hd_id3153656" xml-lang="en-US" level="3" l10n="U" oldref="41">To start each subdocument on a new page:</paragraph>
<list type="ordered">
<listitem>