Add converted 2.5.x manual on top of pro manual

I tried to only merge what makes sense for us, there is still quite some cleanup needed, this commit tries to preserve the 2.5 manual as much as possible while still keeping the rare new stuff from pro.

docs/manual/now-playing/index.md

@@ -1,9 +1,6 @@
-Now playing
-===========
-
 The Now Playing page provides a view of the content your station will play out, or has already played out, which defaults to showing the 24 hours ahead. This page also enables you to make last-minute changes to running shows.
 
-If you've only just logged in to Airtime, there might not be any content shown yet. Click the calendar and clock icons above the table to change the date and time range, then click the **Find Shows** button (with the magnifying glass icon) to the right.
+If you've only just installed Airtime, there might not be any content shown yet. Click the calendar and clock icons above the table to change the date and time range, then click the **Find Shows** button (with the magnifying glass icon) to the right.
 
 ![](static/Screenshot416-Now_playing_date_select.png)
 
@@ -38,7 +35,7 @@ To cancel the current show completely, click the red button to the right again.
 
 ![](static/Screenshot420-Cancel_current_show.png) 
 
-Items which are no longer available have an exclamation mark icon in the second column. This may happen for media files which were part of previous shows, and were removed from Airtime's library subsequently. Items which are included in forthcoming shows cannot be removed from the Library via the Airtime interface.
+Items which are no longer available have an exclamation mark icon in the second column. This may happen for media files which were part of previous shows, and were removed from Airtime's library (main storage or watched folders) subsequently. Items which are included in forthcoming shows cannot be removed from the Library via the Airtime interface.
 
 ![](static/Screenshot421-Missing_file_icon.png)
 
@@ -55,15 +52,13 @@ In the library table which opens, the upper section is for the **Advanced Search
 
 At the bottom of the library table, click the **First**, **Previous**, **Next**, **Last** or individual page number buttons to browse the search results. Right-clicking an item in the search results will display the available metadata for that item in a pop-up window.
 
-<img src="static/Screenshot575-Right_click_metadata.png" alt="Pop up metadata" width="740" />
+![](static/Screenshot433-Metadata_pop_up.png)
 
 The columns displayed in the search results correspond to the fields available for advanced searches (except for **Scheduled** and **Playlist / Block**, which indicate if a particular item is in use). To change the fields which can be searched, click the **Show / hide columns** button on the right side of the table, just above the search results.
 
 <img src="static/Screenshot499-Library_show_hide_columns_240.png" width="595" height="360" />
 
-Click the metadata column headings such as **Title**, **Creator**, **Album**, or <span style="font-weight: bold;">Genre</span> to sort the entries in ascending or descending order. In the second column, audio files which can be auditioned in your browser are represented by a loudspeaker icon, while audio file types which cannot be auditioned in your browser have a padlock icon. Playlists are represented by a document and play button icon, smart blocks have a document and think bubble icon, and web streams have a globe and arrow icon.
-
-<img src="static/Screenshot576-Library_file_type_icons.png" alt="Library file type icons" width="740" />
+Click the metadata column headings such as **Title**, **Creator**, **Album**, or <span style="font-weight: bold;">Genre</span> to sort the entries in ascending or descending order. In the second column, audio files are represented by a loudspeaker icon, while playlists are represented by a document icon. Smart blocks have a think bubble icon, and web streams have an arrow icon.
 
 To find all files uploaded by yourself, or another specific member of the station staff, click the **Show / hide columns** checkbox which enables the **Owner** column. After you have made your search, you can click the header of the **Uploaded** column to find the items that person added to the server most recently.
 
@@ -79,24 +74,37 @@ Click the Advanced Search Options link to collapse that area. Beneath the collap
 
 If your jingles are tagged with *Jingle* in the **Genre** or other fields, you can very easily find them by entering *jingle* into the simple search field. The same technique can be used to find advertising and promotional files. (See the chapter *Preparing media for ingest* for tips on batch tagging files with metadata). Unlike advanced searches, simple searches use 'or' logic for multiple search terms, so a simple search for *jingle ident* will return items matching either keyword.
 
