[kio] doc/kcontrol: doc update kcms cookies/ebrowsing/useragent/
Burkhard Lück
lueck at hube-lueck.de
Sat Nov 12 14:13:16 UTC 2016
Git commit 616fb1f7ee566b0f27000b202146c7628bedc0c4 by Burkhard Lück.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
doc update kcms cookies/ebrowsing/useragent/
svn path=/trunk/KDE/kdebase/runtime/; revision=1053459
M +7 -7 doc/kcontrol/cookies/index.docbook
M +43 -33 doc/kcontrol/ebrowsing/index.docbook
M +9 -16 doc/kcontrol/useragent/index.docbook
http://commits.kde.org/kio/616fb1f7ee566b0f27000b202146c7628bedc0c4
diff --git a/doc/kcontrol/cookies/index.docbook b/doc/kcontrol/cookies/index.docbook
index a1ea6fd..d58358e 100644
--- a/doc/kcontrol/cookies/index.docbook
+++ b/doc/kcontrol/cookies/index.docbook
@@ -14,12 +14,12 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2003-10-12</date>
-<releaseinfo>3.2</releaseinfo>
+<date>2009-11-24</date>
+<releaseinfo>&kde; 4.4</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
-<keyword>KControl</keyword>
+<keyword>Systemsettings</keyword>
<keyword>cookie</keyword>
</keywordset>
@@ -45,7 +45,7 @@ be quite useful to the web site owners, for example, by allowing them to
collect summary statistics on the number of visits different areas of
the web sites get, or to customize banner advertising.</para>
-<para>The cookies module of the &kcontrol; allows you to set policies
+<para>The cookies module of the &systemsettings; allows you to set policies
for the use of cookies when you are browsing the web with the
&konqueror; web browser. </para>
@@ -62,7 +62,7 @@ as &Netscape;.</para></warning>
general cookie policy as well as special cookie policies for certain
domains or hosts.</para>
-<para>The top of the policy tab has a checkbox labeled <guilabel>Enable
+<para>The top of the policy tab has a check box labeled <guilabel>Enable
cookies</guilabel>. If you leave this unchecked, cookies will be
completely disabled. However, this may make browsing rather
inconvenient, especially as some web sites require the use of browsers
@@ -78,7 +78,7 @@ specific policies on how you want them to be handled.</para>
<term><guilabel>Only accept cookies from originating server</guilabel></term>
<listitem>
<para>Some pages try to set cookies from servers other than the one
-you are seeing the <acronym>HTML</acronym> page from. For example,
+you are seeing the &HTML; page from. For example,
they show you advertisements, and the advertisements are from another
computer, often one that belongs to a large advertising group. These
advertisements may try to set a cookie which would allow them to
@@ -194,7 +194,7 @@ delete cookies that have been set in the past.</para>
as a tree. Click on the little <guiicon>+</guiicon> next to a domain to see all
cookies that have been set for this particular target domain. If you select one
of these cookies, you will notice that its contents will show up in the frame
-<guilabel>Cookie Details</guilabel> below.</para>
+<guilabel>Details</guilabel> below.</para>
<para>By clicking the <guibutton>Delete</guibutton> button you can now delete the selected
cookie. Click <guibutton>Delete All</guibutton> to delete all cookies stored.</para>
diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook
index 6df65ae..064451d 100644
--- a/doc/kcontrol/ebrowsing/index.docbook
+++ b/doc/kcontrol/ebrowsing/index.docbook
@@ -14,12 +14,12 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2002-10-16</date>
-<releaseinfo>3.1</releaseinfo>
+<date>2009-11-23</date>
+<releaseinfo>&kde; 4.4</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
-<keyword>KControl</keyword>
+<keyword>Systemsettings</keyword>
<keyword>enhanced browsing</keyword>
<keyword>web shortcuts</keyword>
<keyword>browsing</keyword>
@@ -41,31 +41,31 @@ experience. One such feature is <emphasis>Web Shortcuts</emphasis>.</para>
For example, you can click on the <guimenuitem>Run</guimenuitem> menu
item or type the keyboard shortcut assigned to that command (<keycombo
action="simul">&Alt;<keycap>F2</keycap></keycombo>,
-unless you have changed it) and type in a <acronym>URI</acronym>.
+unless you have changed it) and type in a &URI;.
<footnote><para>Uniform Resource Identifier. A standardized way of
referring to a resource such as a file on your computer, a World Wide
Web address, an email address,
<abbrev>etc...</abbrev>.</para></footnote></para>
<para>Web shortcuts, on the other hand, let you come up with new pseudo
-<acronym>URL</acronym> schemes, or shortcuts, that basically let you
+&URL; schemes, or shortcuts, that basically let you
<emphasis>parameterize</emphasis> commonly used
-<acronym>URI</acronym>s. For example, if you like the Google search
-engine, you can configure KDE so that a pseudo <acronym>URL</acronym>
+&URI;s. For example, if you like the Google search
+engine, you can configure &kde; so that a pseudo &URL;
scheme like <emphasis>gg</emphasis> will trigger a search on
Google. This way, typing <userinput>gg:<replaceable>my
query</replaceable></userinput> will search for <replaceable>my
query</replaceable> on Google.</para>
-<note><para>One can see why we call these pseudo <acronym>URL</acronym>
-schemes. They are used like a <acronym>URL</acronym> scheme, but the
-input is not properly <acronym>URL</acronym> encoded, so one will type
+<note><para>One can see why we call these pseudo &URL;
+schemes. They are used like a &URL; scheme, but the
+input is not properly &URL; encoded, so one will type
<userinput>google:kde apps</userinput> and not
<userinput>google:kde+apps</userinput>.</para></note>
<para>You can use web
shortcuts wherever you would normally use
-<acronym>URI</acronym>s. Shortcuts for several search engines should
+&URI;s. Shortcuts for several search engines should
already be configured on your system, but you can add new keywords, and
change or delete existing ones in the enhanced browsing control
module. </para>
@@ -74,27 +74,39 @@ module. </para>
<sect2 id="ebrowse-use">
-<title>Use</title>
-
-<para>There is a single tab in this control module. The title of the tab
-is <guilabel>Keywords</guilabel>. This tab features two main boxes, one
-for Internet Keywords and one for web shortcuts.</para>
-
-<sect3 id="ebrowse-srch-use">
-
<title>Web Shortcuts</title>
<para>The descriptive names of defined web shortcuts are shown in a
-listbox. As with other lists in &kde;, you can click on a column
+list box. As with other lists in &kde;, you can click on a column
heading to toggle the sort order between ascending and
descending, and you can resize the columns.</para>
+<para>At the bottom of the list the option <guilabel>Enable Web shortcuts</guilabel>
+has to be checked to enable this feature. Use the buttons on the right to
+create, modify or delete shortcuts.</para>
+
+<para>Below the list you find two additional options:</para>
+<variablelist>
+<varlistentry><term><guilabel>Default search engine</guilabel></term>
+<listitem>
+<para>Select the search engine to use for input boxes that provide automatic
+lookup services when you type in normal words and phrases instead of a &URL;.
+To disable this feature select <guilabel>None</guilabel> from the list.
+</para></listitem>
+</varlistentry>
+<varlistentry><term><guilabel>Default search engine</guilabel></term>
+<listitem>
+<para>Choose the delimiter that separates the keyword from the phrase or word to
+be searched.</para></listitem>
+</varlistentry>
+</variablelist>
+
<para>If you double-click on a specific entry in the list of defined
search providers, the details for that entry are shown in a popup
dialog. In addition to the descriptive name for the item, you can
-also see the <acronym>URI</acronym> which is used, as well as the
+also see the &URI; which is used, as well as the
associated shortcuts which you can type anywhere in &kde; where
-<acronym>URI</acronym>s are expected. A given search provider can have
+&URI;s are expected. A given search provider can have
multiple shortcuts, each separated by a comma.</para>
<para> The text boxes are used not only for displaying information
@@ -115,10 +127,10 @@ by whatever you happen to type after the colon character that is
between a shortcut and its parameter. Let's consider some examples to
clarify this idea.</para>
-<para>Suppose that the <acronym>URI</acronym> is
+<para>Suppose that the &URI; is
<userinput>http://www.google.com/search?q=\{@}</userinput>, and
<userinput>gg</userinput> is a shortcut to this
-<acronym>URI</acronym>. Then, typing
+&URI;. Then, typing
<userinput>gg:<replaceable>alpha</replaceable></userinput> is
equivalent to
<userinput>http://www.google.com/search?q=<replaceable>alpha</replaceable></userinput>.
@@ -126,29 +138,27 @@ You could type anything after the <userinput>:</userinput> character;
whatever you have typed simply replaces the <option>\{@}</option>
characters, after being converted to the appropriate character set for
the search provider and then properly
-<acronym>URL</acronym>-encoded. Only the <option>\{@}</option> part of
-the search <acronym>URI</acronym> is touched, the rest of it is
-supposed to be properly <acronym>URL</acronym>-encoded already and is
+&URL;-encoded. Only the <option>\{@}</option> part of
+the search &URI; is touched, the rest of it is
+supposed to be properly &URL;-encoded already and is
left as is.</para>
<para>You can also have shortcuts without parameters. Suppose the
-<acronym>URI</acronym> was
+&URI; was
<emphasis>file:/home/me/mydocs/kofficefiles/kword</emphasis> and the
shortcut was <emphasis>mykword</emphasis>. Then, typing
<userinput>mykword:</userinput> is the same as typing the complete
-<acronym>URI</acronym>. Note that there is nothing after the colon
+&URI;. Note that there is nothing after the colon
when typing the shortcut, but the colon is still required in order for
the shortcut to be recognized as such.</para>
<para>By now, you will have understood that even though these shortcuts
are called web shortcuts, they really are shortcuts to parameterized
-<acronym>URI</acronym>s, which can point not only to web sites like
+&URI;s, which can point not only to web sites like
search engines but also to anything else that can be pointed to by a
-<acronym>URI</acronym>. Web shortcuts are a very powerful feature of
+&URI;. Web shortcuts are a very powerful feature of
navigation in &kde;.</para>
-</sect3>
-
</sect2>
</sect1>
diff --git a/doc/kcontrol/useragent/index.docbook b/doc/kcontrol/useragent/index.docbook
index 14be0fc..32cb130 100644
--- a/doc/kcontrol/useragent/index.docbook
+++ b/doc/kcontrol/useragent/index.docbook
@@ -13,12 +13,12 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2003-10-12</date>
-<releaseinfo>3.2</releaseinfo>
+<date>2009-11-24</date>
+<releaseinfo>&kde; 4.4</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
-<keyword>KControl</keyword>
+<keyword>Systemsettings</keyword>
<keyword>user agent</keyword>
<keyword>browser</keyword>
<keyword>identification</keyword>
@@ -42,7 +42,7 @@ browsers function, web sites that rely too much on a single browser may
sometimes not display as intended when viewed using another
browser. Some web sites are smart enough to examine the contents of the
user agent header and incorporate this information in the
-<acronym>HTML</acronym> code so that the content is displayed correctly
+&HTML; code so that the content is displayed correctly
regardless of the browser used.</para>
<para>However, you may find that some web sites refuse to function
@@ -59,13 +59,13 @@ another browser by means of the user agent header.</para>
<para>In this module you can configure the
type of browser that &konqueror; will report itself to be. You can
control this information by web site. Usually, the list box that is
-labeled <guilabel>Site/Domain Specific Identification</guilabel> will be
+labeled <guilabel>Site Specific Identification</guilabel> will be
empty, so that &konqueror; will always use its default useragent
string.</para>
<para>You can disable the sending of a user agent entirely, by
unchecking the <guilabel>Send identification</guilabel>
-checkbox. This may cause strange behavior on some sites, and may even
+check box. This may cause strange behavior on some sites, and may even
deny you access to some websites, so disable this with caution.</para>
<para>To configure a new agent binding, press the
@@ -81,19 +81,12 @@ character <token>*</token> in this text box. However, the string
<para>After typing the name of the server, type in the identifying
string in the next combo box, which is labeled <guilabel>Use the
-following identity:</guilabel>, or choose a string from the list. If
+following identification:</guilabel>, or choose a string from the list. If
you don't choose a string from the list, you will need to know what a
valid string from the browser looks like. For example, you could type
<userinput>Mozilla/4.0 (compatible; MSIE 4.0)</userinput>. </para>
-<para>In the field labeled <guilabel>Alias (description)</guilabel>
-you can enter a descriptive name for the configured binding, ⪚
-<userinput>Netscape Navigator 4.75 on Linux</userinput> for the
-useragent string <userinput>Mozilla/4.75 (X11; U; Linux 2.2.14
-i686)</userinput>.</para>
-
-<para>You can click on an existing entry in the <guilabel>Configured
-agent bindings</guilabel> list, and then modify the contents of the
+<para>You can click on an existing entry in the list, and then modify the contents of the
text boxes, followed by clicking <guibutton>Change...</guibutton>.</para>
<para>The <guibutton>Delete</guibutton> button can be used to delete
@@ -102,7 +95,7 @@ the selected entry in the list of configured agent bindings. The
agent strings. Click the <guibutton>Apply</guibutton> to take your
changes in effect.</para>
-<para>You can use the checkboxes at the top of the screen to build a
+<para>You can use the check boxes at the top of the screen to build a
user agent that is uniquely yours, by choosing your own combination of
operating system name and version, platform, processor type, and
language.</para>
More information about the kde-doc-english
mailing list