summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-03-26 17:18:00 +0100
committerMichael Stahl <mstahl@redhat.com>2013-03-26 22:46:52 +0100
commit341ef992d8fdc702e97274779cf3aa92133c547b (patch)
tree1d6a4942d6910e4da65f78dea83f51ada0746bfa
parent76f7263f5cf10b2dbdc55a195cf10e4fd3c4d7bd (diff)
help: remove "Internet" tab page documentation
The SfxInternetPage was removed in dbba84906d394187b105b9b899ec10065d2d1fc8 Move documentation of target frames to some Hyperlink page. Change-Id: Iae453034cb79a8f451a5c34e0f3b76d224e8a6f0
-rw-r--r--AllLangHelp_shared.mk1
-rw-r--r--source/text/shared/01/01100000.xhp1
-rw-r--r--source/text/shared/01/01100500.xhp125
-rw-r--r--source/text/shared/01/02220000.xhp2
-rw-r--r--source/text/shared/01/02220100.xhp5
-rw-r--r--source/text/shared/01/05020400.xhp53
-rw-r--r--source/text/swriter/01/05060800.xhp4
7 files changed, 56 insertions, 135 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index d30624b900..0f15299e17 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/01/01100200 \
helpcontent2/source/text/shared/01/01100300 \
helpcontent2/source/text/shared/01/01100400 \
- helpcontent2/source/text/shared/01/01100500 \
helpcontent2/source/text/shared/01/01100600 \
helpcontent2/source/text/shared/01/01110000 \
helpcontent2/source/text/shared/01/01110101 \
diff --git a/source/text/shared/01/01100000.xhp b/source/text/shared/01/01100000.xhp
index 9e9df7ce5a..bd534adeb7 100644
--- a/source/text/shared/01/01100000.xhp
+++ b/source/text/shared/01/01100000.xhp
@@ -40,7 +40,6 @@
<embed href="text/shared/01/01100200.xhp#dokument"/>
<embed href="text/shared/01/01100100.xhp#beschreibung"/>
<embed href="text/shared/01/01100300.xhp#benutzer"/>
-<embed href="text/shared/01/01100500.xhp#internet"/>
<embed href="text/shared/01/01100600.xhp#security"/>
<switch select="appl">
<case select="WRITER">
diff --git a/source/text/shared/01/01100500.xhp b/source/text/shared/01/01100500.xhp
deleted file mode 100644
index c6115f166c..0000000000
--- a/source/text/shared/01/01100500.xhp
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0101100500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Internet</title>
-<filename>/text/shared/01/01100500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:57:17">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="internet">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145669"><bookmark_value>auto reloading HTML documents</bookmark_value>
-<bookmark_value>reloading; HTML documents, automatically</bookmark_value>
-<bookmark_value>loading; HTML documents, automatically</bookmark_value>
-<bookmark_value>HTML documents; auto reloading</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/InternetInfoPage" id="bm_id3155069" localize="false"/>
-<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100500.xhp" name="Internet">Internet</link></paragraph>
-<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="sfx2/ui/internetinfopage/InternetInfoPage">Sets the refresh and redirect options for an HTML page.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info6"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/noautoupdate" id="bm_id3149798" localize="false"/>
-<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="2" l10n="U" oldref="26">Do not refresh automatically</paragraph>
-<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="sfx2/ui/internetinfopage/noautoupdate">User must refresh the page manually.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/reloadupdate" id="bm_id3153577" localize="false"/>
-<paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Refresh this document</paragraph>
-<paragraph role="paragraph" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="sfx2/ui/internetinfopage/reloadupdate">Reloads the HTML page after the number of seconds that you enter in the <emph>seconds</emph> box. To observe the result, open the page in a browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/reloadnf" id="bm_id6386608" localize="false"/>
-<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="U" oldref="7">Seconds</paragraph>
-<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="sfx2/ui/internetinfopage/reloadnf">Enter the number of seconds to wait before the page is reloaded.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/forwardupdate" id="bm_id3147210" localize="false"/>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="28">Redirect from this document</paragraph>
-<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="sfx2/ui/internetinfopage/forwardupdate">Loads a page that you specify after the number of seconds that you enter in the <emph>seconds </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/afternf" id="bm_id7947935" localize="false"/>
-<paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="30">after ... seconds</paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="sfx2/ui/internetinfopage/afternf">Enter the number of seconds to wait before redirecting the browser to a different file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/forwarded" id="bm_id5280617" localize="false"/>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="9">to URL</paragraph>
-<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="sfx2/ui/internetinfopage/forwarded">Enter the URL address of the file that you want to open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/browse" id="bm_id4792931" localize="false"/>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="32">...</paragraph>
-<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="sfx2/ui/internetinfopage/browse">Locate the file that you want to open, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2/ui/internetinfopage/framecb" id="bm_id1734366" localize="false"/>
-<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="11">to frame</paragraph>
-<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="sfx2/ui/internetinfopage/framecb">If the current HTML page uses frames, select the name of the <link href="text/shared/00/00000002.xhp#frame" name="target frame">target frame</link> where you want the file to be loaded.</ahelp></paragraph>
-<section id="targets">
-<table id="tbl_id3155829">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="24">Name of Frame</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154924" xml-lang="en-US" l10n="U" oldref="25">Definition</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="14">Named entries</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="15">File opens in a named frame in the current HTML document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="16">_self</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="17">File opens in the current frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="18">_blank</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="19">File opens in a new page.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="20">_parent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154216" xml-lang="en-US" l10n="U" oldref="21">File opens in the parent frame of the current frame. If there is no parent frame, the current frame is used.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="22">_top</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="23">File opens in the topmost frame in the hierarchy.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/shared/01/02220000.xhp b/source/text/shared/01/02220000.xhp
index d2dde2f9f8..9987dba89f 100644
--- a/source/text/shared/01/02220000.xhp
+++ b/source/text/shared/01/02220000.xhp
@@ -255,7 +255,7 @@
<paragraph role="paragraph" id="par_id3159090" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAP:EDT_TEXT">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp> If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
<paragraph role="heading" id="hd_id3158445" xml-lang="en-US" level="2" l10n="U" oldref="33">Frame:</paragraph>
<paragraph role="paragraph" id="par_id3150208" xml-lang="en-US" l10n="U" oldref="34">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name from the list.</paragraph>
-<paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="35"><link href="text/shared/01/01100500.xhp" name="List of frame types">List of frame types</link></paragraph>
+<paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="35"><link href="text/shared/01/05020400.xhp#targets" name="List of frame types">List of frame types</link></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_IMAPDLG_GRAPHWND" id="bm_id3145131" localize="false"/><paragraph role="heading" id="hd_id3150345" xml-lang="en-US" level="2" l10n="U" oldref="36">Graphic View</paragraph>
<paragraph role="paragraph" id="par_id3150382" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_IMAPDLG_GRAPHWND"></ahelp><comment>dont hide the imagemap if extended tips are on</comment>Displays the image map, so that you can click and edit the hotspots.</paragraph>
<section id="relatedtopics">
diff --git a/source/text/shared/01/02220100.xhp b/source/text/shared/01/02220100.xhp
index 29c48bd626..32ff4deefb 100644
--- a/source/text/shared/01/02220100.xhp
+++ b/source/text/shared/01/02220100.xhp
@@ -55,8 +55,5 @@
<bookmark xml-lang="en-US" branch="hid/SVX_MULTILINEEDIT_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION" id="bm_id3190710" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id7557298" role="heading" level="2" l10n="NEW">Description</paragraph>
<paragraph xml-lang="en-US" id="par_id5057222" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp></paragraph>
- <section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
- </section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/01/05020400.xhp b/source/text/shared/01/05020400.xhp
index 1b598a8476..b0cf2a4fd1 100644
--- a/source/text/shared/01/05020400.xhp
+++ b/source/text/shared/01/05020400.xhp
@@ -77,6 +77,58 @@
<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="modules/swriter/ui/charurlpage/targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
</variable></paragraph>
</section>
+<section id="targets">
+<table id="tbl_id3155829">
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablehead" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="24">Name of Frame</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablehead" id="par_id3154924" xml-lang="en-US" l10n="U" oldref="25">Definition</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="14">Named entries</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="15">File opens in a named frame in the current HTML document.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="16">_self</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="17">File opens in the current frame.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="18">_blank</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="19">File opens in a new page.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="20">_parent</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3154217" xml-lang="en-US" l10n="U" oldref="21">File opens in the parent frame of the current frame. If there is no parent frame, the current frame is used.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="22">_top</paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="tablecontent" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="23">File opens in the topmost frame in the hierarchy.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+</section>
<paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="22">Character Styles</paragraph>
<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="23">Specify the formatting options for the hyperlink.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/visitedlb" id="bm_id3148740" localize="false"/>
@@ -88,7 +140,6 @@
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="C"><link href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink dialog</link></paragraph>
<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05060700.xhp" name="Assign macro">Assign macro</link></paragraph>
-<paragraph role="paragraph" id="par_id3154630" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100500.xhp" name="Target frame">Target frame</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/05060800.xhp b/source/text/swriter/01/05060800.xhp
index 25fda96bb5..30d2c864f4 100644
--- a/source/text/swriter/01/05060800.xhp
+++ b/source/text/swriter/01/05060800.xhp
@@ -55,7 +55,7 @@
<paragraph xml-lang="en-US" id="par_id3147217" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_NAME">Enter a name for the hyperlink.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_FRM_URL:CB_FRAME" id="bm_id3149035" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153636" role="heading" level="2" l10n="U" oldref="7">Frame</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149042" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:COMBOBOX:TP_FRM_URL:CB_FRAME">Specify the name of the frame where you want to open the targeted file.</ahelp> The predefined target frame names are described <link href="text/shared/01/01100500.xhp" name="here">here</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149042" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:COMBOBOX:TP_FRM_URL:CB_FRAME">Specify the name of the frame where you want to open the targeted file.</ahelp> The predefined target frame names are described <link href="text/shared/01/05020400.xhp#targets" name="here">here</link>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3152772" role="heading" level="2" l10n="U" oldref="9">Image Map</paragraph>
<paragraph xml-lang="en-US" id="par_id3155138" role="paragraph" l10n="U" oldref="10">Select the type of <link href="text/shared/00/00000002.xhp#imagemap" name="ImageMap">ImageMap</link> that you want to use. The ImageMap settings override the hyperlink settings that you enter on this page.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_URL:CB_SERVER" id="bm_id3149170" localize="false"/>
@@ -69,4 +69,4 @@
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph xml-lang="en-US" id="par_id3151380" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>