Index: NEWS
==================================================================
--- NEWS
+++ NEWS
@@ -6,13 +6,15 @@
 - A new channel plugin for "Radio-Browser.info" has been bundled.
 - Another plugin for interfacing with "RadioTray" was introduced, to
   share bookmarks via DBUS once RadioTray implements it.
 - Notebook tabs are now on the left per default, and can be rearranged
   directly in the GUI.
+- The configuration dialog now indicates the availability of selected
+  audio players. Default audio players are now automatically configured
+  during the first startup.
 - Gtk properties are now utilized more over internal UI state vars.
-  And the GtkBuilder UI file is now compressed.
-- The Gtk2 fallback file became redundant.
+- The the GtkBuilder UI file is now compressed, the Gtk2 fallback removed.
 - The former channel icon PNGs are now embedded.
 - Theme configuration was removed.
 - Category retrieval became more resilient.
 - HTTP timeouts have been added.
 - The bookmarks tab, settings window, search dialog, stream inspector/editor
@@ -20,11 +22,11 @@
 - The packaging layout has been slightly restructured - to support
   relocatable installations (for PyZIP package).
 - Minor fixes to youtube, internet_radio, punkcast, timer and other plugins.
 - Help pages have been updated further, as well as CREDITS, README and
   general PACKAGING infos, and most plugin short descriptions.
-- The project fossil wiki now contains a more details on plugin APIs.
+- The project wiki now contains a more details on plugin APIs.
 
 2.1.4 (2015-03-25)
 - Fixed Internet-Radio extraction.
 - Added basic TuneIn channel.
 - Removed Dirble and MusicGoal channels.

ADDED   help/action_edit.page
Index: help/action_edit.page
==================================================================
--- help/action_edit.page
+++ help/action_edit.page
@@ -0,0 +1,34 @@
+<page	xmlns="http://projectmallard.org/1.0/"
+	type="guide"
+	id="edit">
+
+<info>
+	<link type="guide" xref="index#functions"/>
+	<link type="guide" xref="streams#actions"/>
+	<desc>Edit or inspect a station entry.</desc>
+</info>
+
+	<title>Edit</title>
+
+	<p>You probably don't often need this. But there's an
+	<guiseq><gui></gui> <gui>Edit/Details</gui></guiseq> context menu
+	which brings up a station editor:
+	</p>
+	
+	<media type="image" src="img/streamedit.png" mime="image/png" />
+
+	<p>You can see the standard title and genre fields here. But also a
+	few internally kept infos. For example the "url" field contains the
+	actual pls/m3u/server address. While the "format" can list a
+	non-standard audio compression type.</p>
+
+	<note>
+	<p>This dialog is primarily useful for your personal bookmarks.
+	It allows to shorten or rename things. You can even use
+	<gui style="button">new</gui> to add new entries this way.
+	(Which doesn't make sense in regular channel categories, because
+	changes will be lost once you hit Reload.)</p>
+	</note>
+
+
+</page>

Index: help/action_playing.page
==================================================================
--- help/action_playing.page
+++ help/action_playing.page
@@ -16,11 +16,11 @@
         formats (MP3 or OGG). In the <link xref="config_apps">Apps</link> section of the
         <link xref="configuration">settings dialog</link>, you can associate one player
         with each audio file (MIME) type. Per default this is audacious, but you can use any other
         media player (like VLC).</p>
 
-        <note><p>Note however that some audio players will run multiple instance and won't
+        <note><p>Note however that some audio players will run multiple instances and won't
         allow simple station switching. In such situations it might be sensible to write
         a wrapper script, or configure special commandline arguments to your favoured audio
         player (e.g. "vlc --one-instance").</p></note>
 
         <p>It's also possible to save a station entry as .m3u or .pls file, and load this manually

Index: help/action_recording.page
==================================================================
--- help/action_recording.page
+++ help/action_recording.page
@@ -20,11 +20,11 @@
 
 <section>
 <title>Streamripper</title>
 
 <p>The <cmd>xterm -e</cmd> prefix brings up the terminal popup. If you want
