[kde-doc-english] [kdepim] doc/akregator: Update Akregator docbook to 16.08

Burkhard Lück lueck at hube-lueck.de
Sat Jul 30 07:48:46 UTC 2016


Git commit 23cefec3aca3a345952df928064d1c08e1cba19c by Burkhard Lück.
Committed on 30/07/2016 at 07:47.
Pushed by lueck into branch 'master'.

Update Akregator docbook to 16.08

proofread + update
new screenshots not uploaded
bump date + releaseinfo
remove unused entities kappname + package and akregator already in kdoctools
remove appendix installation
remove Share Services + add URL Interceptor = Adblock features
REVIEW:128547

M  +-    --    doc/akregator/add-feed.png
M  +-    --    doc/akregator/add-feed2.png
M  +-    --    doc/akregator/add-folder.png
M  +-    --    doc/akregator/add-folder2.png
M  +-    --    doc/akregator/advanced-tab.png
M  +-    --    doc/akregator/appearance-tab.png
M  +-    --    doc/akregator/archive-tab.png
M  +-    --    doc/akregator/browser-tab.png
M  +-    --    doc/akregator/general-tab.png
M  +24   -54   doc/akregator/index.docbook
A  +-    --    doc/akregator/interceptor-tab.png
M  +-    --    doc/akregator/konq.png
M  +-    --    doc/akregator/konq2.png
M  +-    --    doc/akregator/main-window.png
M  +-    --    doc/akregator/main-window2.png
M  +-    --    doc/akregator/main-window3.png
M  +-    --    doc/akregator/main-window4.png
M  +-    --    doc/akregator/quick-filter.png
M  +-    --    doc/akregator/share-services-tab.png

http://commits.kde.org/kdepim/23cefec3aca3a345952df928064d1c08e1cba19c

diff --git a/doc/akregator/add-feed.png b/doc/akregator/add-feed.png
index 41014d1..0769b7e 100644
Binary files a/doc/akregator/add-feed.png and b/doc/akregator/add-feed.png differ
diff --git a/doc/akregator/add-feed2.png b/doc/akregator/add-feed2.png
index a6848a9..3e6ebe4 100644
Binary files a/doc/akregator/add-feed2.png and b/doc/akregator/add-feed2.png differ
diff --git a/doc/akregator/add-folder.png b/doc/akregator/add-folder.png
index ed4ccde..4c14514 100644
Binary files a/doc/akregator/add-folder.png and b/doc/akregator/add-folder.png differ
diff --git a/doc/akregator/add-folder2.png b/doc/akregator/add-folder2.png
index 9355d46..4fbcec2 100644
Binary files a/doc/akregator/add-folder2.png and b/doc/akregator/add-folder2.png differ
diff --git a/doc/akregator/advanced-tab.png b/doc/akregator/advanced-tab.png
index bfddbda..52fc532 100644
Binary files a/doc/akregator/advanced-tab.png and b/doc/akregator/advanced-tab.png differ
diff --git a/doc/akregator/appearance-tab.png b/doc/akregator/appearance-tab.png
index bce94fa..f0d0748 100644
Binary files a/doc/akregator/appearance-tab.png and b/doc/akregator/appearance-tab.png differ
diff --git a/doc/akregator/archive-tab.png b/doc/akregator/archive-tab.png
index 5f8bd0d..3579573 100644
Binary files a/doc/akregator/archive-tab.png and b/doc/akregator/archive-tab.png differ
diff --git a/doc/akregator/browser-tab.png b/doc/akregator/browser-tab.png
index 15880ce..466b141 100644
Binary files a/doc/akregator/browser-tab.png and b/doc/akregator/browser-tab.png differ
diff --git a/doc/akregator/general-tab.png b/doc/akregator/general-tab.png
index 731bfd2..33c33cd 100644
Binary files a/doc/akregator/general-tab.png and b/doc/akregator/general-tab.png differ
diff --git a/doc/akregator/index.docbook b/doc/akregator/index.docbook
index f34a8ce..2ccbd5f 100644
--- a/doc/akregator/index.docbook
+++ b/doc/akregator/index.docbook
@@ -1,8 +1,5 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-  <!ENTITY akregator        "<application>Akregator</application>">
-  <!ENTITY kappname "&akregator;">
-  <!ENTITY package "kdepim">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
@@ -40,8 +37,8 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2013-05-25</date>
-<releaseinfo>4.11 (&kde; 4.11)</releaseinfo>
+<date>2016-07-28</date>
+<releaseinfo>5.3.40 (Applications 16.08)</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
@@ -130,13 +127,6 @@ select. A news feed is a collection of articles: for example, the recent news of
 a news site or the new entries of a blog. The default list contains feeds related to
 the &kde; project, but of course you can add your own feeds and remove the ones
 you are not interested in.
