source/text/shared/02/09070100.xhp | 11 +----------
source/text/shared/optionen/01020100.xhp | 5 +----
2 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit 798773a4ad50b9311758a4ed2275f2f4ff53a3e0
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Nov 7 12:27:52 2023 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue Nov 7 18:19:18 2023 +0100
tdf#146386 helpcontent2: FTP UI is removed
Change-Id: Ie2d38acdf570644dbd087fd14e9485f263bdbb7b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/159067
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/source/text/shared/02/09070100.xhp
b/source/text/shared/02/09070100.xhp
index 81aa41fa0f..37ab5bfdc9 100644
--- a/source/text/shared/02/09070100.xhp
+++ b/source/text/shared/02/09070100.xhp
@@ -29,18 +29,15 @@
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/HyperlinkInternetPage"
id="bm_id3149119" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/@@nowidget@@" id="bm_id3149119"
localize="false"/>
<h1 id="hd_id3151100"><link
href="text/shared/02/09070100.xhp">Internet</link></h1>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US"><ahelp
hid=".">Use the <emph>Internet</emph> page of the <link
href="text/shared/02/09070000.xhp"><emph>Hyperlink</emph> dialog</link> to edit
hyperlinks with <emph>WWW</emph> or <emph>FTP</emph>
addresses.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US"><ahelp
hid=".">Use the <emph>Internet</emph> page of the <link
href="text/shared/02/09070000.xhp"><emph>Hyperlink</emph> dialog</link> to edit
hyperlinks with <emph>WWW</emph> addresses.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#hypdiainternet"/>
</section>
<embed href="text/shared/06/shared_cui_screenshots.xhp#hyperlinkinternetpage"/>
-<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US">The fields for
the login name, password and anonymous user are only available for FTP
addresses.</paragraph>
<h2 id="hd_id3145090">Type of hyperlink</h2>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/linktyp_internet" id="bm_id3154823"
localize="false"/><h3 id="hd_id3151226">Web</h3>
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/linktyp_internet">Creates an
"<emph>http://</emph>" hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/linktyp_ftp" id="bm_id3153311"
localize="false"/><h3 id="hd_id3153683">FTP</h3>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/linktyp_ftp">Creates an "<emph>FTP://</emph>"
hyperlink.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkinternetpage/target"
id="bm_id3146797" localize="false"/><h3 id="hd_id3150443">URL</h3>
<paragraph role="paragraph" id="par_id9887081" xml-lang="en-US"><ahelp
hid=".">Enter a URL for the file that you want to open when you click the
hyperlink. If you do not specify a target frame, the file opens in the current
document or frame.</ahelp><comment>see i48946</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkmarkdialog/@@nowidget@@" id="bm_id3159167"
localize="false"/>
@@ -48,12 +45,6 @@
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmarkdialog/TreeListBox" visibility="hidden">Specifies the
position in the target document where you wish to jump to.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmarkdialog/apply"
id="bm_id3159177" localize="false"/><paragraph role="paragraph"
id="par_id3149164" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmarkdialog/apply" visibility="hidden">Inserts the target
in the <emph>Target</emph> field of the <emph>Hyperlink</emph>
dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmarkdialog/close"
id="bm_id3145416" localize="false"/><paragraph role="paragraph"
id="par_id3155388" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmarkdialog/close" visibility="hidden">Once the hyperlink
has been completely entered, click on <emph>Close</emph> to set the link and
leave the dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkinternetpage/login"
id="bm_id3154307" localize="false"/><h3 id="hd_id3153320">Login name</h3>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/login">Specifies your login name, if you are
working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkinternetpage/password"
id="bm_id3154923" localize="false"/><h3 id="hd_id3148944">Password</h3>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/password">Specifies your password, if you are
working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkinternetpage/anonymous"
id="bm_id3149294" localize="false"/><h3 id="hd_id3149046">Anonymous user</h3>
-<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/anonymous">Allows you to log in to the FTP
address as an anonymous user.</ahelp></paragraph>
<section id="further_settings">
<h2 id="hd_id3148663">Further settings</h2>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/frame"
id="bm_id3153778" localize="false"/>
diff --git a/source/text/shared/optionen/01020100.xhp
b/source/text/shared/optionen/01020100.xhp
index 5ec1a0d571..f095942256 100644
--- a/source/text/shared/optionen/01020100.xhp
+++ b/source/text/shared/optionen/01020100.xhp
@@ -57,15 +57,12 @@
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US"><ahelp
hid="cui/ui/optproxypage/http">Type the name of the proxy server for <link
href="text/shared/00/00000002.xhp#http">HTTP</link>.</ahelp> Type the port in
the right-hand field.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/https"
id="bm_id431531" localize="false"/><h3 id="hd_id9971922">HTTPS proxy</h3>
<paragraph role="paragraph" id="par_id5319071" xml-lang="en-US"><ahelp
hid=".">Type the name of the proxy server for HTTPS. Type the port in the
right-hand field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/ftp"
id="bm_id3153360" localize="false"/><h3 id="hd_id3150543">FTP proxy</h3>
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US"><ahelp
hid="cui/ui/optproxypage/ftp">Type the name of the proxy server for <link
href="text/shared/00/00000002.xhp#ftp">FTP</link>.</ahelp> Type the port in the
right-hand field.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/noproxy"
id="bm_id3154908" localize="false"/><h3 id="hd_id3125863">No proxy for</h3>
<paragraph role="paragraph" id="par_id3151178" xml-lang="en-US"><ahelp
hid="cui/ui/optproxypage/noproxy">Specifies the names of the servers that do
not require any proxy servers, separated by semicolons.</ahelp> These are
servers addressed in your local network, and servers used for video and audio
streaming, for example.</paragraph>
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US">You can also
use placeholders for the names of hosts and domains. For example, type
*.sun.com to address all the hosts in the sun.com domain without
proxy.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/httpport"
id="bm_id3152920" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/httpsport"
id="bm_id3139439" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/ftpport"
id="bm_id3147229" localize="false"/>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US"><ahelp
hid="cui/ui/optproxypage/ftpport">Type the port for the corresponding proxy
server.</ahelp> The maximum value of a port number is fixed at
65535.</paragraph>
+<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US"><ahelp
hid="cui/ui/optproxypage/httpsport">Type the port for the corresponding proxy
server.</ahelp> The maximum value of a port number is fixed at
65535.</paragraph>
<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01" />
</body>
</helpdocument>
