summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2024-01-25 02:59:21 +0100
committerOlivier Hallot <olivier.hallot@libreoffice.org>2024-01-25 16:36:37 +0100
commitc762a3dc812420858edbab9bf841ca69c133b985 (patch)
tree268ce6e2c40f35819743c27e74083864205d9c97
parent5d2a29ee4f4556b0133e73ea429c9c1aaede0581 (diff)
tdf#146386 (related) FTP protocol is no longer supported
so remove references to it from helpcontent Change-Id: If0dc888fbb8106d23a250047772224043a313c60 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162527 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/shared/00/00000002.xhp8
-rw-r--r--source/text/shared/01/password_main.xhp2
-rw-r--r--source/text/shared/guide/cmis-remote-files-setup.xhp10
-rw-r--r--source/text/shared/guide/cmis-remote-files.xhp4
-rw-r--r--source/text/shared/guide/doc_save.xhp1
-rw-r--r--source/text/shared/main0650.xhp2
-rw-r--r--source/text/shared/optionen/01030500.xhp2
-rw-r--r--source/text/swriter/01/05060800.xhp2
8 files changed, 11 insertions, 20 deletions
diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp
index baede546f3..a63d1bae74 100644
--- a/source/text/shared/00/00000002.xhp
+++ b/source/text/shared/00/00000002.xhp
@@ -66,12 +66,6 @@
<paragraph id="par_id3157909" role="paragraph" xml-lang="en-US">Frames are useful for designing the layout of <link href="text/shared/00/00000002.xhp#html">HTML</link> pages. $[officename] uses floating frames into which you can place objects such as graphics, movie files and sound. The context menu of a frame shows the options for restoring or editing frame contents. Some of these commands are also listed in <emph>Edit - Object</emph> when the frame is selected.</paragraph>
</section>
-<section id="ftp">
-
-<h2 id="hd_id3147077" xml-lang="en-US">FTP</h2>
-<paragraph id="par_id3147335" role="paragraph" xml-lang="en-US">FTP stands for File Transfer Protocol and is the standard transfer protocol for files in the Internet. An FTP server is a program on a computer connected to the Internet which stores files to be transmitted with the aid of FTP. While FTP is responsible for transmitting and downloading Internet files, <link href="text/shared/00/00000002.xhp#http">HTTP</link> (Hypertext Transfer Protocol) provides the connection setup and data transfer between WWW servers and clients.</paragraph>
-</section>
-
<section id="html">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145609">
<bookmark_value>HTML; definition</bookmark_value>
@@ -200,7 +194,7 @@
<h2 id="hd_id3153766" xml-lang="en-US">URL</h2>
-<paragraph id="par_id3152931" role="paragraph" xml-lang="en-US">The Uniform Resource Locator (URL) displays the address of a document or a server in the Internet. The general structure of a URL varies according to type and is generally in the form Service://Hostname:Port/Path/Page#Mark although not all elements are always required. An URL can be a FTP address, a WWW (HTTP) address, a file address or an email address.</paragraph>
+<paragraph id="par_id3152931" role="paragraph" xml-lang="en-US">The Uniform Resource Locator (URL) displays the address of a document or a server in the Internet. The general structure of a URL varies according to type and is generally in the form Service://Hostname:Port/Path/Page#Mark although not all elements are always required. An URL can be a WWW (HTTP) address, a file address or an email address.</paragraph>
</section>
</sort>
</body>
diff --git a/source/text/shared/01/password_main.xhp b/source/text/shared/01/password_main.xhp
index a74fa571b2..f9809564d7 100644
--- a/source/text/shared/01/password_main.xhp
+++ b/source/text/shared/01/password_main.xhp
@@ -33,7 +33,7 @@
<h1 id="hd_id3154183">Set Master Password</h1>
<paragraph xml-lang="en-US" id="par_id3154841" role="paragraph"><ahelp hid=".">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
<section id="password_text">
- <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id3147000" role="paragraph">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph>
</section>
<section id="password_rules">
diff --git a/source/text/shared/guide/cmis-remote-files-setup.xhp b/source/text/shared/guide/cmis-remote-files-setup.xhp
index 2c088f6872..6448f572f5 100644
--- a/source/text/shared/guide/cmis-remote-files-setup.xhp
+++ b/source/text/shared/guide/cmis-remote-files-setup.xhp
@@ -93,26 +93,24 @@
<paragraph id="par_id150820161816036744" role="paragraph" xml-lang="en-US"><variable id="okbutton">Once the connection is defined, click <emph>OK</emph> to connect. The dialog will dim until the connection is established with the server.</variable> A dialog asking for the user name and the password may pop up to let you log in the server. Proceed entering the right user name and password.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id170820161240508275">
<bookmark_value>SSH;remote file service setup</bookmark_value>
- <bookmark_value>FTP;remote file service setup</bookmark_value>
- <bookmark_value>remote file service setup;FTP</bookmark_value>
<bookmark_value>remote file service setup;SSH</bookmark_value>
</bookmark>
-<h3 id="hd_id1508201618160340">Connecting to <link href="text/shared/00/00000002.xhp#ftp">FTP</link> and SSH servers</h3>
+<h3 id="hd_id1508201618160340">Connecting to SSH servers</h3>
<paragraph id="par_id150820161816034969" role="paragraph" xml-lang="en-US" localize="false"><embedvar href="text/shared/guide/cmis-remote-files-setup.xhp#introservice" markup="keep"/></paragraph>
<list type="unordered">
<listitem>
- <paragraph id="par_id150820161816039418" role="listitem" xml-lang="en-US"><emph>Type</emph>: FTP or SSH</paragraph>
+ <paragraph id="par_id150820161816039418" role="listitem" xml-lang="en-US"><emph>Type</emph>: SSH</paragraph>
</listitem>
<listitem>
<paragraph id="par_id15082016181603238" role="listitem" xml-lang="en-US"><emph>Host</emph>: the server URL, usually in the form <item type="literal">file.service.com</item></paragraph>
</listitem>
<listitem>
- <paragraph id="par_id150820161816046286" role="listitem" xml-lang="en-US"><emph>Port</emph>: port number (usually 21 for FTP and 22 for SSH).</paragraph>
+ <paragraph id="par_id150820161816046286" role="listitem" xml-lang="en-US"><emph>Port</emph>: port number (usually 22 for SSH).</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id150820161816041989" role="listitem" xml-lang="en-US"><emph>User, Password</emph>: the username and password of the FTP service.</paragraph>
+ <paragraph id="par_id150820161816041989" role="listitem" xml-lang="en-US"><emph>User, Password</emph>: the username and password of the service.</paragraph>
</listitem>
<listitem>
<paragraph id="par_id150820161816047387" role="listitem" xml-lang="en-US"><variable id="rememberpw"><emph>Remember password</emph>: Check to store the password in %PRODUCTNAME’s user profile. The password will be secured by the master password in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Security - Internet passwords</menuitem>.</variable></paragraph>
diff --git a/source/text/shared/guide/cmis-remote-files.xhp b/source/text/shared/guide/cmis-remote-files.xhp
index c926a44337..ee37e40644 100644
--- a/source/text/shared/guide/cmis-remote-files.xhp
+++ b/source/text/shared/guide/cmis-remote-files.xhp
@@ -23,7 +23,7 @@
<h1 id="hd_id150820161615009403"><variable id="remote-files"><link href="text/shared/guide/cmis-remote-files.xhp">Opening and saving files on remote servers</link></variable></h1>
<paragraph id="par_id15082016161546265" role="paragraph" xml-lang="en-US"><ahelp hid="fps/ui/remotefilesdialog/RemoteFilesDialog">Remote Files Service User Guide</ahelp></paragraph>
<paragraph id="par_id150820161816031425" role="paragraph" xml-lang="en-US">%PRODUCTNAME can open and save files stored on remote servers. Keeping files on remote servers allows to work with the documents using different computers. For example, you can work on a document in the office during the day and edit it at home for last-minute changes. Storing files on a remote server also protects them from computer loss or hard disk failure. Some servers are also able to check in and check out files, thus controlling their usage and access.</paragraph>
-<paragraph id="par_id150820161816033566" role="paragraph" xml-lang="en-US">%PRODUCTNAME supports many document servers that use well known network protocols such as FTP, WebDAV, Windows share, and SSH. It also supports popular services like Google Drive as well as commercial and open source servers that implement the OASIS CMIS standard.</paragraph>
+<paragraph id="par_id150820161816033566" role="paragraph" xml-lang="en-US">%PRODUCTNAME supports many document servers that use well known network protocols such as WebDAV, Windows share, and SSH. It also supports popular services like Google Drive as well as commercial and open source servers that implement the OASIS CMIS standard.</paragraph>
<paragraph id="par_id170820161605418200" role="paragraph" xml-lang="en-US">To work with a remote file service you must first <link href="text/shared/guide/cmis-remote-files-setup.xhp">setup a remote file connection</link>.</paragraph>
</section>
@@ -71,7 +71,7 @@
<h2 id="hd_id170820161605421283">Checking out and checking in files</h2>
<paragraph id="par_id170820161605429941" role="paragraph" xml-lang="en-US">The Check Out and Check In actions control updates to the document and prevent unwanted overwrites in a CMIS remote service.</paragraph>
<paragraph id="par_id17082016160542203" role="paragraph" xml-lang="en-US">Checking out a document locks it, preventing other users from writing changes to it. Only one user can have a particular document checked out (locked) at any time. Checking in a document or canceling the checkout unlocks the document.</paragraph>
-<note id="par_id170820161605426690">There are no checkin/checkout controls for remote files in Windows Shares, WebDAV, FTP and SSH services.</note>
+<note id="par_id170820161605426690">There are no checkin/checkout controls for remote files in Windows Shares, WebDAV and SSH services.</note>
<paragraph id="par_id170820161605428976" role="paragraph" xml-lang="en-US">When a file is open from a CMIS remote file service, %PRODUCTNAME displays a <emph>Check Out</emph> button on the top message area. Click the <emph>Check Out</emph> button to lock the file in the server to prevent edition by another user. Alternatively choose <item type="menuitem">File - Check Out</item>.</paragraph>
<paragraph id="par_id190820161707153804" role="paragraph" xml-lang="en-US">%PRODUCTNAME creates a working copy of the file in the server (and inserts the string <item type="literal">(Working Copy)</item> in the file name) when a file is checked out. Every edition and save operation is done in the working copy. You can save your file as many times you want. When you finished your changes, check in the file.</paragraph>
<paragraph id="par_id190820161707156843" role="paragraph" xml-lang="en-US">To check in the file, choose <item type="menuitem">File - Check In</item>. A dialog opens to insert comments about the last edition. These comments are recorded in the CMIS server for version control. The working copy replaces the existing file and its version number is updated.</paragraph>
diff --git a/source/text/shared/guide/doc_save.xhp b/source/text/shared/guide/doc_save.xhp
index 1f5ab624a4..15c4d8c071 100644
--- a/source/text/shared/guide/doc_save.xhp
+++ b/source/text/shared/guide/doc_save.xhp
@@ -37,7 +37,6 @@
<bookmark_value>spreadsheets; saving</bookmark_value>
<bookmark_value>drawings; saving</bookmark_value>
<bookmark_value>presentations; saving</bookmark_value>
-<bookmark_value>FTP; saving documents</bookmark_value>
</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="1"><variable id="doc_save"><link href="text/shared/guide/doc_save.xhp">Saving Documents</link>
</variable></paragraph>
<list type="unordered">
diff --git a/source/text/shared/main0650.xhp b/source/text/shared/main0650.xhp
index 2ca6a50439..2e9a72d854 100644
--- a/source/text/shared/main0650.xhp
+++ b/source/text/shared/main0650.xhp
@@ -41,6 +41,6 @@
</listitem>
</list>
<paragraph role="note" id="par_id9116183" xml-lang="en-US">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US">Your modifications at the <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - Advanced</emph> tab page will be used even if the Java Virtual Machine (JVM) has been started already. After any modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Internet - Proxy</emph>. Only the boxes "HTTP Proxy" and "FTP Proxy" and their ports do not require a restart—they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US">Your modifications at the <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - Advanced</emph> tab page will be used even if the Java Virtual Machine (JVM) has been started already. After any modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Internet - Proxy</emph>. Only the boxes "HTTP Proxy" and their ports do not require a restart—they will be evaluated when you click <emph>OK</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/01030500.xhp b/source/text/shared/optionen/01030500.xhp
index 6c500951c4..8f5e8cca9b 100644
--- a/source/text/shared/optionen/01030500.xhp
+++ b/source/text/shared/optionen/01030500.xhp
@@ -71,7 +71,7 @@
<note id="par_id3156276">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated.</note>
<bookmark xml-lang="en-US" branch="hid/cui/ui/opthtmlpage/savegrflocal" id="bm_id8177434" localize="false"/>
<h3 id="hd_id3144764">Copy local images to Internet</h3>
-<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US"><ahelp hid="cui/ui/opthtmlpage/savegrflocal">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using FTP. Use the <emph>Save As</emph> dialog to save the document and enter a complete FTP URL as the file name in the Internet.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US"><ahelp hid="cui/ui/opthtmlpage/savegrflocal">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using network protocol. Use the <emph>Save As</emph> dialog to save the document and enter a complete URL as the file name in the Internet.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01"/>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/05060800.xhp b/source/text/swriter/01/05060800.xhp
index f07de72987..defa7663be 100644
--- a/source/text/swriter/01/05060800.xhp
+++ b/source/text/swriter/01/05060800.xhp
@@ -48,7 +48,7 @@
<paragraph xml-lang="en-US" id="par_id3154831" role="paragraph"><ahelp hid="modules/swriter/ui/frmurlpage/url">Enter the complete path to the file that you want to open.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/frmurlpage/search" id="bm_id3149103" localize="false"/>
<h2 id="hd_id3151260">Browse</h2>
- <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph"><ahelp hid="modules/swriter/ui/frmurlpage/search">Locate the file that you want the hyperlink to open, and then click <emph>Open</emph>.</ahelp> The target file can be on your machine or on an <link href="text/shared/00/00000002.xhp#ftp">FTP server</link> in the Internet.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph"><ahelp hid="modules/swriter/ui/frmurlpage/search">Locate the file that you want the hyperlink to open, and then click <emph>Open</emph>.</ahelp> The target file can be on your machine or on the Internet.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/frmurlpage/name" id="bm_id3148983" localize="false"/>
<h2 id="hd_id3148972">Name</h2>
<paragraph xml-lang="en-US" id="par_id3147217" role="paragraph"><ahelp hid="modules/swriter/ui/frmurlpage/name">Enter a name for the hyperlink.</ahelp></paragraph>