-<screenshot>
-<screeninfo>All articles are fetched</screeninfo>
-<mediaobject>
-<imageobject><imagedata fileref="main-window2.png" format="PNG" /></imageobject>
-<textobject><phrase>All articles are fetched</phrase></textobject>
-</mediaobject>
-</screenshot>
 </para>
 <para>
 In the upper right is the article list. It contains all the articles of the
@@ -145,7 +135,7 @@ they were published. By default, the newest articles are at the top.
 <screenshot>
 <screeninfo>The article list</screeninfo>
 <mediaobject>
-<imageobject><imagedata fileref="main-window3.png" format="PNG" /></imageobject>
+<imageobject><imagedata fileref="main-window2.png" format="PNG" /></imageobject>
 <textobject><phrase>The article list for one feed</phrase></textobject>
 </mediaobject>
 </screenshot>
@@ -187,8 +177,8 @@ URL:</guilabel>.
 
 <listitem><para>
 Enter
-<userinput>www.slashdot.org</userinput>
-or <userinput>http://www.slashdot.org </userinput> in the line edit next
+<userinput>planet.ubuntu.com</userinput>
+or <userinput>http://planet.ubuntu.com</userinput> in the line edit next
 to <guilabel>Feed URL</guilabel> and click <guibutton>OK</guibutton>.
 </para></listitem>
 <listitem><para>
@@ -203,12 +193,12 @@ you are happy with the feed settings, click <guibutton>OK</guibutton> again.
 </screenshot>
 </para></listitem>
 <listitem><para>
-Now Slashdot has been added to your feed list.
+Now Planet Ubuntu has been added to your feed list.
 </para> </listitem>
 </itemizedlist>
 <para>
 There are multiple other ways to find and add interesting feeds. Within &kde;,
-websites browsed with &konqueror; will display the recognizable "RSS" 
+websites browsed with &konqueror; will display the recognizable <quote>RSS</quote>
 icon <inlinemediaobject>
   <imageobject>
     <imagedata fileref="feed.png" format="PNG"/>
@@ -223,7 +213,7 @@ detected at the website. Just left-click on the icon and choose
 <textobject><phrase>Automatically finding feeds through &konqueror;</phrase></textobject>
 </mediaobject>
 </screenshot>
-On pages with this "RSS" or this icon<inlinemediaobject>
+On pages with this <quote>RSS</quote> or this icon<inlinemediaobject>
   <imageobject>
     <imagedata fileref="rss.png" format="PNG"/>
   </imageobject>
@@ -252,7 +242,7 @@ in the feed list, and from there you can use your mouse to drag it to a differen
 <title>Creating a Folder</title>
 <para>After adding your own feeds, you may want to group them in some way,
 rather than just leave them unsorted. So let us create a folder for the
-Slashdot feed we just added:</para>
+Planet Ubuntu feed we just added:</para>
 <itemizedlist>
 <listitem><para>Select the parent folder of the new folder. In this example, we
 select <guilabel>All Feeds</guilabel>.
