source/text/shared/00/00000002.xhp | 39 +++++++++++------------ source/text/shared/guide/autocorr_url.xhp | 50 +++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 27 deletions(-)
New commits: commit 5b768d6f04f57ea77e66be18136908b44ac65cde Author: Seth Chaiklin <[email protected]> AuthorDate: Thu Nov 19 15:34:29 2020 +0100 Commit: Olivier Hallot <[email protected]> CommitDate: Tue Nov 24 00:31:19 2020 +0100 tdf#103463 add explanation of what strings get autocorrected to hyperlinks ( shared/guide/autocorr_url.xhp ) + add table with examples of URLS * update to <h1>,<h2> ( shared/00/00000002.xhp ) * update to <h1>,<h2> Change-Id: I67150576098eeb0e4a2ada3e4edf910b234c1dda Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106136 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp index b10de4e6f..351ebaaba 100644 --- a/source/text/shared/00/00000002.xhp +++ b/source/text/shared/00/00000002.xhp @@ -27,7 +27,6 @@ <body> - <section id="glossar"> <bookmark xml-lang="en-US" branch="index" id="bm_id3150702"> <bookmark_value>Internet glossary</bookmark_value> @@ -37,19 +36,19 @@ </bookmark> <comment>mw changed "Internet...".</comment> -<paragraph id="hd_id3150702" role="heading" level="1" xml-lang="en-US"><link href="text/shared/00/00000002.xhp" name="Glossary of Internet Terms">Glossary of Internet Terms</link></paragraph> +<h1 id="hd_id3150702" xml-lang="en-US"><link href="text/shared/00/00000002.xhp" name="Glossary of Internet Terms">Glossary of Internet Terms</link></h1> <paragraph id="par_id3155577" role="paragraph" xml-lang="en-US">If you are a newcomer to the Internet, you will be confronted with unfamiliar terms: browser, bookmark, email, homepage, search engine, and many others. To make your first steps easier, this glossary explains some of the more important terminology you may find in the Internet, intranet, mail and news.</paragraph> </section> <sort> <section id="cmis"> -<paragraph id="hd_id18082016234439503" role="heading" level="2" xml-lang="en-US">CMIS</paragraph> +<h2 id="hd_id18082016234439503" xml-lang="en-US">CMIS</h2> <paragraph id="par_id180820162344398454" role="paragraph" xml-lang="en-US">The Content Management Interoperability Services (CMIS) standard defines a domain model and Web Services and Restful AtomPub bindings that will enable greater interoperability of Enterprise Content Management (ECM) systems. CMIS uses Web services and Web 2.0 interfaces to enable rich information to be shared across Internet protocols in vendor-neutral formats, among document systems, publishers and repositories, within one enterprise and between companies.</paragraph> </section> <section id="epub"> - <paragraph role="heading" id="hd_id151525000078771" level="2" xml-lang="en-US">EPUB</paragraph> + <h2 id="hd_id151525000078771" xml-lang="en-US">EPUB</h2> <paragraph role="paragraph" id="par_id11525000863861" xml-lang="en-US"><variable id="epubv">EPUB is standard for electronic book files with the extension <emph>.epub</emph> that can be downloaded and read on devices like smartphones, tablets, computers, or e-readers.</variable></paragraph> <paragraph role="paragraph" id="par_id981525003378764" xml-lang="en-US">EPUB is a technical standard published now by the <link href="https://www.w3.org/publishing/"; name="IDPF">Publishing group of W3C</link>. EPUB is a popular format because it is open and is based on HTML.</paragraph> <paragraph role="paragraph" id="par_id291525000873676" xml-lang="en-US">An EPUB publication is delivered as a single file and is an unencrypted zipped archive containing a website. It includes HTML files, images, CSS style sheets, and other assets such as metadata, multimedia and interactivity.</paragraph> @@ -57,19 +56,19 @@ <section id="webdav"> -<paragraph id="hd_id180820162344393005" role="heading" level="2" xml-lang="en-US">WebDAV</paragraph> +<h2 id="hd_id180820162344393005" xml-lang="en-US">WebDAV</h2> <paragraph id="par_id180820162344394243" role="paragraph" xml-lang="en-US">Short for Web-based Distributed Authoring and Versioning, an IETF standard set of platform-independent extensions to HTTP that allows users to collaboratively edit and manage files on remote Web servers. WebDAV features XML properties on metadata, locking - which prevents authors from overwriting each other's changes - namespace manipulation and remote file management. WebDav is sometimes referred to as DAV.</paragraph> </section> <section id="frame"> -<paragraph id="hd_id3153146" role="heading" level="2" xml-lang="en-US">Frames</paragraph> +<h2 id="hd_id3153146" xml-lang="en-US">Frames</h2> <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" name="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"> -<paragraph id="hd_id3147077" role="heading" level="2" xml-lang="en-US">FTP</paragraph> +<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" name="HTTP">HTTP</link> (Hypertext Transfer Protocol) provides the connection setup and data transfer between WWW servers and clients.</paragraph> </section> @@ -79,7 +78,7 @@ </bookmark> -<paragraph id="hd_id3145609" role="heading" level="2" xml-lang="en-US">HTML</paragraph> +<h2 id="hd_id3145609" xml-lang="en-US">HTML</h2> <paragraph id="par_id3161459" role="paragraph" xml-lang="en-US">HTML (Hypertext Markup Language) is a document code language, which is used as the file format for WWW documents. It is derived from <link href="text/shared/00/00000002.xhp#sgml" name="SGML">SGML</link> and integrates text, graphics, videos and sound.</paragraph> <paragraph id="par_id3154346" role="paragraph" xml-lang="en-US">If you want to type HTML commands directly, for example when doing exercises from one of the many available HTML books, remember that HTML pages are pure text files. Save your document under the document type <emph>Text </emph>and give it the file name extension .HTML. Be sure there are no umlauts or other special characters of the extended character set. If you want to re-open this file in $[officename] and edit the HTML code, you must load it with the file type <emph>Text</emph> and not with the file type <emph>Web pages</emph>.</paragraph> <paragraph id="par_id3153960" role="paragraph" xml-lang="en-US">There are several references on the Internet providing an introduction to the HTML language.</paragraph> @@ -87,7 +86,7 @@ <section id="http"> -<paragraph id="hd_id3147423" role="heading" level="2" xml-lang="en-US">HTTP</paragraph> +<h2 id="hd_id3147423" xml-lang="en-US">HTTP</h2> <paragraph id="par_id3153379" role="paragraph" xml-lang="en-US">The Hypertext Transfer Protocol is a record of transmission of WWW documents between WWW servers (hosts) and browsers (clients).</paragraph> </section> @@ -97,7 +96,7 @@ </bookmark> -<paragraph id="hd_id3149290" role="heading" level="2" xml-lang="en-US">Hyperlink</paragraph> +<h2 id="hd_id3149290" xml-lang="en-US">Hyperlink</h2> <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 frames (see the Hyperlink Dialog icon on the Standard bar).</paragraph> </section> @@ -108,12 +107,12 @@ </bookmark> -<paragraph id="hd_id3152805" role="heading" level="2" xml-lang="en-US">ImageMap</paragraph> +<h2 id="hd_id3152805" xml-lang="en-US">ImageMap</h2> <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> -<paragraph id="hd_id3146874" role="heading" level="2" xml-lang="en-US">ImageMap Formats</paragraph> +<h2 id="hd_id3146874" xml-lang="en-US">ImageMap Formats</h2> <paragraph id="par_id3145153" role="paragraph" xml-lang="en-US">ImageMaps are basically divided between those that are analyzed on the server (i. e. your Internet provider) and those analyzed on the web browser of the reader's computer.</paragraph> </section> @@ -123,7 +122,7 @@ </bookmark> -<paragraph id="hd_id3152881" role="heading" level="2" xml-lang="en-US">Server Side ImageMaps</paragraph> +<h2 id="hd_id3152881" xml-lang="en-US">Server Side ImageMaps</h2> <paragraph id="par_id3153057" role="paragraph" xml-lang="en-US">Server Side ImageMaps appear for the reader as a picture or frame on the page. Click on the ImageMap with the mouse, and the coordinates of the relative position are sent to the server. Aided by an extra program, the server then determines the next step to take. There are several incompatible methods to define this process, the two most common being:</paragraph> <list type="unordered"> @@ -142,7 +141,7 @@ </bookmark> -<paragraph id="hd_id3152418" role="heading" level="2" xml-lang="en-US">Client Side ImageMap</paragraph> +<h2 id="hd_id3152418" xml-lang="en-US">Client Side ImageMap</h2> <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 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> @@ -153,13 +152,13 @@ </bookmark> -<paragraph id="hd_id3159125" role="heading" level="2" xml-lang="en-US">Java</paragraph> +<h2 id="hd_id3159125" xml-lang="en-US">Java</h2> <paragraph id="par_id3153188" role="paragraph" xml-lang="en-US">The Java programming language is a platform independent programming language that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph> </section> <section id="proxy"> -<paragraph id="hd_id3145647" role="heading" level="2" xml-lang="en-US">Proxy</paragraph> +<h2 id="hd_id3145647" xml-lang="en-US">Proxy</h2> <paragraph id="par_id3148455" role="paragraph" xml-lang="en-US">A proxy is a computer in the network acting as a kind of clipboard for data transfer. Whenever you access the Internet from a company network and request a Web page that has already been read by a colleague, the proxy will be able to display the page much quicker, as long as it's still in the memory. All that has to be checked in this case is that the page stored in the proxy is the latest version. If this is the case, the page won't have to be downloaded from the much slower Internet but can be loaded directly from the proxy.</paragraph> </section> @@ -169,7 +168,7 @@ </bookmark> -<paragraph id="hd_id3154729" role="heading" level="2" xml-lang="en-US">SGML</paragraph> +<h2 id="hd_id3154729" xml-lang="en-US">SGML</h2> <paragraph id="par_id3147330" role="paragraph" xml-lang="en-US">SGML stands for "Standard Generalized Markup Language". SGML is based on the idea that documents have structural and other semantic elements that can be described without reference to how such elements should be displayed. The actual display of such a document may vary, depending on the output medium and style preferences. In structured texts, SGML not only defines structures (in the DTD = Document Type Definition) but also ensures they are consistently used.</paragraph> <paragraph id="par_id3148747" role="paragraph" xml-lang="en-US"><link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> is a specialized application of SGML. This means that most Web browsers support only a limited range of SGML standards and that almost all SGML-enabled systems can produce attractive HTML pages.</paragraph> </section> @@ -180,7 +179,7 @@ </bookmark> -<paragraph id="hd_id3153950" role="heading" level="2" xml-lang="en-US">Search Engines</paragraph> +<h2 id="hd_id3153950" xml-lang="en-US">Search Engines</h2> <paragraph id="par_id3157965" role="paragraph" xml-lang="en-US">A search engine is a service in the Internet based on a software program used to explore a vast amount of information using key words.</paragraph> </section> @@ -190,7 +189,7 @@ </bookmark> -<paragraph id="hd_id3150751" role="heading" level="2" xml-lang="en-US">Tags</paragraph> +<h2 id="hd_id3150751" xml-lang="en-US">Tags</h2> <paragraph id="par_id3156360" role="paragraph" xml-lang="en-US"><link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> pages contain certain structural and formatting instructions called tags. Tags are code words enclosed by brackets in the document description language HTML. Many tags contain text or hyperlink references between the opening and closing brackets. For example, titles are marked by the tags <h1> at the beginning and </h1> at the end of the title. Some tags only appear on their own such as <br> for a line break or <img ...> to link a graphic.</paragraph> </section> @@ -200,7 +199,7 @@ </bookmark> -<paragraph id="hd_id3153766" role="heading" level="2" xml-lang="en-US">URL</paragraph> +<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> </section> </sort> diff --git a/source/text/shared/guide/autocorr_url.xhp b/source/text/shared/guide/autocorr_url.xhp index 6c0ff0d1e..630010dfc 100644 --- a/source/text/shared/guide/autocorr_url.xhp +++ b/source/text/shared/guide/autocorr_url.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - <!-- * This file is part of the LibreOffice project. * @@ -18,8 +17,6 @@ * 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="textsharedguideautocorr_urlxml" indexer="include"> <title xml-lang="en-US" id="tit">Turning off Automatic URL Recognition</title> @@ -35,11 +32,50 @@ <bookmark_value>links;turning off automatic recognition</bookmark_value> <bookmark_value>predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion</bookmark_value> </bookmark> -<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link> -</variable></paragraph> +<h1 xml-lang="en-US" id="hd_id3149346"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link> +</variable></h1> <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph> + +<paragraph role="paragraph" id="par_id501605796731176">The following texts are changed to hyperlinks:</paragraph> + +<comment>Empty tablecells used for formatting</comment> +<table id="tab_id691605797171054"> + <tablerow> + <tablecell> + <paragraph id="par_id151606170788960" role="tablehead">Text</paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id131606170828813" role="tablehead">Autocorrected hyperlink</paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph id="par_id21605798391315" role="tablecontent">Email addresses</paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id231605797171055" localize="false" role="tablecontent"><literal>x@x</literal>, <literal>mailto:x</literal></paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph id="par_id381605798546491" role="tablecontent">Web addresses</paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id151605797171055" localize="false" role="tablecontent"><literal>http://x</literal>, <literal>https://x</literal>, <literal>www.x.x</literal></paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph id="par_id551605798623251" role="tablecontent">File addresses</paragraph> + </tablecell><tablecell> + <paragraph id="par_id441605798155212" localize="false" role="tablecontent"><literal>file://x</literal>, <literal>ftp://x</literal>, <literal>smb://x</literal></paragraph> + </tablecell> + </tablerow> +</table> +<paragraph role="paragraph" id="par_id781605797492605">where <literal>x</literal> is one or more characters.</paragraph> + <paragraph xml-lang="en-US" id="par_id3153561" role="paragraph">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="2">Undo URL Recognition</paragraph> + <h2 xml-lang="en-US" id="hd_id3154306">Undo URL Recognition</h2> <list type="ordered"> <listitem> <paragraph xml-lang="en-US" id="par_id3149233" role="listitem">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command @@ -49,7 +85,7 @@ <paragraph xml-lang="en-US" id="par_id3149235" role="listitem">If you do not notice this conversion until later, select the hyperlink, open the context menu and choose <emph>Remove Hyperlink</emph>.</paragraph> </listitem> </list> - <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2">Turn off URL Recognition</paragraph> + <h2 xml-lang="en-US" id="hd_id3152350">Turn off URL Recognition</h2> <list type="ordered"> <listitem> <paragraph xml-lang="en-US" id="par_id3149514" role="listitem">Load a document of the type for which you want to modify the URL recognition.</paragraph> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
