summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-16 08:37:42 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-22 11:37:21 +0100
commitdddd28a6173bf590d8b4ea8ca886c0a732e50551 (patch)
treeb7b550d05bffcad89345f0df33570d2cd725cfb9
parentfee1c989724756b1a7a001a4a1964cd38c09b409 (diff)
tdf#128227 disambiguate text frame and text box
in summary, on Writer, Text frame -> Frame On other modules Text Frame -> text box Change-Id: I3b218fafb03cd5ab79c8c0b902ec417bf5445ff8 Reviewed-on: https://gerrit.libreoffice.org/82976 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit e20b575c56ebe912501e932192e509b6a227ce3c) Reviewed-on: https://gerrit.libreoffice.org/83451
-rw-r--r--source/auxiliary/swriter.tree2
-rw-r--r--source/text/scalc/main0205.xhp2
-rw-r--r--source/text/shared/00/00000002.xhp6
-rw-r--r--source/text/shared/00/00000020.xhp4
-rw-r--r--source/text/shared/01/05030600.xhp2
-rw-r--r--source/text/shared/02/03130000.xhp2
-rw-r--r--source/text/shared/02/06120000.xhp2
-rw-r--r--source/text/shared/02/13020000.xhp2
-rw-r--r--source/text/shared/guide/copytext2application.xhp2
-rw-r--r--source/text/shared/guide/navigator.xhp2
-rw-r--r--source/text/shared/optionen/01070500.xhp4
-rw-r--r--source/text/simpress/01/04110200.xhp2
-rw-r--r--source/text/simpress/02/10050000.xhp2
-rw-r--r--source/text/swriter/01/02110000.xhp2
-rw-r--r--source/text/swriter/01/02110100.xhp4
-rw-r--r--source/text/swriter/01/04090005.xhp2
-rw-r--r--source/text/swriter/01/04120215.xhp6
-rw-r--r--source/text/swriter/01/06180000.xhp6
-rw-r--r--source/text/swriter/04/01020000.xhp6
-rw-r--r--source/text/swriter/guide/captions.xhp2
-rw-r--r--source/text/swriter/guide/text_centervert.xhp4
-rw-r--r--source/text/swriter/guide/text_frame.xhp46
-rw-r--r--source/text/swriter/main0503.xhp2
23 files changed, 57 insertions, 57 deletions
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index b0f8fcebfa..97ec2ab998 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -92,7 +92,7 @@
</node>
<node id="0207" title="Sections and Frames in Text Documents">
<topic id="swriter/text/swriter/guide/sections.xhp">Using Sections</topic>
-<topic id="swriter/text/swriter/guide/text_frame.xhp">Inserting, Editing, and Linking Text Frames</topic>
+<topic id="swriter/text/swriter/guide/text_frame.xhp">Inserting, Editing, and Linking Frames</topic>
<topic id="swriter/text/swriter/guide/section_edit.xhp">Editing Sections</topic>
<topic id="swriter/text/swriter/guide/section_insert.xhp">Inserting Sections</topic>
</node>
diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp
index 935acbddc3..4ecda28643 100644
--- a/source/text/scalc/main0205.xhp
+++ b/source/text/scalc/main0205.xhp
@@ -33,7 +33,7 @@
<section id="beitextcursorinobjekt">
<bookmark xml-lang="en-US" branch="hid/HID_SC_TOOLBOX_DRTEXT" id="bm_id3147265" localize="false"/>
<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="1"><link href="text/scalc/main0205.xhp" name="Text Formatting Bar">Text Formatting Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US"><ahelp hid="HID_SC_TOOLBOX_DRTEXT">The <emph>Text Formatting</emph> Bar that is displayed when the cursor is in a text object, such as a text frame or a drawing object, contains formatting and alignment commands.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US"><ahelp hid="HID_SC_TOOLBOX_DRTEXT">The <emph>Text Formatting</emph> Bar that is displayed when the cursor is in a text object, such as a text box or a drawing object, contains formatting and alignment commands.</ahelp></paragraph>
</section>
<embed href="text/shared/02/02020000.xhp#schriftart"/>
<embed href="text/shared/02/02020000.xhp#syschriftart"/>
diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp
index b417867dce..5a9ce270f1 100644
--- a/source/text/shared/00/00000002.xhp
+++ b/source/text/shared/00/00000002.xhp
@@ -99,7 +99,7 @@
<paragraph id="hd_id3149290" role="heading" level="2" xml-lang="en-US">Hyperlink</paragraph>
<paragraph id="par_id3145420" role="paragraph" xml-lang="en-US">Hyperlinks are cross-references, highlighted in text in various colors and activated by mouse-click. With the aid of hyperlinks, readers can jump to specific information within a document as well as to related information in other documents.</paragraph>
-<paragraph id="par_id3156281" role="paragraph" xml-lang="en-US">In $[officename] you can assign hyperlinks to text as well as to graphics and text frames (see the Hyperlink Dialog icon on the Standard bar).</paragraph>
+<paragraph id="par_id3156281" role="paragraph" xml-lang="en-US">In $[officename] you can assign hyperlinks to text as well as to graphics and frames (see the Hyperlink Dialog icon on the Standard bar).</paragraph>
</section>
<section id="imagemap">
@@ -109,7 +109,7 @@
<paragraph id="hd_id3152805" role="heading" level="2" xml-lang="en-US">ImageMap</paragraph>
-<paragraph id="par_id3154685" role="paragraph" xml-lang="en-US">An ImageMap is a reference-sensitive graphic or text frame. You can click on defined areas of the graphic or text frame to go to a target (<link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>), which is linked with the area. The reference areas, along with the linked URLs and corresponding text displayed when resting the mouse pointer on these areas, are defined in the <link href="text/shared/01/02220000.xhp" name="ImageMap Editor">ImageMap Editor</link>.</paragraph>
+<paragraph id="par_id3154685" role="paragraph" xml-lang="en-US">An ImageMap is a reference-sensitive graphic or frame. You can click on defined areas of the graphic or frame to go to a target (<link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>), which is linked with the area. The reference areas, along with the linked URLs and corresponding text displayed when resting the mouse pointer on these areas, are defined in the <link href="text/shared/01/02220000.xhp" name="ImageMap Editor">ImageMap Editor</link>.</paragraph>
<paragraph id="par_id3153178" role="paragraph" xml-lang="en-US">There are two different types of ImageMaps. A Client Side ImageMap is evaluated on the client computer, which loaded the graphic from the Internet, while a Server Side ImageMap is evaluated on the server computer which provides the <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> page on the Internet. In server evaluation, clicking an ImageMap sends the relative coordinates of the cursor within the image to the server, and a dedicated program on the server responds. In the client evaluation, clicking a defined hotspot of the ImageMap activates the URL, as if it were a normal text link. The URL appears below the mouse pointer when passing across the ImageMap.</paragraph>
<paragraph id="par_id3150740" role="paragraph" xml-lang="en-US">As ImageMaps can be used in different ways, they can be stored in different formats.</paragraph>
@@ -144,7 +144,7 @@
<paragraph id="hd_id3152418" role="heading" level="2" xml-lang="en-US">Client Side ImageMap</paragraph>
<paragraph id="par_id3151290" role="paragraph" xml-lang="en-US">The area of the picture or frame where the reader can click is indicated by the appearance of the linked <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> when the mouse passes over the area. The ImageMap is stored in a layer below the picture and contains information about the referenced regions. The only disadvantage of Client Side ImageMaps is that older Web browsers cannot read them; a disadvantage that will, however, resolve itself in time.</paragraph>
-<paragraph id="par_id3149664" role="paragraph" xml-lang="en-US">When saving the ImageMap, select the file type <emph>SIP - StarView ImageMap</emph>. This saves the ImageMap directly in a format which can be applied to every active picture or frame in your document. However, if you just want to use the ImageMap on the current picture or text frame, you do not have to save it in any special format. After defining the regions, simply click <emph>Apply</emph>. Nothing more is necessary. Client Side ImageMaps saved in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> format are inserted directly into the page in HTML code.</paragraph>
+<paragraph id="par_id3149664" role="paragraph" xml-lang="en-US">When saving the ImageMap, select the file type <emph>SIP - StarView ImageMap</emph>. This saves the ImageMap directly in a format which can be applied to every active picture or frame in your document. However, if you just want to use the ImageMap on the current picture or frame, you do not have to save it in any special format. After defining the regions, simply click <emph>Apply</emph>. Nothing more is necessary. Client Side ImageMaps saved in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> format are inserted directly into the page in HTML code.</paragraph>
</section>
<section id="java">
diff --git a/source/text/shared/00/00000020.xhp b/source/text/shared/00/00000020.xhp
index 1a57d70384..96f26b8a11 100644
--- a/source/text/shared/00/00000020.xhp
+++ b/source/text/shared/00/00000020.xhp
@@ -89,9 +89,9 @@
</list>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US">If MS Internet Explorer or $[officename] Writer are set as the export option, the sizes of the control field and their internal margins are exported as styles (print formats). CSS1 size properties are based on "width" and "height" values. The "Margin" property is used to set equal margins on all sides of the page. To allow different margins, the "Margin-Left", "Margin-Right", "Margin-Top" and "Margin-Bottom" properties are used.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US">The distances of graphics and Plug-Ins to the content can be set individually for export to $[officename] Writer and MS Internet Explorer. If the top/bottom or right/left margin is set differently, the distances are exported in a "STYLE" option for the corresponding tag as CSS1 size properties "Margin-Top", "Margin-Bottom", "Margin-Left" and "Margin-Right".</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Mozilla Firefox, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US">Frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Mozilla Firefox, MS Internet Explorer, and $[officename] Writer. Frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US">Frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - General</emph> or <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
<table id="tbl_id3154346">
<tablerow>
diff --git a/source/text/shared/01/05030600.xhp b/source/text/shared/01/05030600.xhp
index 2c76299eb3..4533a3a048 100644
--- a/source/text/shared/01/05030600.xhp
+++ b/source/text/shared/01/05030600.xhp
@@ -40,7 +40,7 @@
<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153748" role="paragraph"><ahelp hid="cui/ui/backgroundpage/BackgroundPage">Set the background color or graphic.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3147653" role="paragraph">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
+ <paragraph xml-lang="en-US" id="par_id3147653" role="paragraph">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, frames, tables, table cells, sections, and indexes.
</caseinline><caseinline select="CALC">cells and pages.
</caseinline></switchinline></paragraph>
<section id="howtoget">
diff --git a/source/text/shared/02/03130000.xhp b/source/text/shared/02/03130000.xhp
index b8176fc4dc..cce0b5106f 100644
--- a/source/text/shared/02/03130000.xhp
+++ b/source/text/shared/02/03130000.xhp
@@ -34,7 +34,7 @@
<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid=".uno:SetBorderStyle">Click the <emph>Borders</emph> icon to open the <emph>Borders</emph> toolbar, where you can modify the border of a sheet area or an object.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">
-</caseinline><defaultinline>This object can be the border of a text frame, a graphic or a table. The icon will only be visible if a graphic, table, object or frame has been selected.</defaultinline></switchinline></paragraph>
+</caseinline><defaultinline>This object can be the border of a frame, a graphic or a table. The icon will only be visible if a graphic, table, object or frame has been selected.</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">To apply a particular type of border to a single cell, position the cursor in the cell, open the <emph>Border</emph> toolbar and select a border.
</caseinline><defaultinline> Whenever you insert graphics or tables, they already have a complete border. To remove that border, select the graphic object or the entire table and click the <emph>no border</emph> icon on the <emph>Border</emph> toolbar.</defaultinline></switchinline></paragraph>
<section id="syumrandung">
diff --git a/source/text/shared/02/06120000.xhp b/source/text/shared/02/06120000.xhp
index d14d52bf18..2bc1773aaa 100644
--- a/source/text/shared/02/06120000.xhp
+++ b/source/text/shared/02/06120000.xhp
@@ -36,7 +36,7 @@
<paragraph role="paragraph" id="par_id3155150" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">Bullet options such as type and position are defined in the <link href="text/shared/01/06050000.xhp" name="Bullets and Numbering"><emph>Bullets and Numbering</emph></link> dialog. To open this dialog, click the <emph>Bullets and Numbering</emph> icon on the <link href="text/swriter/main0206.xhp" name="Bullets and Numbering Bar"><emph>Bullets and Numbering</emph> bar</link>.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US"><switchinline select="appl"><caseinline select="IMPRESS">Bullet options such as type and position are defined in the <link href="text/shared/01/06050000.xhp" name="Bullets and Numbering"><emph>Bullets and Numbering</emph></link> dialog. To open this dialog, click the <emph>Bullets and Numbering</emph> icon on the <emph>Text Formatting</emph> bar.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">In the <link href="text/swriter/01/03120000.xhp" name="Web Layout"><emph>Web Layout</emph></link>, some numbering/bullet options are not available.</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><switchinline select="appl"><caseinline select="IMPRESS">The distance between the text and the left text frame and the position of the bullets can be determined in the dialog under <link href="text/shared/01/05030100.xhp" name="Format - Paragraph"><emph>Format - Paragraph</emph></link> by entering the left indent and the first-line indent.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><switchinline select="appl"><caseinline select="IMPRESS">The distance between the text and the left text box and the position of the bullets can be determined in the dialog under <link href="text/shared/01/05030100.xhp" name="Format - Paragraph"><emph>Format - Paragraph</emph></link> by entering the left indent and the first-line indent.</caseinline></switchinline></paragraph>
<section id="syaufzaehlung">
<table id="tbl_id3146798">
<tablerow>
diff --git a/source/text/shared/02/13020000.xhp b/source/text/shared/02/13020000.xhp
index 955dc51d95..05e178b09c 100644
--- a/source/text/shared/02/13020000.xhp
+++ b/source/text/shared/02/13020000.xhp
@@ -36,7 +36,7 @@
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="1"><link href="text/shared/02/13020000.xhp" name="Setting Indents, Margins, and Columns">Setting Indents, Margins, and Columns</link></paragraph>
<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US">You can define the indents and margins for the current paragraph, or for all selected paragraphs, using the mouse.</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US">If you split the page into columns, or the cursor is placed in a multiple-column text frame, you can change the column width and the column spacing by dragging them on the ruler with the mouse.</paragraph>
+<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US">If you split the page into columns, or the cursor is placed in a multiple-column frame, you can change the column width and the column spacing by dragging them on the ruler with the mouse.</paragraph>
<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US">When an object, an image, or a draw object is selected, you will see the borders of the object in the ruler. You can change the borders by dragging them on the ruler with the mouse.</paragraph>
<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US">If the cursor is placed in a table cell, you can change the indents for the contents of the cell by dragging them with the mouse on the ruler. You can change the boundary lines of the table on the ruler or by dragging the actual boundary line.</paragraph>
<table id="tbl_id3157896">
diff --git a/source/text/shared/guide/copytext2application.xhp b/source/text/shared/guide/copytext2application.xhp
index 96f0c5794a..2cd158c087 100644
--- a/source/text/shared/guide/copytext2application.xhp
+++ b/source/text/shared/guide/copytext2application.xhp
@@ -41,7 +41,7 @@
</bookmark><comment>mw added "pasting; and changed "drag and drop;""</comment>
<paragraph role="heading" id="hd_id3152924" xml-lang="en-US" level="1"><variable id="copytext2application"><link href="text/shared/guide/copytext2application.xhp" name="Inserting Data From Text Documents">Inserting Data From Text Documents</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US">You can insert text into other document types, such as spreadsheets and presentations. Note that there is a difference between whether the text is inserted into a text frame, a spreadsheet cell, or into the outline view of a presentation.</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US">You can insert text into other document types, such as spreadsheets and presentations. Note that there is a difference between whether the text is inserted into a frame, a spreadsheet cell, or into the outline view of a presentation.</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3147576" xml-lang="en-US">If you copy text to the clipboard, you can paste it with or without text attributes. Use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V to paste.</paragraph>
diff --git a/source/text/shared/guide/navigator.xhp b/source/text/shared/guide/navigator.xhp
index 7227a0a64a..db4edd5a6d 100644
--- a/source/text/shared/guide/navigator.xhp
+++ b/source/text/shared/guide/navigator.xhp
@@ -35,7 +35,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US">The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
diff --git a/source/text/shared/optionen/01070500.xhp b/source/text/shared/optionen/01070500.xhp
index e1e917c8af..8090be6489 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -57,9 +57,9 @@
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/textselected" id="bm_id3148920" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
<paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3">Only text area selectable</paragraph>
-<paragraph role="paragraph" id="par_id3149808" xml-lang="en-US"><variable id="textbereich"><ahelp hid=".">Specifies whether to select a text frame by clicking the text.</ahelp>
+<paragraph role="paragraph" id="par_id3149808" xml-lang="en-US"><variable id="textbereich"><ahelp hid=".">Specifies whether to select a text box by clicking the text.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US"><variable id="textbereich2">In the area of the text frame that is not filled with text, an object behind the text frame can be selected.
+<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US"><variable id="textbereich2">In the area of the text box that is not filled with text, an object behind the text box can be selected.
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">
</caseinline><caseinline select="CALC">
diff --git a/source/text/simpress/01/04110200.xhp b/source/text/simpress/01/04110200.xhp
index 1e3f55d9ca..dfac0e6aae 100644
--- a/source/text/simpress/01/04110200.xhp
+++ b/source/text/simpress/01/04110200.xhp
@@ -32,7 +32,7 @@
<section id="howtoget">
<embed href="text/simpress/00/00000404.xhp#efgdti"/>
</section>
-<paragraph role="paragraph" id="par_id3149018" xml-lang="en-US">The inserted text uses the default text formatting of the active slide. If you want, you can drag a text frame in your slide, and then insert the text. The text frame automatically extends downwards for longer text passages.</paragraph>
+<paragraph role="paragraph" id="par_id3149018" xml-lang="en-US">The inserted text uses the default text formatting of the active slide. If you want, you can drag a text box in your slide, and then insert the text. The box automatically extends downwards for longer text passages.</paragraph>
<h2 id="hd_id3156382">Display list</h2>
<paragraph role="paragraph" id="par_id3154702" xml-lang="en-US">Select the text you want to insert from the list.</paragraph>
<h2 id="hd_id3150200">Link</h2>
diff --git a/source/text/simpress/02/10050000.xhp b/source/text/simpress/02/10050000.xhp
index 8d55e558d9..fd279bb1d3 100644
--- a/source/text/simpress/02/10050000.xhp
+++ b/source/text/simpress/02/10050000.xhp
@@ -90,7 +90,7 @@
<embed href="text/shared/02/01140000.xhp#textasia"/>
<bookmark xml-lang="en-US" branch="hid/.uno:VerticalTextFitToSizeTool" id="bm_id3073398" localize="false"/>
<paragraph role="heading" id="hd_id3148390" xml-lang="en-US" level="2">Fit Vertical Text to Frame</paragraph>
-<paragraph role="paragraph" id="par_id3148770" xml-lang="en-US"><ahelp hid=".uno:VerticalTextFitToSizeTool">Draws a text frame with vertical text direction where you click or drag in the current document. The text that you enter is automatically resized to fit the dimensions of the frame. (Enable Asian text support to enable this icon).</ahelp> Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text frame, and then type or paste your text.</paragraph>
+<paragraph role="paragraph" id="par_id3148770" xml-lang="en-US"><ahelp hid=".uno:VerticalTextFitToSizeTool">Draws a text box with vertical text direction where you click or drag in the current document. The text that you enter is automatically resized to fit the dimensions of the box. (Enable Asian text support to enable this icon).</ahelp> Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a box, and then type or paste your text.</paragraph>
<table id="tbl_id3150570">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/source/text/swriter/01/02110000.xhp b/source/text/swriter/01/02110000.xhp
index 12ea651de4..d663930950 100644
--- a/source/text/swriter/01/02110000.xhp
+++ b/source/text/swriter/01/02110000.xhp
@@ -43,7 +43,7 @@
<paragraph id="par_id3154475" role="paragraph" xml-lang="en-US">To open the Navigator, choose <emph>View - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, hold down the Ctrl key and double-click on a grey area of the Navigator.</paragraph>
<paragraph id="par_id3149490" role="paragraph" xml-lang="en-US">Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
<paragraph id="par_id3149106" role="paragraph" xml-lang="en-US">To jump to the next or previous item in a document, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon to open the Navigation toolbar, click the item category, and then click the up or down arrows.</paragraph>
-<paragraph id="par_id3155136" role="note" xml-lang="en-US">A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, text frames, graphics, OLE objects, and indexes.</paragraph>
+<paragraph id="par_id3155136" role="note" xml-lang="en-US">A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, frames, graphics, OLE objects, and indexes.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/contenttoggle" id="bm_id3155911" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/globaltoggle" id="bm_id3155912" localize="false"/>
diff --git a/source/text/swriter/01/02110100.xhp b/source/text/swriter/01/02110100.xhp
index a4f923677a..123668dfdb 100644
--- a/source/text/swriter/01/02110100.xhp
+++ b/source/text/swriter/01/02110100.xhp
@@ -40,7 +40,7 @@
<bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEDOWN" id="bm_id3156109" localize="false"/>
<paragraph role="paragraph" id="par_id3156098" xml-lang="en-US"><ahelp hid="HID_SCRL_PAGEDOWN">Click the down button to scroll to the next page or object.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155076" xml-lang="en-US">By default, as long as you have not selected any other entry, the arrow buttons jump to the previous or the next page in the document. The arrow buttons are black if you are browsing through pages and blue if you jump to other objects.</paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US">The entries largely correspond to those in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> selection box. You can also select other jump destinations. An example are the reminders, which you can set with the <emph>Set Reminder</emph> icon in the Navigator. You can select an object from among the following options on the <emph>Navigation</emph> toolbar: table, text frame, graphics, OLE object, page, headings, reminder, drawing object, control field, section, bookmark, selection, footnote, note, index entry, table formula, wrong table formula.</paragraph>
+<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US">The entries largely correspond to those in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> selection box. You can also select other jump destinations. An example are the reminders, which you can set with the <emph>Set Reminder</emph> icon in the Navigator. You can select an object from among the following options on the <emph>Navigation</emph> toolbar: table, frame, graphics, OLE object, page, headings, reminder, drawing object, control field, section, bookmark, selection, footnote, note, index entry, table formula, wrong table formula.</paragraph>
<paragraph role="paragraph" id="par_id3148783" xml-lang="en-US">For table formulas, you can either jump to all table formulas located within your document or only to the incorrect ones. For incorrect formulas, you jump only to formulas that have resulted in errors. The program skips over formulas with resulting errors (those that reference incorrect formulas).</paragraph>
<paragraph role="heading" id="hd_id3150031" xml-lang="en-US" level="2">Working With the Navigation Toolbar</paragraph>
<paragraph role="paragraph" id="par_id3150045" xml-lang="en-US">Open the <emph>Navigation</emph> toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen.</paragraph>
@@ -58,7 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_DRW" id="bm_id4192327" localize="false"/>
<paragraph role="paragraph" id="par_idN1070B" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through drawing objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_FRM" id="bm_id8498794" localize="false"/>
-<paragraph role="paragraph" id="par_idN10722" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through text frames.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10722" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through frames.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_FTN" id="bm_id66835" localize="false"/>
<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through footnotes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_GRF" id="bm_id7068697" localize="false"/>
diff --git a/source/text/swriter/01/04090005.xhp b/source/text/swriter/01/04090005.xhp
index 6c8f3867db..8c36b213af 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -98,7 +98,7 @@
<paragraph role="tablecontent" id="par_id3149034" xml-lang="en-US">Number range</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3152772" xml-lang="en-US">Inserts automatic numbering for tables, graphics, or text frames.</paragraph>
+<paragraph role="tablecontent" id="par_id3152772" xml-lang="en-US">Inserts automatic numbering for tables, graphics, or frames.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/source/text/swriter/01/04120215.xhp b/source/text/swriter/01/04120215.xhp
index f9b525340c..987aa93f7c 100644
--- a/source/text/swriter/01/04120215.xhp
+++ b/source/text/swriter/01/04120215.xhp
@@ -52,14 +52,14 @@
<paragraph role="heading" id="hd_id3154569" xml-lang="en-US" level="3">Graphics</paragraph>
<paragraph role="paragraph" id="par_id3153676" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/fromgraphics">Includes graphics in the index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/fromframes" id="bm_id3154188" localize="false"/>
-<paragraph role="heading" id="hd_id3149685" xml-lang="en-US" level="3">Text frames</paragraph>
-<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/fromframes">Includes text frames in the index.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3149685" xml-lang="en-US" level="3">Frames</paragraph>
+<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/fromframes">Includes frames in the index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/fromoles" id="bm_id3143276" localize="false"/>
<paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3">OLE objects</paragraph>
<paragraph role="paragraph" id="par_id3143282" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/fromoles">Includes OLE objects in the index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/uselevel" id="bm_id3149106" localize="false"/>
<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3">Use level from source chapter</paragraph>
-<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/uselevel">Indents table, graphic, text frame, and OLE object index entries according their place in the chapter heading hierarchy.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tocindexpage/uselevel">Indents table, graphic, frame, and OLE object index entries according their place in the chapter heading hierarchy.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US"><link href="text/swriter/01/04120100.xhp" name="Defining an index entry">Defining an index entry</link></paragraph>
</body>
diff --git a/source/text/swriter/01/06180000.xhp b/source/text/swriter/01/06180000.xhp
index f9164667a3..60117eeced 100644
--- a/source/text/swriter/01/06180000.xhp
+++ b/source/text/swriter/01/06180000.xhp
@@ -70,13 +70,13 @@
<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US"><ahelp hid="modules/swriter/ui/linenumbering/linesspin">Enter the number of lines to leave between the separators.</ahelp></paragraph>
<paragraph role="note" id="par_id3153532" xml-lang="en-US">Separators are only displayed in lines that are not numbered.</paragraph>
<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="2">Count</paragraph>
-<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US">Specify whether to include empty paragraphs or lines in text frames in the line count.</paragraph>
+<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US">Specify whether to include empty paragraphs or lines in frames in the line count.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/linenumbering/blanklines" id="bm_id3154573" localize="false"/>
<paragraph role="heading" id="hd_id3153677" xml-lang="en-US" level="3">Blank lines</paragraph>
<paragraph role="paragraph" id="par_id3150973" xml-lang="en-US"><ahelp hid="modules/swriter/ui/linenumbering/blanklines">Includes empty paragraphs in the line count.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/linenumbering/linesintextframes" id="bm_id3150990" localize="false"/>
-<paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="3">Lines in text frames</paragraph>
-<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US"><ahelp hid="modules/swriter/ui/linenumbering/linesintextframes">Adds line numbers to text in text frames. The numbering restarts in each text frame, and is excluded from the line count in the main text area of the document.</ahelp> In <link href="text/swriter/02/03210000.xhp" name="linked frames">linked frames</link>, the numbering is not restarted.</paragraph>
+<paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="3">Lines in frames</paragraph>
+<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US"><ahelp hid="modules/swriter/ui/linenumbering/linesintextframes">Adds line numbers to text in frames. The numbering restarts in each frame, and is excluded from the line count in the main text area of the document.</ahelp> In <link href="text/swriter/02/03210000.xhp" name="linked frames">linked frames</link>, the numbering is not restarted.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/linenumbering/restarteverynewpage" id="bm_id3155902" localize="false"/>
<paragraph role="heading" id="hd_id3151320" xml-lang="en-US" level="3">Restart every new page</paragraph>
<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US"><ahelp hid="modules/swriter/ui/linenumbering/restarteverynewpage">Restarts line numbering at the top of each page in the document.</ahelp></paragraph>
diff --git a/source/text/swriter/04/01020000.xhp b/source/text/swriter/04/01020000.xhp
index 2499e588c9..22172d20fd 100644
--- a/source/text/swriter/04/01020000.xhp
+++ b/source/text/swriter/04/01020000.xhp
@@ -1054,8 +1054,8 @@
<paragraph xml-lang="en-US" id="hd_id3149010" role="tablecontent">Esc</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149024" role="tablecontent">Cursor is inside a text frame and no text is selected: Escape selects the text frame.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149039" role="tablecontent">Text frame is selected: Escape clears the cursor from the text frame.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149024" role="tablecontent">Cursor is inside a frame and no text is selected: Escape selects the frame.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149039" role="tablecontent">Frame is selected: Escape clears the cursor from the frame.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -1063,7 +1063,7 @@
<paragraph xml-lang="en-US" id="hd_id3149054" role="tablecontent">F2 or Enter or any key that produces a character on screen</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149890" role="tablecontent">If a text frame is selected: positions the cursor to the end of the text in the text frame. If you press any key that produces a character on screen, and the document is in edit mode, the character is appended to the text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149890" role="tablecontent">If a frame is selected: positions the cursor to the end of the text in the frame. If you press any key that produces a character on screen, and the document is in edit mode, the character is appended to the text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/source/text/swriter/guide/captions.xhp b/source/text/swriter/guide/captions.xhp
index 0b4599d227..2881a3e993 100644
--- a/source/text/swriter/guide/captions.xhp
+++ b/source/text/swriter/guide/captions.xhp
@@ -35,7 +35,7 @@
<bookmark_value>tables; labeling</bookmark_value>
<bookmark_value>frames; labeling</bookmark_value>
<bookmark_value>charts; labeling</bookmark_value>
- <bookmark_value>text frames; labeling</bookmark_value>
+ <bookmark_value>frames; labeling</bookmark_value>
<bookmark_value>draw objects; inserting captions</bookmark_value>
<bookmark_value>legends, see also captions</bookmark_value>
</bookmark>
diff --git a/source/text/swriter/guide/text_centervert.xhp b/source/text/swriter/guide/text_centervert.xhp
index c7326c2e91..f3d93590be 100644
--- a/source/text/swriter/guide/text_centervert.xhp
+++ b/source/text/swriter/guide/text_centervert.xhp
@@ -28,8 +28,8 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155177">
- <bookmark_value>text frames; centering on pages</bookmark_value>
- <bookmark_value>centering;text frames on pages</bookmark_value>
+ <bookmark_value>frames; centering on pages</bookmark_value>
+ <bookmark_value>centering;frames on pages</bookmark_value>
<bookmark_value>title pages; centering text on</bookmark_value>
</bookmark>
diff --git a/source/text/swriter/guide/text_frame.xhp b/source/text/swriter/guide/text_frame.xhp
index ca57d727a9..f48e81f516 100644
--- a/source/text/swriter/guide/text_frame.xhp
+++ b/source/text/swriter/guide/text_frame.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,29 +18,29 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textswriterguidetext_framexml" indexer="include">
- <title xml-lang="en-US" id="tit">Inserting, Editing, and Linking Text Frames</title>
+ <title xml-lang="en-US" id="tit">Inserting, Editing, and Linking Frames</title>
<filename>/text/swriter/guide/text_frame.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149487"><bookmark_value>text frames; inserting/editing/linking</bookmark_value>
- <bookmark_value>editing;text frames</bookmark_value>
- <bookmark_value>inserting;text frames</bookmark_value>
- <bookmark_value>resizing;text frames, by mouse</bookmark_value>
- <bookmark_value>scaling; text frames, by mouse</bookmark_value>
- <bookmark_value>links;text frames</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149487"><bookmark_value>frames; inserting/editing/linking</bookmark_value>
+ <bookmark_value>editing;frames</bookmark_value>
+ <bookmark_value>inserting;frames</bookmark_value>
+ <bookmark_value>resizing;frames, by mouse</bookmark_value>
+ <bookmark_value>scaling; frames, by mouse</bookmark_value>
+ <bookmark_value>links;frames</bookmark_value>
<bookmark_value>text flow; from frame to frame</bookmark_value>
<bookmark_value>frames; linking</bookmark_value>
- <bookmark_value>printing;hiding text frames from printing</bookmark_value>
+ <bookmark_value>printing;hiding frames from printing</bookmark_value>
</bookmark><comment>mw deleted "text;" and changed "printing;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3149487" role="heading" level="1"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Text Frames">Inserting, Editing, and Linking Text Frames</link>
+<paragraph xml-lang="en-US" id="hd_id3149487" role="heading" level="1"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Frames">Inserting, Editing, and Linking Frames</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149842" role="paragraph">A text frame is a container for text and graphics that you can place anywhere on a page. You can also use a frame to apply a column layout to text.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3156104" role="heading" level="2">To Insert a Text Frame</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149842" role="paragraph">A frame is a container for text and graphics that you can place anywhere on a page. You can also use a frame to apply a column layout to text.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156104" role="heading" level="2">To Insert a Frame</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3149961" role="listitem">Select the text that you want to include in the frame.</paragraph>
@@ -49,23 +49,23 @@
<paragraph xml-lang="en-US" id="par_id3149602" role="listitem">Choose <emph>Insert - Frame</emph>, and click OK.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="hd_id3145115" role="heading" level="2">To Edit a Text Frame</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145115" role="heading" level="2">To Edit a Frame</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149578" role="listitem">To edit the contents of a text frame, click in the frame, and make the changes that you want.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="listitem">To edit the contents of a frame, click in the frame, and make the changes that you want.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3156239" role="listitem">To edit a frame, select the frame, right-click, and then choose a formatting option. You can also right-click the selected frame, and choose <emph>Frame</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156261" role="listitem">To resize a text frame, click an edge of the frame, and drag one of the edges or corners of the frame. Hold down Shift while you drag to maintain the proportion of the frame.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156261" role="listitem">To resize a frame, click an edge of the frame, and drag one of the edges or corners of the frame. Hold down Shift while you drag to maintain the proportion of the frame.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3153386" role="heading" level="2">To Hide Text From Printing</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154262" role="paragraph">Any Writer text frame can be set to a mode which allows viewing the text on screen, but hides the text from printing.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154262" role="paragraph">Any Writer frame can be set to a mode which allows viewing the text on screen, but hides the text from printing.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154858" role="listitem">Select the text frame (you see the eight handles).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154858" role="listitem">Select the frame (you see the eight handles).</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3155875" role="listitem">Choose <emph>Format - Frame and Object - Properties - Options</emph>.</paragraph>
@@ -74,14 +74,14 @@
<paragraph xml-lang="en-US" id="par_id3155899" role="listitem">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="hd_id3148701" role="heading" level="2">To Link Text Frames</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149986" role="paragraph">You can link Writer text frames so that their contents automatically flow from one frame to another.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148701" role="heading" level="2">To Link Frames</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149986" role="paragraph">You can link Writer frames so that their contents automatically flow from one frame to another.</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3153025" role="listitem">Click the edge of a frame that you want to link. Selection handles appear on the edges of the frame.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150223" role="listitem">On the <item type="menuitem">Frame</item> Bar, click the <item type="menuitem">Link Frames</item> icon
+ <paragraph xml-lang="en-US" id="par_id3150223" role="listitem">On the <item type="menuitem">Frame</item> Bar, click the <item type="menuitem">Link Frames</item> icon
<image id="img_id3148968" src="cmd/sc_chainframes.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148968">Icon</alt>
</image>.</paragraph>
</listitem>
@@ -108,7 +108,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id3151083" role="paragraph">When you select a linked frame, a line is displayed that connects the linked frames.</paragraph>
- <paragraph xml-lang="en-US" id="par_id5853144" role="note">The AutoSize feature is available only for the last frame in a chain of linked frames.</paragraph><comment>UFI: removed
+ <paragraph xml-lang="en-US" id="par_id5853144" role="note">The AutoSize feature is available only for the last frame in a chain of linked frames.</paragraph><comment>UFI: removed
id="par_id3147542" You can only change the height of the last frame in a series of linked frames.
Obviously this works now</comment>
<section id="relatedtopics">
diff --git a/source/text/swriter/main0503.xhp b/source/text/swriter/main0503.xhp
index cc42492320..2d6b4d172b 100644
--- a/source/text/swriter/main0503.xhp
+++ b/source/text/swriter/main0503.xhp
@@ -39,7 +39,7 @@
<paragraph role="paragraph" id="par_id3147239" xml-lang="en-US">$[officename] offers a wide variety of options to design documents. Use the <link href="text/swriter/01/05140000.xhp" name="Styles">Styles window</link> to create, assign and modify styles for paragraphs, individual characters, frames and pages. In addition, the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> helps you to quickly move around inside your documents, lets you look at your document in an outline view, and keeps track of the objects that you have inserted into your document.</paragraph>
<paragraph role="paragraph" id="par_id3147272" xml-lang="en-US">You can also create various <link href="text/swriter/01/04120000.xhp" name="indexes and tables">indexes and tables</link> in text documents. You can define the structure and appearance of the indexes and tables according to your individual needs. Live hyperlinks and bookmarks let you jump directly to the corresponding items in the text.</paragraph>
<paragraph role="heading" id="hd_id3145596" xml-lang="en-US" level="2">Desktop Publishing with $[officename] Writer</paragraph>
-<paragraph role="paragraph" id="par_id3145610" xml-lang="en-US">$[officename] Writer contains numerous desktop publishing and drawing tools to assist you in creating professionally styled documents, such as brochures, newsletters and invitations. You can format your documents with multi-column layouts, <link href="text/swriter/guide/text_frame.xhp" name="text frames">text frames</link>, <link href="text/swriter/guide/insert_graphic.xhp" name="graphics">graphics</link>, <link href="text/swriter/guide/table_insert.xhp" name="tables">tables</link>, and other objects.</paragraph>
+<paragraph role="paragraph" id="par_id3145610" xml-lang="en-US">$[officename] Writer contains numerous desktop publishing and drawing tools to assist you in creating professionally styled documents, such as brochures, newsletters and invitations. You can format your documents with multi-column layouts, <link href="text/swriter/guide/text_frame.xhp" name="frames">frames</link>, <link href="text/swriter/guide/insert_graphic.xhp" name="graphics">graphics</link>, <link href="text/swriter/guide/table_insert.xhp" name="tables">tables</link>, and other objects.</paragraph>
<paragraph role="heading" id="hd_id3145649" xml-lang="en-US" level="2">Calculations</paragraph>
<paragraph role="paragraph" id="par_id3145663" xml-lang="en-US">Text documents in $[officename] have an integrated <link href="text/swriter/main0214.xhp" name="calculation function">calculation function</link> that helps you execute sophisticated calculations or logical links. You can easily create a table in a text document in order to perform calculations.</paragraph>
<paragraph role="heading" id="hd_id3151192" xml-lang="en-US" level="2">Creating Drawings</paragraph>