@@ -268,7 +258,7 @@ Enter <userinput>News</userinput> (or a more appropriate name for the feed categ
 </mediaobject>
 </screenshot>
 </para> </listitem>
-<listitem><para>Now you can drag the Slashdot feed to the new folder.
+<listitem><para>Now you can drag the Planet Ubuntu feed to the new folder.
 <screenshot>
 <screeninfo>The News folder in the feed list</screeninfo>
 <mediaobject>
@@ -389,25 +379,22 @@ aggregators not using caching increases the costs for providers and may decrease
 
 </sect1>
 
-<sect1 id="share-services-tab">
-<title>Share Services</title>
-<para>This feature uses &plasma;'s microblog service to help you to share news 
-with your friends using the microblog services (identi.ca and twitter). 
-The post will have the title of the article and a link to it</para>
+<sect1 id="adblock-tab">
+<title>URL Interceptor</title>
+<para>&akregator; can be configured to replace or remove images or frames from web pages that match a series of filters.</para>
+
 <screenshot>
-<screeninfo>The Share Services tab</screeninfo>
+<screeninfo>The URL Interceptor tab</screeninfo>
 <mediaobject>
-<imageobject><imagedata fileref="share-services-tab.png" format="PNG" /></imageobject>
-<textobject><phrase>The Share Services tab</phrase></textobject>
+<imageobject><imagedata fileref="interceptor-tab.png" format="PNG" /></imageobject>
+<textobject><phrase>The URL Interceptor tab</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<para>Select a <guilabel>Service URL</guilabel> and enter your <guilabel>Username</guilabel>
-for this service.
+<para>For a detailed description of this feature see <ulink url="help:/kcontrol/khtml-adblock">AdBlock Filters</ulink>.
 </para>
-
 </sect1>
- 
+
 <sect1 id="archive-tab">
 <title>Archive</title>
 <para>Archiving articles means storing the links of articles. Here you can limit the
@@ -679,7 +666,7 @@ article as read after a specified number of seconds.</para>
 <varlistentry>
 <term><menuchoice>
 <guimenu>File</guimenu>
-<guimenuitem>Import feeds...</guimenuitem>
+<guimenuitem>Import Feeds</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Open</action> the import feeds dialog to load <quote>OPML Outlines</quote> 
 with feed subscriptions.
@@ -689,7 +676,7 @@ with feed subscriptions.
 <varlistentry>
 <term><menuchoice>
 <guimenu>File</guimenu>
-<guimenuitem>Export feeds...</guimenuitem>
+<guimenuitem>Export Feeds</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Open</action> the save as dialog and export your feeds and folder structure
 as <filename class="extension">.opml</filename> file.</para></listitem>
@@ -1016,6 +1003,7 @@ in the mail.</para></listitem>
 in the mail.
 </para></listitem>
 </varlistentry>
+<!--FIXME not in kf5?
 <varlistentry>
 <term><menuchoice>
 <shortcut><keycombo
@@ -1027,12 +1015,12 @@ action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut>
  with your friends using the microblog services identi.ca and twitter.
 </para></listitem>
 </varlistentry>
+-->
 </variablelist>
-
 </sect2>
 
 <sect2>
-<title>The Settings Menu</title>
+<title>The Settings and Help Menu</title>
 
 <variablelist>
 <varlistentry>
@@ -1096,24 +1084,6 @@ Documentation copyright 2006
 
 </chapter>
 
-<appendix id="installation">
-<title>Installation</title>
-
-<sect1 id="getting-akregator">
-<title>How to obtain &akregator;</title>
-
-&install.intro.documentation;
-
-</sect1>
-
-<sect1 id="compilation">
-<title>Compilation and installation</title>
-
-&install.compile.documentation;
-
-</sect1>
-</appendix>
-
 &documentation.index;
 </book>
 <!--
diff --git a/doc/akregator/interceptor-tab.png b/doc/akregator/interceptor-tab.png
new file mode 100644
index 0000000..99b8e80
Binary files /dev/null and b/doc/akregator/interceptor-tab.png differ
diff --git a/doc/akregator/konq.png b/doc/akregator/konq.png
index b774a7f..2c3283d 100644
Binary files a/doc/akregator/konq.png and b/doc/akregator/konq.png differ
diff --git a/doc/akregator/konq2.png b/doc/akregator/konq2.png
index c6cc15f..c3d5bd2 100644
Binary files a/doc/akregator/konq2.png and b/doc/akregator/konq2.png differ
diff --git a/doc/akregator/main-window.png b/doc/akregator/main-window.png
index 483f600..4a86125 100644
Binary files a/doc/akregator/main-window.png and b/doc/akregator/main-window.png differ
diff --git a/doc/akregator/main-window2.png b/doc/akregator/main-window2.png
index 222da23..d3ce286 100644
Binary files a/doc/akregator/main-window2.png and b/doc/akregator/main-window2.png differ
diff --git a/doc/akregator/main-window3.png b/doc/akregator/main-window3.png
index 652c164..34f63dc 100644
Binary files a/doc/akregator/main-window3.png and b/doc/akregator/main-window3.png differ
diff --git a/doc/akregator/main-window4.png b/doc/akregator/main-window4.png
index 0f39919..33a21fe 100644
Binary files a/doc/akregator/main-window4.png and b/doc/akregator/main-window4.png differ
diff --git a/doc/akregator/quick-filter.png b/doc/akregator/quick-filter.png
index e96c575..279713d 100644
Binary files a/doc/akregator/quick-filter.png and b/doc/akregator/quick-filter.png differ
diff --git a/doc/akregator/share-services-tab.png b/doc/akregator/share-services-tab.png
index 540ac5d..e4066c0 100644
Binary files a/doc/akregator/share-services-tab.png and b/doc/akregator/share-services-tab.png differ


More information about the kde-doc-english mailing list