-silent downloads in the background instead of seeing its progress, remove
+silent downloads in the background (instead of seeing its progress), remove
 the xterm call.</p>
 
 <table shade="rows" rules="rows cols">
   <thead>  <tr><td><p>Format</p></td>     <td><p>Application</p></td></tr> </thead>
   <tr><td><p><var>audio/*</var></p></td>  <td><p><cmd>xterm -e streamripper %srv</cmd></p></td></tr>

Index: help/action_saving.page
==================================================================
--- help/action_saving.page
+++ help/action_saving.page
@@ -9,11 +9,11 @@
 </info>
 
 	<title>Saving</title>
 
 	<p>You can export the currently selected stream using
-	<guiseq><gui>Station</gui> <gui>Save</gui></guiseq> or
+	<guiseq><gui>Station</gui> <gui>Save</gui></guiseq> or by pressing
 	<key>F2</key>.  A file dialog opens, where you can adapt the title.
 	</p>
 
 	<p>The extension of the filename decides on the saved link format.  Per
 	default a .m3u file is created, because that's what most audio players

Index: help/channel_bookmarks.page
==================================================================
--- help/channel_bookmarks.page
+++ help/channel_bookmarks.page
@@ -12,12 +12,12 @@
 	<title>Bookmarks</title>
 
 	<p>Streamtuner2 allows to bookmark favoured streams/stations.
 	Which is what the <gui style="menu">bookmarks</gui> tab is for, of course.</p>
 
-        <p>Use the right click a stations <guiseq><gui>context menu</gui> <gui>bookmark</gui></guiseq>
-        or <key>F8</key>.</p>
+        <p>Use right click for a stations <guiseq><gui>context menu</gui> <gui>bookmark</gui></guiseq>
+        or just press <key>F8</key>.</p>
 
         <p>Once bookmarked the station is listed under
         <guiseq><gui style="menu">bookmarks</gui> <gui>favourite</gui></guiseq>.
         Additionally every appearance of the station in channel tabs gets a ★
         star icon.</p>
@@ -26,11 +26,12 @@
 	<title>Editing</title>
         <p>Entries can be removed from the bookmark list again. Use
         <guiseq><gui>Edit</gui> <gui>Delete</gui></guiseq> or the <key>DEL</key>
 	key for that.</p>
 
-        <p>You can also manually adapt an entry via <guiseq><gui>Station</gui> <gui>Edit</gui></guiseq> or <key>F3</key>.
+        <p>You can also manually adapt an entry via <guiseq><gui>Station</gui> <gui>Edit</gui></guiseq>
+        or by pressing <key>F3</key>.
 	</p>
 
 	</section>
 
 	<section id="other">

Index: help/channel_internetradioorguk.page
==================================================================
--- help/channel_internetradioorguk.page
+++ help/channel_internetradioorguk.page
@@ -9,14 +9,14 @@
         <desc>Large radio directory from the UK.</desc>
 </info>
 
 	<title>Internet-Radio.com</title>
 
-	<p>Internet-Radio.com is a broad alternative to Shoutcast. It
-	has regained station homepages for most entries again.
+	<p>Internet-Radio.com is a broad alternative to Shoutcast.
+	It has regained station homepages for most entries again.
 	Genres are similiar to Shoutcast.</p>
 
 	<note><p>Note that this plugin has its own setting on how many
 	links to retrieve.  Instead of stream numbers, it only counts pages
 	(which however speeds up processing now).</p></note>
 
 </page>

Index: help/channel_surfmusik.page
==================================================================
--- help/channel_surfmusik.page
+++ help/channel_surfmusik.page
@@ -25,10 +25,11 @@
 <terms>
   <title>Channel options.</title>
   <item>
     <title><code>Language</code></title>
     <p>There's an English and a German variant of this radio directory. Genres are
-    also localized.</p>
+    also localized. Restart streamtuner2 after switching the Language option. Then
+    use <guiseq><gui>Channel</gui> <gui>Reload category tree</gui></guiseq>.</p>
   </item>
 </terms>
 
 </page>

Index: help/channel_xiph.page
==================================================================
--- help/channel_xiph.page
+++ help/channel_xiph.page
@@ -29,10 +29,10 @@
   <item>
     <title><code>Filter by minimum bitrate</code></title>
     <p>The bitrate of an audio stream determines the music quality. Many Xiph streams have simple
     and low quality microphone sources. To filter these out, and only leave high quality music
     stations, you can therefore change this option. OGG starts to sound well with 96 kbit/s (whereas
-    MP3 often requires 148 or 192 at least).</p>
+    MP3 often requires 128 or 160 kbit/s at least).</p>
   </item>
 </terms>
 
 </page>

Index: help/channel_youtube.page
==================================================================
--- help/channel_youtube.page
+++ help/channel_youtube.page
@@ -30,11 +30,11 @@
 
 <terms>
   <title>Channel options.</title>
   <item>
     <title><code>Region</code></title>
-    <p>With the country dropdown you can predefine which mostPopular listins are returned.</p>
+    <p>With the country dropdown you can predefine which mostPopular listings are returned.</p>
   </item>
   <item>
     <title><code>My Channels</code></title>
     <p>You can edit the list of YT channel names to fetch some of your favourite artists/uploaders.
     To apply this setting, and have new categories show up in the genre pane, use

Index: help/channels.page
==================================================================
--- help/channels.page
+++ help/channels.page
@@ -10,14 +10,16 @@
 	<title>Channels</title>
 
 	<p>The tabs in the main window represent the music directory
         channels/services.  Each lists categories/genres and their associated radios/streams.</p>
 
-	<media type="image" mime="image/png" src="img/channels.png">Tabs</media>
+	<media type="image" mime="image/png" src="img/channels-left.png">Tabs</media>
 
         <p>The notebook tabs can also be repositioned with
-        <guiseq><gui>Edit</gui> <gui>Channel tab position</gui> <gui>Left</gui></guiseq>.</p>
+        <guiseq><gui>Edit</gui> <gui>Channel tab position</gui> <gui>Left</gui></guiseq>.
+        And since 2.1.5 you can directly reorder the channel tabs themselves,
+        by dragging them around.</p>
 
         <p>If you first select a channel tab, the categories should appear or be loading.
         Otherwise:</p>
 
 	<steps>
@@ -44,11 +46,12 @@
 	<section id="actions">
 	<title>Channel menu actions</title>
 	<terms>
 		<item>
 			<title>Homepage of directory service</title>
-			<p>Opens a webbrowser with the current channels website.</p>
+			<p>Opens the website of the currently selected channel
+			in your configured web browser.</p>
 		</item>
 		<item>
 			<title>Reload</title>
 			<p>Updates the current category and displays fresh station lists.</p>
 		</item>

Index: help/config_apps.page
==================================================================
--- help/config_apps.page
+++ help/config_apps.page
@@ -31,20 +31,21 @@
 	In this case it's a common workaround to write <code>pkill vlc ; vlc %u</code> instead,
 	which ends the previous player process and starts it anew.
         For VLC there's however also the <code>--one-instance</code> option, which sometimes
         works better. (And sometimes not.)</p>
 
-	<p>Some applications, like Rhythmbox or Banshee, are primarily audio browsers, not players,
+	<p>Some applications, like Rhythmbox or Banshee, are primarily playlist managers, not players,
         and cannot be invoked with a play URL by other apps. This makes them less suitable for use with
-	streamtuner2.</p>
+	streamtuner2. (Same goes for streamtuner2 of course. It's not a player, just a playlist tool.)</p>
 
 	<section id="placeholders">
 	<title>URL placeholders</title>
 
 	<p>Any listed application can be invoked with a different kind of
-	URL or filename.be invoked with a play URL by other apps.  Which to
-	use often depends on the application.</p>
+	URL or filename. Most are rather flexible, but some depend on
+	specific playlist file types or URLs. You can control this by adding
+	a placeholder after the configured application name:</p>
 
 	<table shade="rows" rules="rows cols">
 	<thead>	<tr><td><p>Placeholder</p></td><td><p>Alternatives</p></td><td><p>URL/Filename type</p></td></tr> </thead>
 		<tr><td><p>%m3u</p></td><td><p>%f %g %m</p></td><td><p>Provides a local .m3u file for the streaming station</p></td></tr>
 		<tr><td><p>%pls</p></td><td><p>%url %u %r</p></td><td><p>Either a remote .pls resource, or a local .pls file (if converted)</p></td></tr>

Index: help/configuration.page
==================================================================
--- help/configuration.page
+++ help/configuration.page
@@ -12,13 +12,14 @@
 
 <p>
 There are various options for streamtuner2, available under <guiseq><gui>Edit</gui>
 <gui>Preferences</gui></guiseq> or via <key>F12</key>.
 </p>
+  <p><media type="image" src="img/configtabs.png" mime="image/png" /></p>
 
 <terms>
-  <title>It's separated into three main areas.</title>
+  <title>It's separated into three main sections / tabs.</title>
   <item>
     <title>Player</title>
     <p>Lists audio formats and the audio player applications, or recording tools below.
     It's a file type to application table. Double click an entry for editing.</p>
   </item>
@@ -30,10 +31,11 @@
     <title>Channel Plugins</title>
     <p>Every channel tab can have specific options. These are configured here.
     Also you can disable channels you don't need.</p>
   </item>
 </terms>
+
 
 
 <section id="apps">
 
     <title>Player application settings</title>
@@ -49,18 +51,25 @@
     <tr><td><p><var>audio/*</var></p></td>        <td><p><cmd>vlc --one-instance</cmd></p></td></tr>
     <tr><td><p><var>video/*</var></p></td>        <td><p><cmd>totem</cmd></p></td></tr>
     <tr><td><p><var>video/youtube</var></p></td>  <td><p><cmd>vlc %srv</cmd></p></td></tr>
 </table>
 
-    <p>Application names are always lowercase binary names. Double click an entry to edit it.</p>
+    <p>Application names are most always lowercase binary names. Double click an entry to edit it.
+    After editing the icon next to the application name will be updated. If it stays green, it's
+    likely to work. If it turns red / into a stop symbol, then the entered name is likely incorrect.</p>
+
+   <p><media type="image" src="img/configapps.png" mime="image/png" /></p>
 
     <p>After the application name, you can use a placeholder like "<var>%pls</var>" (default),
     or "<var>%m3u</var>" and "<var>%src</var>". See <link xref="config_apps#placeholders">placeholders</link>.</p>
 
     <p>Catch-all entries like <var>*/*</var> or a generic <var>audio/*</var> entry allow to configure a default player.
     While <var>video/youtube</var> is specific to the Youtube channel. And <var>url/http</var> a psdeudo MIME type
     to configure a web browser (for station homepages).</p>
+    
+    <p>You can remove default entries by clearing both the Format field and its associated Application.
+    Add completely new associations through the emtpy line. (Reopen the dialog to add another one.)</p>
 
 </section>
 <section id="recording">
 
     <title>Recording Apps</title>
@@ -71,11 +80,11 @@
 <table shade="rows" rules="rows cols">
     <tr><td><p><var>audio/*</var></p></td>         <td><p><cmd>xterm -e streamripper %srv</cmd></p></td></tr>
     <tr><td><p><var>video/youtube</var></p></td>   <td><p><cmd>xterm -e "youtube-dl %srv"</cmd></p></td></tr>
 </table>
 
-    <p>To define a target directory, you can add commandline arguments to each. Also it's typically
+    <p>To define a target directory, you can often add commandline arguments to each. Also it's typically
     helpful to leave the xterm prefix on, so you can follow the processing state. (Alternatively to
     xterm there is x-terminal-emulator, or rxvt, gnome-terminal, xfce4-terminal, etc.)</p>
 </section>
 
 
@@ -100,15 +109,10 @@
       <title>Show bookmark star</title>
       <p>Bookmarked stations will be marked with a ★ star in all other station lists / categories.
       That doesn't often work for the same station entry from two different channel services / tabs though.</p>
     </item>
     <item>
-      <title>Gtk+ theme</title>
-      <p><em style="bug">Be careful</em>. While Gtk allows to select a different theme per application, not all themes
-      work right away. Switching the theme might hang streamtuner2. Just restart if that happens.</p>
-    </item>
-    <item>
       <title>Save window states</title>
       <p>Automatically remember window size, selected channel tab, categories, or selected station.
       Also keeps the width of station list columns. If disabled, you can manually save the current
       layout/selections via <guiseq><gui>Edit</gui> <gui>Save States</gui></guiseq>.</p>
     </item>
@@ -116,23 +120,23 @@
 
   <terms>
     <title>Station loading</title>
     <item>
       <title>Prefer HTML traversing (PyQuery) over regex</title>
-      <p>Some channels provide proper APIs to fetch station lists. Others are just websites, that
+      <p>Some channels provide proper APIs to fetch station lists. Others are just websites that
       require scraping listings out. Most channel tabs provide two alternative methods for that.
-      The DOM/HTML selection method is sometimes more reliable. As fallback streamtuner2 plugins
-      often use a regex to match text. Occassionally the regex method is actually more reliable,
+      The DOM/HTML selection method is sometimes slower, but more reliable. As fallback streamtuner2
+      plugins often use a regex to match text. Occassionally the regex method is surprisingly more exact,
       because directory services often use frightful unstructured HTML. If available, both methods
-      are tried. You can influence the order with this setting.</p>
+      are tried. You can influence the order with this setting, and thus speed it up.</p>
     </item>
     <item>
       <title>[<input>250</input>] Limit stream number</title>
       <p> Constraints the length of station lists per category.
-      The number of stations setting is not honored by all channel plugins. Often it's not possible to
+      The number of stations option is not honored by all channel plugins. Often it's not possible to
       load more or fewer station entries. Some plugins have own settings (in the 'Plugins' section) even.
-      For the major plugins this however limits how much scroll text appears in the stream lists.</p>
+      For the major plugins this however limits how many scrollable entries appear in the stream lists.</p>
     </item>
     <item>
       <title>Retain deleted stations</title> <p>When enabled, keeps old station entries when
       updating/reloading a category/genre.  Services often forget stations or throws them out when inavailable.
       With this option enabled, these entries are kept in streamtuner2 as strikethrough entries (often
@@ -178,10 +182,12 @@
 <section id="plugins">
     <title>Plugin and Channel settings</title>
 
     <p>This tab lists all available channel and feature plugins. Mark checkboxes for those plugins
     you want to enable. You have to restart Streamtuner2 for any changes here to take effect.</p>
+    
+    <p><media type="image" src="img/configplugins.png" mime="image/png" /></p>
 
     <p>Each channel plugin may come with its own set of addition configuration settings
     below.</p>
 
     <note style="note"><p>If you want to find out more about the short option descriptions (most settings are checkboxes),

Index: help/global_key.page
==================================================================
--- help/global_key.page
+++ help/global_key.page
@@ -8,11 +8,11 @@
 </info>
 
 	<title>Global_key</title>
 
 	<p>Using the global_key extension you can define a keyboard shortcut for switching within
-	a list of favourite radio stations. Per default it uses your bookmarks list, but it can be
+	a list of favourited radio stations. Per default it uses your bookmarks list, but it can be
 	configured to alternate in any other channel.</p>
 
 	<p>This is useful if you don't want to keep streamtuner2 atop your
 	desktop all the time, but still want to switch radios easily.</p>
 
@@ -29,9 +29,10 @@
 	</table>
 
 	<p>To define another channel as source, enter its module name in the according field. Also
 	add a category separated by : colon here.</p>
 
-	<note><p>If the configured keyboard shortcut conflicts with another application,
-	it won't work. And if you choose it too generic, you won't be able to type longer
-	documents. Also found out: key names are case sensitive.</p></note>
+	<note style="bug"><p>If the configured keyboard shortcut conflicts
+	with another application, it won't work.  And if you choose it too
+	generic, you won't be able to type longer documents.  Also found
+	out: key names are case sensitive.</p></note>
 </page>

ADDED   help/img/channels-left.png
Index: help/img/channels-left.png
==================================================================
--- help/img/channels-left.png
+++ help/img/channels-left.png
cannot compute difference between binary files

ADDED   help/img/configapps.png
Index: help/img/configapps.png
==================================================================
--- help/img/configapps.png
+++ help/img/configapps.png
cannot compute difference between binary files

ADDED   help/img/configplugins.png
Index: help/img/configplugins.png
==================================================================
--- help/img/configplugins.png
+++ help/img/configplugins.png
cannot compute difference between binary files

ADDED   help/img/configtabs.png
Index: help/img/configtabs.png
==================================================================
--- help/img/configtabs.png
+++ help/img/configtabs.png
cannot compute difference between binary files

DELETED help/img/inkscape_pasted_image_20100831_165045.png
Index: help/img/inkscape_pasted_image_20100831_165045.png
==================================================================
--- help/img/inkscape_pasted_image_20100831_165045.png
+++ help/img/inkscape_pasted_image_20100831_165045.png
cannot compute difference between binary files

DELETED help/img/inkscape_pasted_image_20100831_171132.png
Index: help/img/inkscape_pasted_image_20100831_171132.png
==================================================================
--- help/img/inkscape_pasted_image_20100831_171132.png
+++ help/img/inkscape_pasted_image_20100831_171132.png
cannot compute difference between binary files

DELETED help/img/inkscape_pasted_image_20100831_171614.png
Index: help/img/inkscape_pasted_image_20100831_171614.png
==================================================================
--- help/img/inkscape_pasted_image_20100831_171614.png
+++ help/img/inkscape_pasted_image_20100831_171614.png
cannot compute difference between binary files

ADDED   help/img/search.png
Index: help/img/search.png
==================================================================
--- help/img/search.png
+++ help/img/search.png
cannot compute difference between binary files

ADDED   help/img/streamedit.png
Index: help/img/streamedit.png
==================================================================
--- help/img/streamedit.png
+++ help/img/streamedit.png
cannot compute difference between binary files

ADDED   help/img/timer.png
Index: help/img/timer.png
==================================================================
--- help/img/timer.png
+++ help/img/timer.png
cannot compute difference between binary files

Index: help/index.page
==================================================================
--- help/index.page
+++ help/index.page
@@ -37,9 +37,9 @@
 
 	<section id="footer">
 	<p>You can get additional help from the online forum. See <guiseq><gui>Help</gui> <gui>Forum</gui></guiseq>.</p>
 
 	<p>This documentation was last updated for available functions in streamtuner2
-	version 2.1.4, as of March 2015.</p>
+	version 2.1.5, as of April 2015.</p>
 	</section>
 
 </page>

Index: help/reloading.page
==================================================================
--- help/reloading.page
+++ help/reloading.page
@@ -6,15 +6,17 @@
 	<link type="guide" xref="streams#actions"/>
         <desc>Updating station lists.</desc>
 </info>
 
 	<title>Reloading</title>
+	
         <p>Station information can get stale. Especially Shoutcast invalidates old information
-        frequently. Therefore you have to <guiseq><gui></gui> <gui>Reload</gui></guiseq> the lists. There is an action button below
-        the menu bar for this. It retrieves the current data from the directory service.</p>
+        frequently. Therefore you have to <guiseq><gui></gui> <gui>Reload</gui></guiseq> the lists.
+        There is an action button below the menu bar for this.
+        It retrieves the current data from the directory service.</p>
 
 	<p>Favicons aren't loaded automatically. There is a menu entry in Channels for that, which
         works in the background and doesn't display the new icons automatically either. Simply
         reselect the category/genre in the left pane. Or again, use the station reload button.</p>
 
 
 </page>

Index: help/search.page
==================================================================
--- help/search.page
+++ help/search.page
@@ -25,10 +25,12 @@
 
 	<p>You can get to the search dialog via <guiseq><gui>Edit</gui>
 	<gui>Find</gui></guiseq> or <key>Ctrl</key>+<key>F</key>.  Centrally
 	to this dialog is the text field, where you can specify the phrase
 	to scan for.</p>
+
+	<media src="img/search.png" type="image" mime="image/png" />
 
         <p>It either will search in all channels, or just the last active
         channel/service.</p>
 
 	<p>Then there are two search methods.  You mostly want to use

Index: help/timer.page
==================================================================
--- help/timer.page
+++ help/timer.page
@@ -11,12 +11,13 @@
 	<title>Timer</title>
 
 	<p>You can programm play/recording events with the timer plugin. Simply select a station
 	and choose <guiseq><gui>Station</gui> <gui>Extensions</gui> <gui>Add timer...</gui></guiseq>.
 	A small popup will ask for a data/time string. If you press <key>OK</key> the station
-	and the programmed time
-	will be stored in the bookmarks channel in the "timer" category.</p>
+	and the programmed time will be stored in the bookmarks channel in the "timer" category.</p>
+	
+	<media type="image" src="img/timer.png" mime="image/png">Timer</media>
 
         <note style="tip"><p>Note that streamtuner2 must be running for the programmed timer events to work.
 	(In a future version there might be the option to have it handled by the system cron
 	daemon.)</p></note>