-Clicking on an item in the library table opens a pop-up menu which enables you to audition the item, or remove it from the Airtime library. Audio file types which cannot be auditioned directly in a web browser can be downloaded to your local computer for audition instead. The **Delete** option should be used with caution, because this action cannot be undone. For media files, you can also **Edit Metadata** stored for the file using this menu.
+Clicking on an item in the library table opens a pop-up menu which enables you to audition the item, or remove it from the Airtime library. Media types which cannot be auditioned directly in a web browser, such as FLAC, have a lock icon instead of a loudspeaker icon, but these files can be downloaded to your local computer for audition instead. The **Delete** option should be used with caution, because this action cannot be undone. For media files, you can also **Edit Metadata** stored for the file using this menu.
 
 ![](static/Screenshot427-Library_pop_up.png)
 
+If the **Enable SoundCloud Upload** box on the Preferences page is checked, there will be an additional option on the pop-up menu, **Upload to SoundCloud**. As mentioned previously, you should only upload audio files to SoundCloud with the permission of the copyright holder.
+
+![](static/Screenshot432-Upload_to_SoundCloud.png)
+
 Adding content to a running show
 --------------------------------
 
 After you have found the items that you want using the search tools, you can then drag and drop them from the library table on the left side of the page into the shows on the right side, including the current playing show.
 
-If the current show has nothing playing out at the time, the new item will begin playing immediately. This manual triggering of playout can be used as a live assist technique. For instance, a live show's host may not wish to cut off a studio discussion in order to play music at a fixed time.
+If the current show has nothing playing out at the time, the new item will begin playing immediately. This manual triggering of playout can be used as a live assist technique, in which the Airtime server's soundcard output is mixed with other sources such as microphones or telephone hybrids on its way to a transmitter, or a separate stream encoder. For instance, a live show's host may not wish to cut off a studio discussion in order to play music at a fixed time.
 
-<img src="static/Screenshot586-Add_to_current_show.png" alt="Add to current show" width="730" height="560" />
+![](static/Screenshot428-Library_drag_and_drop.png)
 
-You can also select multiple items using the **Select** menu button, just beneath the simple search field, which has the options to **Select this page** of search results, **Deselect this page** and **Deselect all**. Alternatively, use the checkboxes on the left side of the library table to select specific items. Then drag one of the items into the show to add all of the selected items, or click the **Add to current show** button, which has a plus icon. If you wish, you can also use the **Trashcan** button to permanently remove items from Airtime's library. Only *admin* users have permission to delete items owned by other users.
+You can also select multiple items using the **Select** menu button, just beneath the simple search field, which has the options to **Select this page** of search results, **Deselect this page** and **Deselect all**. Alternatively, use the checkboxes on the left side of the library table to select specific items. Then drag one of the items into the show to add all of the selected items, or click the **Add to selected show** button, which has a plus icon. If you wish, you can also use the **Trashcan** button to permanently remove items from Airtime's library. Only *admin* users have permission to delete all items.
 
-To insert checkbox selected items from the library at specific times in the show schedule, click one or more of the checkboxes on the left side of the schedule table to create an insertion point. Then click the **Add before selected items** button in the library table. To add a single item at the insertion point, double-click on it in the library. There is no need to select or drag the item first.
+To insert checkbox selected items at a specific time in the show schedule, click one of the grey and white triangle icons on the left side of the schedule table, which will change to red and white. A red horizontal line will be shown at the insertion point. Then click the **Add to selected show** button in the library table.
 
-<img src="static/Screenshot585-Insertion_point.png" alt="Insertion point" width="740" height="237" />
+To add a single item at the insertion point, double-click on it in the library. There is no need to select or drag the item first.
 
-Multiple insertion points can be enabled by clicking on more than one of the checkboxes, so that the same item is inserted into the schedule at different times. For example, you may wish to play a news report every hour, or a station ident after every five music files.
+![](static/Screenshot429-Show_insertion_point.png)
 
+Another way to create an insertion point is to click an item in the show table, then click **Select cursor** on the small pop-up menu that will appear. This pop-up menu also enables you to audition the entire show in advance of playout, or remove the item that was clicked on from the show.
+
+![](static/Screenshot430-Select_cursor.png)
+
+Multiple insertion points can be enabled, so that the same item is inserted into the schedule at different times. For example, you may wish to play a news report every hour, or a station ident after every five music files.
+
+A live show set for recording from the Airtime server's sound card is displayed with a red dot icon in the first column. It would not contain any files or playlists, smart blocks or web streams.
+
+![](static/Screenshot431-Recording_from_line_in.png)