Merge pull request #1014 from zklosko/master

Updating documentation as per issue #376

README

@@ -1,84 +0,0 @@
-=========================================================================
-=================   Airtime - Live Broadcast Together   =================
-=========================================================================
-
-Airtime is an open source application that provides remote and 
-collaborative automation of a broadcast radio station.
-
-Home page: http://www.sourcefabric.org/en/airtime/
-
-Major features:
-
- * Web-based remote station management. Authorized personnel can add
-   programme material, create playlists or smart blocks, and stream in live, 
-   all via a web interface.
- * Automation. Airtime has a scheduler function that enables users to
-   create shows with content for playback at the exact date and time specified. 
-   Playlists, smart blocks and remote stream URLs can be used multiple times.
- * Solid playout. Airtime uses the open source Liquidsoap streaming language 
-   for reliable and precise playback to multiple outputs. 
- * Open, extensible architecture.  Stations are free to extend and alter 
-   all parts of the program code, under the GNU AGPLv3 license.
-
-
-INSTALLATION
-------------
-
-Basic installation has two steps:
-
-1) Run the install script, located in the Airtime root directory.
-
-For an interactive installation, run:
-
-    sudo ./install
-
-If you're using a terminal that is not running Bash, you'll need to run
-
-    sudo /bin/bash ./install
-
-instead. You may need to install Bash first.
-
-The installer will then prompt you about how you want to set up your Airtime 
-installation.
-
-For a non-interactive full installation (do this if you're installing Airtime from 
-scratch and don't have any of your own configuration set up), run
-
-    sudo ./install -fiap
-
-What this means:
-
-    -f - force; non-interactive (no prompts)
-    -i - install the default Icecast 2 setup for Airtime
-    -a - install the default apache setup for Airtime
-    -p - create a default Airtime postgres user
-
-This will install all components necessary for Airtime, and set up 
-/usr/share/airtime as your web root (where apache looks for your Airtime files)
-
-There are several options for installation - to see them all, run
-
-    sudo ./install --help
-
-2) Once you've run the installer, open a web browser to http://localhost to run 
-the interactive setup. (If you have a custom apache configuration, navigate to 
-your Airtime web host instead.) 
-
-If you just want to run Airtime with default settings, you won't need to change 
-anything, but if you have any custom configuration settings you'll be able to 
-specify them.
-
-Once you finish the setup process, you'll be presented with a configuration 
-checklist so you can ensure that your Airtime installation is working 
-correctly. If anything was mis-configured, the checklist will provide some .
-helpful tips to resolve the issue.
-
-If your checklist is all green, you're ready to get started with Airtime!
-
-Quick links to our resources
-----------------------------
-User manual: http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/
-Forums and mailing lists: http://forum.sourcefabric.org
-Bug tracker: http://dev.sourcefabric.org
-Source code: http://github.com/sourcefabric/Airtime
-IRC chat: #airtime on Freenode

docs/features.md

@@ -16,3 +16,9 @@ Screenshots
 -----------
 
 ![](manual/what-is-airtime/static/Screenshot540-Now_playing_250.png)
+
+![](static/Scheduler1.png)
+
+![](static/Scheduler2.png)
+
+![](static/Upload.png)

docs/install.md

@@ -3,23 +3,73 @@ There two methods of installing LibreTime - [Source](#source) or
 [Ubuntu package](#ubuntu-package).
 
 ## Source
-LibreTime releases can be downloaded [here](https://github.com/LibreTime/libretime/releases).
 
-Recommendations:
+Requirements:
 
-- LibreTime should generally be installed on a dedicated host running Ubuntu 16.04 LTS (Xenial Xerus).
+- LibreTime should generally be installed on a dedicated host running Ubuntu Server 18.04 LTS, have at least 1 GHz of processor power, at least 2 GB of system RAM, and static IP address.
-- LibreTime is undergoing active development, and is currently in ALPHA.
+- LibreTime is undergoing active development, and is currently in ALPHA. Make sure it is working for your needs well before you begin to use it in a live environment.
-- It is not recommended that you install LibreTime on the same computer you are using as a desktop.
 - Please review the release notes of the version you are planning on installing.
 
-Once you have downloaded and extracted LibreTime, run the installation script by navigating into the
+The easiest way to install LibreTime is by cloning the repository using git, and
-folder containing the LibreTime codebase, and run its install script from the command line:
+then running the installer.
 
-```
+1. If you don't have git installed already, run `sudo apt install git -y`
-sudo ./install -fiap
+2. Create a folder in your home directory for the download and change to it: `cd ~ && mkdir LibreTime && cd LibreTime`
-```
+3. Clone the repo: `git clone https://github.com/LibreTime/libretime.git`
+4. Run the installer: `sudo ./install -fiap`
+5. After the installer is finished, follow the instructions to proceed to the [setup wizard](manual/getting-started/index.md)
 
-The installer will install and configure all dependencies only if the `-fiap` flag is added. If you would prefer to configure dependencies manually, omit the flag.
+It's recommended to use the `-fiap` flag to install LibreTime on a fresh server install. This way,
+all dependencies will be installed and configured by the installer without needing user input.
+
+For those who plan to manually configure LibreTime, options for the installer are listed below:
+```
+-h, --help, -?
+            Display usage information
+-V, --version
+            Display version information
+-v, --verbose
+            More output
+-q, --quiet, --silent
+            No output except errors
+-f, --force
+            Turn off interactive prompts
+--distribution=DISTRIBUTION
+            Linux distribution the installation is being run on
+--release=RELEASE
+            Distribution release
+-d, --ignore-dependencies
+            Don't install binary dependencies
+-w, --web-user=WEB_USER
+            Set the apache web user. Defaults to www-data. Only change
+            this setting if you've changed the default apache web user
+-r, --web-root=WEB_ROOT
+            Set the web root for Airtime files
+            This will copy the Airtime application files, but you will need
+            to give your web user access to the given directory if it is
+            not accessible
+--web-port=WEB_PORT
+            Set what port the LibreTime interface should run on.
+-I, --in-place
+            Set the current Airtime directory as the web root
+            Note that you will need to give your web user permission to
+            access this directory if it is not accessible
+-p, --postgres
+            Create a default postgres user named 'airtime' with password
+            'airtime'
+-a, --apache
+            Install apache and deploy a basic configuration for Airtime
+-i, --icecast
+            Install Icecast 2 and deploy a basic configuration for Airtime
+--selinux
+            Run restorecon on directories and files that need tagging to
+            allow the WEB_USER access
+--no-postgres
+            Skips all postgres related install tasks (Useful if you configure
+            postgresql as part of another script / docker builds)
+--no-rabbitmq
+            Skips all rabbitmq related install tasks.
+```
 
 A great tutorial video on how to install LibreTime is [here](https://www.youtube.com/watch?v=Djo_55LgjXE).
 
@@ -40,8 +90,7 @@ sudo apt install icecast2 ./libretime_<version>_amd64.deb
 
 ## Alternative OS installations
 Installation in Debian 9 and other Linux distributions is possible, but these
-are less tested. Installation on Ubuntu 14.04.5 LTS (Trusty Tahr) is also working, but deprecated due to the
+are less tested.
-fact that this version will reach its official end of life in April 2019.
 
 Plans are in the works for `.rpm` packages, as well as Docker and AWS images. If you would like to try LibreTime in a Docker image, [odclive's (unofficial) image](https://hub.docker.com/r/odclive/libretime-docker) is a great place to start.
 

docs/manual/host-configuration/index.md

@@ -1,3 +1,6 @@
+Host configuration
+------------------
+
 The streaming host configuration for LibreTime is shown in the file */etc/airtime/liquidsoap.cfg* which is automatically generated by the **Streams** page, found on the **System** menu of the LibreTime administration interface. For this reason, you would not normally edit the streaming configuration manually, as any changes are likely to be overwritten by the administration interface.
 
 Database and RabbitMQ hosts
@@ -50,6 +53,21 @@ used by the various components of LibreTime, run the following commands
     sudo systemctl restart airtime-celery
     sudo systemctl restart airtime_analyzer
 
+Changing the default PostgreSQL passwords
+----------------------------------------
+
+Two of the most important passwords that should be changed *immediately* after installation
+are the passwords used by the PostgreSQL database.
+It is strongly recommended that you do this before exposing your server to the internet beyond your internal network.
+
+1. Login to PostgreSQL with `sudo -u postgres psql`. The PostgreSQL shell - `postgres=#` - means that you have logged in successfully.
+2. Change the admin password with `ALTER USER postgres PASSWORD 'myPassword';`, where `myPassword` is the new password.
+Make sure to include the semicolon at the end! A response of `ALTER ROLE` means that the command ran successfully.
+3. Change the password for the *airtime* user with `ALTER USER airtime WITH PASSWORD 'new_password';`
+A response of `ALTER ROLE` means that the command ran successfully.
+4. If all is successful, logout of PostgreSQL with `\q`, go back to */etc/airtime/airtime.conf* to edit the password
+in the config file, and restart all services mentioned in the previous section.
+
 API client configuration
 ------------------------
 

docs/manual/howtos/build-schedule.md

@@ -1,34 +0,0 @@
-# How to build a basic schedule with LibreTime
-
-A description of the steps involved in adding a show to the LibreTime calendar
-schedule for future playback including repeating shows
-
-**Audience**: Program Managers and Admins
-
-1. Click on the Calendar menu item on the left side of the screen
-1. Click on the blue New Show button
-1. Under **What** - type in a Name to replace Untitled Show
-1. Optional – add URL, Genre and Description
-1. Under **When** click **In The Future**
-1. Select a date and time for the **Start Time** and **End Time**
-1. Time is entered as 00:00 where the first 2 digits are the hour in 24 hour
-time and the second 2 digits are the minutes. So 15:00 is 3PM. *Note: 24 hours
-is the maximum show time and Midnight is 00:00 of the next date.*
-1. Click **Repeats** if this show will air more than once.
-1. If it airs at the same time of the day on more than one day of the week then
-check the boxes next to the Days it should repeat on.
-1. If this is a limited engagement show uncheck **No End?** and select the date
-at which this show should no longer be on the schedule.
-* **Autoloading Playlist** is used if you will generate the content for this
-show using a playlist possibly containing smartblocks to dynamically generate
-it. Ihf this is checked and a playlist is selected, LibreTime will schedule it
-an hour before the show is set to air as well as any **Intro & Outro Playlist**
-configured in the Admin settings. See other How Tos for ideas about how to use Autoloading playlists.
-1. **Live Stream Input** contains the streaming information for DJs and if
-**Use LibreTime Authentication** is checked then DJs can login to stream live
-if they are added to the **Who** section.
-1. **Who** is where you can give DJ users permission to schedule tracks for
-this show and stream live during the show spot. You can check the box
-next to them or type their name and click the drop down.
-1. **Style** allows you to select a custom color and add a show Logo for this
-show.

docs/manual/howtos/genre-autodj.md

@@ -1,103 +0,0 @@
-# How to set up genre specific Auto DJ with autoloading playlist
-
-In this tutorial we will focus on how to build a traditional auto DJ system
-where we use a feature called smart blocks and auto loading playlists to play
-random music tracks of a certain genre during a show. This tutorial is
-primarily focused on program managers but users who are DJs can also benefit
-from smart blocks but will only be able to manually schedule them.
-
-So for the purposes of this tutorial we are going to assume that you
-have uploaded a number of files of music with the genre metadata all
-matching a specific genre, for instance, Alternative. This can be done
-ahead of time, but LibreTime has no way of automatically grouping sub
-genres and so it is important that you spend some time curating the
-track metadata before you upload it to LibreTime as there is not
-currently a way to bulk edit tracks from inside LibreTime. Also once
-tracks are uploaded the metadata of the track itself isn’t changed but
-just how it is represented in the LibreTime database. This might change
-in the future but would only affect you if you were downloading tracks
-and uploading them to another instance and hoped that the changes you
-made were saved.
-
-So we can bulk upload a number of creative commons licensed tracks that
-have their genre all set to specific genres as one way of getting tracks
-if you don’t have a mp3 collection of your own to draw from. See links
-below for some spots where you can procure tracks where the creators
-gave permission for everyone to redistribute play and share them.
-
-One the tracks are uploaded to the system and imported we can now create
-a smartblock that will select the tracks that match a certain genre. For
-this we will use Genre contains Jazz – this will match any track that
-has genre anywhere in its genre so ‘big band jazz’ and ‘swing jazz’
-would match as well as ‘acid jazz’. Any subgenre that doesn’t include
-jazz explicitly such as ‘be bop’ would need to be added as a new
-modifier.
-
-For the purposes of this smart block we want to select 4 random items.
-We also want to avoid really long tracks that are longer than 10
-minutes. So we will add the modifier Length is less than 00:10:00
-
-and now this smart block will pull 4 smart blocks. Be sure to preview it
-to make sure that you have some matches in your library. This will also
-save it.
-
-Now we are going to create a new smart block that plays one promo or
-station ID.
-
-Click smartblock and new and then type in the name promo OR ID and then
-change the criteria Genre to is promo and now click new modifier and
-then is TOTHID.
-
-And then change limit to 1 items.
-
-Now we are going to create a playlist that contains these two smart
-blocks.
-
-Click new and then type Jazz with promos
-
-and then click smartblocks and add the Jazz Songs followed by the Promo
-or ID smart block.
-
-Now this playlist can be dragged into a schedule show to add 3 random
-jazz songs followed by a promo. You can manually repeat the selection in
-the playlist to create a long auto DJ playlist. For instance lets add 3
-more Jazz Songs and then add 3 Jazz Songs again followed by a Promo or
-ID. Now lets save this playlist and go and add it to a scheduled show.
-
-This is a quick and easy way for you to manually schedule a large chunk
-of time. You can also use this as an autoloading playlist.
-
-Lets assign this to a new 3 hour show. Called lots of Jazz. Now lets go
-under Autoloading Playlist and enable that and in this spot we will
-check repeat until full. This will mean that the system will keep
-scheduling this playlist until the show is completely full. The only
-problem here is that at the end of the show it is almost assured that a
-track will be cut off. If you are a web station and you just want to
-schedule music for long lengths of time you can schedule shows that are
-up to 24 hours long.
-
-On the other hand if you are an FCC licensed station you are required to
-have top of the hour IDs as close as possible to the top of the hour. In
-this case the random selection of tracks might not suffice for
-compliance.
-
-If you have a station ID playlist smartblock in your intro playlist (see
-previous tutorial linked below) and you have your tracks broken up
-hourly this shouldn’t be an issue but it still might result in tracks
-being cut of in the middle.
-
-So the best option currently is to change the music tracks to fill the
-remaining show from the previous selection of 3 items. And then be sure
-to add a promos or musical sound bridges at the end that are also time
-remaining but allow overfill.
-
-It is possible that we could improve the way the autoloading playlists
-work in the future, please check out LibreTime.org for the latest
-release notes and feel free to ask any questions at our forum at
-[https://discourse.LibreTime.org](https://discourse.LibreTime.org/)
-
-Thanks for tuning in to another LibreTime tutorial. Our next tutorial
-will show you how to use autoloading playlists to add show specific
-underwriting or advertisements.
-
-

docs/manual/howtos/index.md

@@ -1,17 +0,0 @@
-##How-Tos##
-The following are step-by-step instructions derived from the LibreTime tutorials.
-
-##DJ How Tos##
-* [How to livestream with Butt](livestream.md)
-* [How to upload and schedule tracks](upload.md)
-* [How to upload a promo](upload-promo.md)
-
-##Program Manager How Tos##
-* [How to build a schedule](build-schedule.md)
-* [How to setup genre specific AutoDJ](genre-autodj.md)
-* [How to setup an intro playlist](intro-playlist.md)
-* [How to setup an outro playlist with ambient music](outro-playlist.md)
-* [How to setup latest podcast episode to play with autoloading playlist](podcast.md)
-
-##Adminstrators How Tos##
-* [How to add track types](track-types.md)

docs/manual/howtos/livestream.md

@@ -1,57 +0,0 @@
-# How to broadcast live with LibreTime and Butt
-
-This how to is intended for DJs using butt to stream to their LibreTime
-server with an external USB audio card setup to route a mixer and sound.
-
-**Audience**: DJs
-
-## Set Up
-
-1. Download and install butt from <https://danielnoethen.de/> for your OS.
-*Note: be sure you have butt version 0.1.17 or newer installed*
-1. Open up butt
-1. Click **settings**
-1. Under **Main** under **Server **click **ADD**
-    * Type LibreTime (or your station) under Name
-    * Click the radio button next to **IceCast** under Type
-    * Type your stations URL (webpage address) under **Address**:
-    * Type **8002** under **Port**:
-    * Type your DJ login password under **Password**
-    *  Type **/show** under IceCast mountpoint:
-    * Type your dj login under **IceCast user:**
-1. Click **ADD**
-1. Still in settings click, **Audio** and select your external sound card under
-**Audio Device** *Note: if you only have an internal sound card you maybe able
-to use it but that is OS specific and outside of this tutorial. We are assuming
-you have a mic and mixer or a USB mixer hooked up to or as an external soundcard*
-
-## Show Time
-
-1. When its almost your show time go to your LibreTime page and look at the time
-in the top right when your show starts go to Butt.
-1. Click the white Play button (third button in the middle).
-1. If it says connecting… and then stream time with a counter– congratulations,
-your are connected!
-1.  Go to the LibreTime page and at the top right under Source Streams the
-tab besides Show Source is to the left and Orange – if it is and Current
-shows Live Show you are connected.
-1. If it is gray, click on the **Show Source** switch to the right of it and it
-will toggle your show on and you will be broadcasting. *Note: whether auto
-connect is turned on is a station specific setting so it could work either way*
-
-## Recording your show
-
-You can record your show under butt by clicking the red circle record button on
-the left. It will save a mp3 based upon the date and time in your home/user
-directory by default.
-
-Everything should now be working and you can broadcast for your entire time
-slot. If you choose to stop streaming before it is over click the white square
-**Stop** button to disconnect. Then go to the LibreTime page and if the Show
-Source didn’t automatically disconnect you can click it to the right and it
-should turn gray.
-
-You are now done streaming.
-
-If you have issues connecting check with your system administrator to see if you
-have the details right.

docs/manual/howtos/upload-promo.md

@@ -1,24 +0,0 @@
-# How to upload a promo
-
-**Audience**: DJs
-
-1. Record your promo and export it as a mp3. *Note: if you can set the genre
-metadata to **promo** you can skip the final step below*
-1. **Login** to LibreTime with your DJ username
-1. Click **Upload** and drag or click and browse to upload the track.
-1. Let the track upload. Once it is done and is shown as imported on the right,
-click **Tracks**
-1. Find the track in the list
-1. If it is not at the top click the **Uploaded** column until it sorts by the
-newest tracks first.
-1. If Uploaded doesn’t show up click **Columns** to the top right scroll down
-and click the box next to **Uploaded**
-1. Now click **Uploaded** twice and it should display your track at the top.
-1. Click the box next your track and click the **Edit** button above the track
-listing.
-1. A box saying Editing “track name” should show up on the right.
-1. Find **promo** type in **Genre** (or whatever metadata classification your
-station uses)
-1. Scroll down and click **Save**
-1. If you match the metadata requirements for the station smart block then your
-track will be included in the track list it pulls from.

docs/manual/howtos/upload.md

@@ -1,34 +0,0 @@
-# How to upload and schedule a track to play on a specific show
-
-**Audience**: DJ with permission to schedule a specific show
-
-1. **Login** to LibreTime with your DJ username and password at
-[http://HOSTNAME/user](http://HOSTNAME/user) *Note: replace HOSTNAME with the
-web site address given to you by your station admin*
-1. Click the blue **Upload** button in the top left of the screen.
-1. Click the background where it says **Drop files here or click to browse your
-computer** or drag on and drop your music files from your desktop.
-1. If you clicked then browse your file system to find the music files you want
-to play and click them and then click **Open**
-1. The tracks should start to upload and when they are completed show up on the
-right under **Recent Uploads**. *Note: you will need to keep this window open
-while they are uploading*
-1. You can also upload short segments to schedule between your tracks recorded,
-for instance, with Audacity.
-1. LibreTime in general supports mp3, ogg, flac, wav and m4a file types. If
-a track isn’t supported the import will be marked as failed under
-**Import Status**
-1. Once you have uploaded all of the tracks you plan on airing you click on
-**Calendar**
-1. Find your upcoming show in the Calendar and click on it and click **Schedule
-Tracks** from the pop-up menu.
-1. Now click the tracks you want to add and click **+ Add to show** or
-click and drag the tracks to the right.
-1. You can also add station **Smart Blocks**, **Playlists** and **Webstreams**
-by clicking those sections at the top of the screen.
-1. When you are done you can re-order your tracks by clicking and dragging
-them.
-1. When your tracks are in order and there is no empty time remaning click
-**Ok** to finish.
-1. Your next show should now be scheduled to play during its scheduled time
-slot.

docs/manual/on-air-in-60-seconds/index.md

@@ -6,31 +6,39 @@ you need to read more).
 
 1. Log in to your LibreTime server with your **Username** and **Password**
 (*Getting started*).
+
 ![](static/Screenshot559-Log_in.png)
 
 2. Add your files to the LibreTime library by clicking **Upload** on the left
-menu, then click on the the **Drop files here or click to browse your computer**
+menu, selecting the track type (ie. Music, Show Intros, Station IDs), then clicking
+on the the **Drop files here or click to browse your computer**
 area. You can drag and drop your files into this window too. The upload will
 start as soon as you drop a file (*Add media*).
-![](static/Screenshot557-Select_files_a7GflUi.png)
+
+![](static/Select_files.png)
 
 3. Create a show by clicking **Calendar** on the main menu, and then clicking
 the **New Show** button (*Calendar*). Only admins and program managers can add
 shows (*Users*).
+
 ![](static/Screenshot558-Add_Show.png)
 
 4. Set a name for your show in the **What** section of the box, and a date and
 time in the **When** section, then click the **+ Add this show** button at the
 end of the page (*Calendar*).
+
 ![](static/Screenshot560-Show_when.png)
 
 5. Add media to the new show by clicking the name of your show in the
 **Calendar** and selecting **Schedule Tracks** (*Calendar*).
+
 ![](static/Screenshot561-Add_show_content.png)
 
 6. Search for the media in the left side of the pop-up window which will appear,
 and drag it into your show on the right side (*Now Playing*).
+
 ![](static/Screenshot562-Drag_show_content.png)
 
 7. You're on air! Click the **Listen** button to hear available streams.
+
 ![](static/Screenshot563-Listen.png)

docs/manual/playlists/index.md

@@ -18,19 +18,15 @@ Click the link **View / edit description** to expand a box where you can enter a
 Adding content to a playlist
 ----------------------------
 
-With a playlist open, click on an item in the search results and then click **Add to Playlist** on the pop-up menu. Or drag and drop items from the search results on the left into the playlist on the right. Jingles and voice tracks can be added before, after or between music items.
+With a playlist open, drag and drop items from the search results on the left into the playlist on the right. Jingles and voice tracks can be added before, after or between music items.
 
 ![](static/Screenshot505-Add_item_to_playlist_240.png)
 
-You can also select or deselect a whole page of search results using the **Select** button, just below the simple search field. Alternatively, use the checkboxes in the first column of the search results table to select individual items, then click the **Add to current playlist** button. Items that you own which you no longer require can be deleted from LibreTime's library using the **Trashcan** button. 
-
-![](static/Screenshot439-Checkbox_select_items.png)
-
 After adding files to the playlist, the total playlist time is displayed in the top right corner. The duration of an individual file is shown in each row of the playlist in a white font, and beneath this figure the time since the beginning of the playlist is displayed in a smaller light grey font. This elapsed time figure can be used as a time check for voice tracks, although this option may limit the re-usability of the voice track.
 
 To audition a playlist file in your web browser, click the white triangle button on the left side of its row. (If the format of the file is not supported by your browser, the triangle in this button will be greyed out). If audition of the file format is supported, a pop-up window will open, with the playlist starting at the file you clicked.
 
-Click the small white **x** icon on the right hand side of each row to remove a file from the playlist. You can also drag and drop files to re-order them, or click the **Shuffle** button to re-order files automatically. Click the **Clear** button to remove all content from the playlist, or click the **Delete** button to remove the playlist from the LibreTime library altogether.
+Click the small white **x** icon on the right hand side of each row to remove a file from the playlist. You can also drag and drop files to re-order them, or click the **Shuffle** button to re-order files automatically.
 
 ![](static/Screenshot506-Drag_drop_playlist_240.png)
 
@@ -43,4 +39,3 @@ When your playlist is complete, click the **New** button in the top left corner
 If you want to edit the playlist content or metadata later, you can find it by **Title**, **Creator**, **Last Modified** date, **Length**, **Owner** or **Year** using one of the search tools on the Library page. Click the playlist in the search results list, and then click **Edit** from the pop-up menu. You can also **Preview** the entire playlist in a pop-up audition window, **Duplicate** or **Delete** one of your playlists from this menu.
 
 ![](static/Screenshot501-Edit_playlist_240.png)
-

docs/manual/podcasts/index.md

@@ -1,10 +1,34 @@
+# The Podcasts page
+
 The Podcasts page allows you add subscriptions to podcasts which are often used to syndicated audio files using a URL called a RSS feed. This allows your LibreTime instance to automatically download new shows from the web.
 
 In order to add a podcast you need to get the RSS feed. All podcasts available on iTunes have a RSS feed but it is sometimes hidden. See this issue on our github page [#510](https://github.com/LibreTime/libretime/issues/510) for more information. RSS feeds that do not end in *.xml* may be accepted by LibreTime but might fail to download episodes; in that case, download the episode using a podcast client such as [gpodder](https://gpodder.github.io/) and then manually upload and schedule the episode. Podcast feeds coming from Anchor.fm have been known to have this issue.
 
-The podcast interfaces provides you with the ability generate [Smartblocks](../smartblocks) that can be used in conjunction with [Autoloading Playlists](../calendar/#autoloading-playlist) to schedule the newest episode of a podcast without human intervention.
+The podcast interfaces provides you with the ability to generate [Smartblocks](../smartblocks) that can be used in conjunction with [Autoloading Playlists](../calendar/#autoloading-playlist) to schedule the newest episode of a podcast without human intervention.
 
 ##Video Tutorials##
-Coming Soon
+- [How to schedule a podcast to play the latest episode automatically](https://www.youtube.com/watch?v=g-4UcD8qvR8)
-##How To##
+
-TBD
+Dashboard
+----------------------
+
+![](static/Podcasts_Dashboard.png)
+
+The podcasts dashboard is similar to the tracks view, allowing you to add, edit, and remove
+podcasts by the toolbar, in addition to sorting by columns. Podcast feeds themselves cannot be searched (ie. to
+  search for _Background Briefing_, as per the screenshot).
+
+To add a podcast, click on the **+ Add** button on the toolbar and provide the podcast's RSS feed, which usually ends in *.xml*.
+Once the podcast's feed is recognized, the editor pane opens for the podcast.
+
+Editor
+-------------------
+
+![](static/Podcasts_Editor.png)
+
+In the podcasts editor, you can rename the podcast, update settings for the podcast, and manage episodes.
+A search box is available to search for episodes within the feed.
+
+- To import an episode directly into LibreTime, double-click on an episode or select it and click **+ Import**. The podcast will appear under tracks with the Podcast Name as the Album.
+- To delete an episode from LibreTime, select the episode and click on the red trash can on the toolbar.
+- If you would like LibreTime to automatically download the latest episodes of a podcast, make sure *Download latest episodes* is checked. This can be used in conjunction with Smartblocks and Playlists to automate downloading and scheduling shows that are received via. podcast feed.

docs/manual/preparing-the-server/index.md

@@ -4,11 +4,9 @@ The following instructions assume that you have root access (**sudo** on most
 distributions) to a GNU/Linux server, and are familiar with basic command line
 tasks.
 
-The recommended LibreTime server platform is Ubuntu 16.04 LTS (Xenial Xerus).
+The recommended LibreTime server platform is Ubuntu Server 18.04 LTS. The server should have at least a 1GHz
-
+processor, 2GB of RAM, and a _wired_ ethernet connection. A soundcard is only required if you plan to
-The server should have at least a 1GHz processor and 1GB of RAM, preferably 2GB
+output audio directly to a mixing console instead of/in addition to using the onboard Icecast2 server.
-RAM or more. If you are using a desktop environment and web browser directly on
-the server you should install at least 2GB RAM to avoid swapping to disk.
 
 The LibreTime installation does not use much disk space, but you should allow
 plenty of storage capacity for the LibreTime library. A hot-swap RAID array is
@@ -20,6 +18,34 @@ LibreTime depends on infrastructure and services that need to be configured
 properly for it to run smoothly. This chapter will go through the individual
 parts of a LibreTime install and help you assess how you need to manage them.
 
+Netplan
+-------
+
+Starting in Ubuntu 18.04 LTS, network settings are managed by the Netplan daemon (more info [here](https://netplan.io/)). The Netplan config file is written in yaml and located at */etc/netplan/...*; if no yaml file is present, create one with a name like `##-netcfg.yaml` where ## is a number of your choice.
+
+An example Netplan config looks like this:
+```
+network:
+  version: 2
+  renderer: networkd
+  ethernets:
+    enp3s0:
+      addresses: [192.168.88.8/24]
+      gateway4: 192.168.88.1
+      nameservers:
+        search: [lan]
+        addresses: 192.168.88.1
+```
+
+In this example, `enp3s0` is the name of your network card; check to see what your network card's name is by running `ip -a` or `ifconfig`. Spacing in Netplan config files is two (2) spaces per indent. Using tabs will prevent the Netplan config from starting correctly.
+
+- List your desired static IP address under `addresses` in the XXX.XXX.XXX.XXX/YY format (for more information on this, see [this subreddit thread](https://www.reddit.com/r/AskTechnology/comments/1r9x2f/how_does_the_ip_range_format_xxxxxxxxxxxxyy_work/)).
+  - If your subnet mask is *255.255.255.0* then your IP address will end in `/24`, just like the example above.
+- Set your DNS server under `gateway4` (this will likely be your router's IP address)
+- Set your gateway under `nameservers -> addresses`
+
+Once your Netplan config is set up correctly, run `sudo netplan apply` to update the configuration. Check that your IP address is set to the specified address with `ifconfig` and check to see if you are connected to the internet properly by pinging a known IP (ex. `ping 1.1.1.1`, Cloudflare's server) or by running `sudo apt update`. If no errors appear, than your server's IP is configured correctly.
+
 Firewall
 --------
 
@@ -31,14 +57,23 @@ machine).
 Setting up a local firewall is done differently on all the supported distros.
 
 * [Debian](https://wiki.debian.org/DebianFirewall)
-* [Ubuntu](https://help.ubuntu.com/lts/serverguide/firewall.html)
 * [FirewallD](http://www.firewalld.org/) (CentOS)
+* [Ubuntu](https://help.ubuntu.com/lts/serverguide/firewall.html)
+  * To quickly configure Ubuntu's firewall, `ufw`:
+  ```
+sudo ufw enable
+sudo ufw allow 80/tcp
+sudo ufw allow 443/tcp
+sudo ufw allow 8000/tcp #only if streaming from your server
+sudo ufw allow 8001/tcp #only if DJs will be directly connecting to stream in ports, also include 8002/tcp
+sudo ufw status #to check setup
+  ```
 
 There are a vast amount of ways to configure your network, firewall included.
-Choose the way that best fits your deploy and dont internal expose parts of your
+Choose the way that best fits your deployment and don't expose internal parts of your
 LibreTime install on the network.
 
-The following ports are relevant to the deploy and need to be opened to varying
+The following ports are relevant to LibreTime's core services and need to be opened to varying
 degrees.
 
 | Port | Description |
@@ -46,7 +81,7 @@ degrees.
 | 80 | Default unsecure web port. Needs to be open for the webserver to serve the LibreTime webinterface or if you enable TLS a redirect to the secure web port.|
 | 443 | Default secure web port. This is where your LibreTime webinterface lives if you choose to configure TLS.|
 | 8000 | Main Icecast instance. This is where your listeners connect if you plan on using your LibreTime server to directly serve such connections. You can also configure external Icecast or ShoutCast instances for this later.|
-| 8001 and 8002 | Master and Show source input ports. Only open these ports if you plan on letting anyone use these features. You might want to consider usinga fixed IP if you use the master source for studio connections on port 8001 and only allow DJ to connect over a VPN link or similar depending your security needs.|
+| 8001 and 8002 | Master and Show source input ports. Only open these ports if you plan on letting anyone use these features.|
 
 The remaining parts of LibreTime might open additional ports that should not be
 accessible from any untrusted networks. You should consider how to configure
@@ -113,3 +148,31 @@ See these links for more information:
 
 * [Networking and RabbitMQ](https://www.rabbitmq.com/networking.html)
 * [Serverfault Instructions for Debian](https://serverfault.com/a/319166)
+
+Services
+---------
+
+Once all of the services needed to run LibreTime are installed and configured,
+it is important that the server starts them during the boot process, to cut down on downtime, especially in live enviornments.
+Ubuntu 18.04 uses the `systemctl` command to manage services, so run the following commands to enable all
+LibreTime-needed services to run at boot:
+
+```
+sudo systemctl enable airtime-liquidsoap
+sudo systemctl enable airtime-playout
+sudo systemctl enable airtime-celery
+sudo systemctl enable airtime_analyzer
+sudo systemctl enable apache2
+sudo systemctl enable rabbitmq-server
+```
+
+If an error is returned, try adding `.service` to the end of each command. For example:
+
+```
+sudo systemctl enable apache2.service
+```
+
+User groups
+------------
+
+If you plan to have LibreTime output audio directly to a mixing console or transmitter, the `www-data` user needs to be added to the `audio` user group using `sudo adduser www-data audio`. Otherwise, if an Icecast or Shoutcast server is going to be used without an analog audio output, this step can be omitted.

docs/manual/radio-page/index.md

@@ -1 +1,26 @@
-**TBD**
+# Radio page
+
+LibreTime includes a mini-site, which can be accessed at _localhost_ (for local installations) or
+_libretime.example.com_ (for installations to a server on a domain).
+
+![](static/radio-page.png)
+
+The site includes your logo (set under Settings > General), the login button to the LibreTime interface, links for the schedule, station description, and podcast tabs, and a livestream player that runs of the stream from the built-in Icecast2 server.
+The currently playing artist and track are displayed.
+
+![](static/radio-schedule.png)
+
+The schedule tab opens by default and shows a schedule for your station based on LibreTime's Calendar
+for the next 7 days. All times are presented in 12 hour format.
+
+![](static/radio-about.png)
+
+The about tab includes your station name and a quick blurb about your station that can be set under Settings > General (more info [here](../general/index.md)).
+
+![](static/radio-podcast.png)
+
+Tracks published wind up here, and can be played back on-demand. This is a great place for putting episodes of shows that have already played out on stream. The Subscribe button allows for listeners to subscribe to your podcast's RSS feed in a podcast client of their choice, such as Apple Podcasts.
+
+![](static/radio-altbkgnd.png)
+
+The background of the radio page can be changed; see instructions [here](../interface-customization/index.md). Image comes from [CATS ON SYNTHESIZERS IN SPACE](https://www.catsonsynthesizersinspace.com/).

docs/manual/troubleshooting/index.md

@@ -1,3 +1,5 @@
+# Troubleshooting
+
 If your Airtime server is not working as expected, individual components of the system can be started, stopped, restarted or checked in the server console using the **systemctl** command:
 
     sudo systemctl start|stop|restart|status airtime-liquidsoap

docs/manual/tutorials/autodj.md

@@ -3,4 +3,104 @@
 
 [![How to Setup Genre based AutoDJ](http://img.youtube.com/vi/XNVIDnczrOk/0.jpg)](https://www.youtube-nocookie.com/embed/XNVIDnczrOk "How to Setup Genre based AutoDJ")
 
-* Text-based Step-by-step [How-to](../../howtos/genre-autodj)
+## Text-based Step-by-step
+
+In this tutorial we will focus on how to build a traditional auto DJ system
+where we use a feature called smart blocks and auto loading playlists to play
+random music tracks of a certain genre during a show. This tutorial is
+primarily focused on program managers but users who are DJs can also benefit
+from smart blocks but will only be able to manually schedule them.
+
+So for the purposes of this tutorial we are going to assume that you
+have uploaded a number of files of music with the genre metadata all
+matching a specific genre, for instance, Alternative. This can be done
+ahead of time, but LibreTime has no way of automatically grouping sub
+genres and so it is important that you spend some time curating the
+track metadata before you upload it to LibreTime as there is not
+currently a way to bulk edit tracks from inside LibreTime. Also once
+tracks are uploaded the metadata of the track itself isn’t changed but
+just how it is represented in the LibreTime database. This might change
+in the future but would only affect you if you were downloading tracks
+and uploading them to another instance and hoped that the changes you
+made were saved.
+
+So we can bulk upload a number of creative commons licensed tracks that
+have their genre all set to specific genres as one way of getting tracks
+if you don’t have a mp3 collection of your own to draw from. See links
+below for some spots where you can procure tracks where the creators
+gave permission for everyone to redistribute play and share them.
+
+One the tracks are uploaded to the system and imported we can now create
+a smartblock that will select the tracks that match a certain genre. For
+this we will use Genre contains Jazz – this will match any track that
+has genre anywhere in its genre so ‘big band jazz’ and ‘swing jazz’
+would match as well as ‘acid jazz’. Any subgenre that doesn’t include
+jazz explicitly such as ‘be bop’ would need to be added as a new
+modifier.
+
+For the purposes of this smart block we want to select 4 random items.
+We also want to avoid really long tracks that are longer than 10
+minutes. So we will add the modifier Length is less than 00:10:00
+
+and now this smart block will pull 4 smart blocks. Be sure to preview it
+to make sure that you have some matches in your library. This will also
+save it.
+
+Now we are going to create a new smart block that plays one promo or
+station ID.
+
+Click smartblock and new and then type in the name promo OR ID and then
+change the criteria Genre to is promo and now click new modifier and
+then is TOTHID.
+
+And then change limit to 1 items.
+
+Now we are going to create a playlist that contains these two smart
+blocks.
+
+Click new and then type Jazz with promos
+
+and then click smartblocks and add the Jazz Songs followed by the Promo
+or ID smart block.
+
+Now this playlist can be dragged into a schedule show to add 3 random
+jazz songs followed by a promo. You can manually repeat the selection in
+the playlist to create a long auto DJ playlist. For instance lets add 3
+more Jazz Songs and then add 3 Jazz Songs again followed by a Promo or
+ID. Now lets save this playlist and go and add it to a scheduled show.
+
+This is a quick and easy way for you to manually schedule a large chunk
+of time. You can also use this as an autoloading playlist.
+
+Lets assign this to a new 3 hour show. Called lots of Jazz. Now lets go
+under Autoloading Playlist and enable that and in this spot we will
+check repeat until full. This will mean that the system will keep
+scheduling this playlist until the show is completely full. The only
+problem here is that at the end of the show it is almost assured that a
+track will be cut off. If you are a web station and you just want to
+schedule music for long lengths of time you can schedule shows that are
+up to 24 hours long.
+
+On the other hand if you are an FCC licensed station you are required to
+have top of the hour IDs as close as possible to the top of the hour. In
+this case the random selection of tracks might not suffice for
+compliance.
+
+If you have a station ID playlist smartblock in your intro playlist (see
+previous tutorial linked below) and you have your tracks broken up
+hourly this shouldn’t be an issue but it still might result in tracks
+being cut of in the middle.
+
+So the best option currently is to change the music tracks to fill the
+remaining show from the previous selection of 3 items. And then be sure
+to add a promos or musical sound bridges at the end that are also time
+remaining but allow overfill.
+
+It is possible that we could improve the way the autoloading playlists
+work in the future, please check out LibreTime.org for the latest
+release notes and feel free to ask any questions at our forum at
+[https://discourse.LibreTime.org](https://discourse.LibreTime.org/)
+
+Thanks for tuning in to another LibreTime tutorial. Our next tutorial
+will show you how to use autoloading playlists to add show specific
+underwriting or advertisements.

docs/manual/tutorials/autoloading-podcast.md

@@ -1,6 +0,0 @@
-# How to Set Up an Podcast to Play with Autoloading Playlist 
-* YouTube video
-
-[![How to Set Up an Podcast to Play with Autoloading Playlist](http://img.youtube.com/vi/g-4UcD8qvR8/0.jpg)](https://www.youtube-nocookie.com/embed/g-4UcD8qvR8 "How to Set Up an Podcast to Play with Autoloading Playlist")
-
-* Step-by-step Text Based [How-To](../../howtos/podcast)

docs/manual/tutorials/build-schedule.md

@@ -3,5 +3,37 @@
 
 [![Build Station Schedule](http://img.youtube.com/vi/EfNhl-yQcn8/0.jpg)](https://www.youtube-nocookie.com/embed/EfNhl-yQcn8 "How to build your schedule")
 
-* Step-by-step Text Based [How-To](../../howtos/build-schedule)
+## Step-by-step Text Based 
 
+A description of the steps involved in adding a show to the LibreTime calendar
+schedule for future playback including repeating shows
+
+**Audience**: Program Managers and Admins
+
+1. Click on the Calendar menu item on the left side of the screen
+1. Click on the blue New Show button
+1. Under **What** - type in a Name to replace Untitled Show
+1. Optional – add URL, Genre and Description
+1. Under **When** click **In The Future**
+1. Select a date and time for the **Start Time** and **End Time**
+1. Time is entered as 00:00 where the first 2 digits are the hour in 24 hour
+time and the second 2 digits are the minutes. So 15:00 is 3PM. *Note: 24 hours
+is the maximum show time and Midnight is 00:00 of the next date.*
+1. Click **Repeats** if this show will air more than once.
+1. If it airs at the same time of the day on more than one day of the week then
+check the boxes next to the Days it should repeat on.
+1. If this is a limited engagement show uncheck **No End?** and select the date
+at which this show should no longer be on the schedule.
+* **Autoloading Playlist** is used if you will generate the content for this
+show using a playlist possibly containing smartblocks to dynamically generate
+it. Ihf this is checked and a playlist is selected, LibreTime will schedule it
+an hour before the show is set to air as well as any **Intro & Outro Playlist**
+configured in the Admin settings. See other How Tos for ideas about how to use Autoloading playlists.
+1. **Live Stream Input** contains the streaming information for DJs and if
+**Use LibreTime Authentication** is checked then DJs can login to stream live
+if they are added to the **Who** section.
+1. **Who** is where you can give DJ users permission to schedule tracks for
+this show and stream live during the show spot. You can check the box
+next to them or type their name and click the drop down.
+1. **Style** allows you to select a custom color and add a show Logo for this
+show.

docs/manual/tutorials/filler.md

@@ -1,7 +0,0 @@
-# How to Upload use Smartblocks to Fill Time Between Shows 
-* YouTube video
-
-[![How to Upload use Smartblocks to Fill Time Between Shows](http://img.youtube.com/vi/kNT9R80Q42I/0.jpg)](https://www.youtube-nocookie.com/embed/kNT9R80Q42I "How to Upload use Smartblocks to Fill Time Between Shows ")
-
-* Step-by-step Text Based [How-To](../../howtos/outro-playlist)
-

docs/manual/tutorials/index.md

@@ -1,20 +1,20 @@
 # Tutorials
 
-This page contains links to number of screencast tutorials.
+This page contains links to number of tutorials.
 Please provide any feedback on this [discourse forum post](https://discourse.libretime.org/t/new-tutorials-available-on-libretime-wiki/270/2).
 There are also a number of tutorials in Spanish on [Vimeo](https://vimeo.com/user90812787)
 
 ## DJ tutorials
-* [How to upload and schedule tracks on your show](upload-tracks)
+* [How to upload and schedule tracks on your show](upload-tracks.md)
-* [How to upload a promo](upload-promo)
+* [How to upload a promo](upload-promo.md)
 * [How to livestream with butt](livestream.md)
 
 ## Program Manager tutorials
 * [Building a schedule](build-schedule.md)
 * [How to set up an automatic top of the hour ID with intro playlist feature](top-of-hour-id.md)
-* [How to schedule a podcast to play the newest episode on an automatic basis](autoloading-podcast.md)
+* [How to schedule a podcast to play the newest episode on an automatic basis](podcast.md)
 * [How to setup a Auto DJ to play music from certain genres for unscheduled shows](autodj.md)
-* [Preventing dead air between shows without cutting off tracks](filler.md)
+* [Preventing dead air between shows without cutting off tracks](outro-playlist.md)
 * [How to schedule automatic underwriting/advertising announcements](underwriting.md)
 * [How to schedule a repeating webstream with a linked show](webstream-link.md)
 
@@ -22,3 +22,4 @@ There are also a number of tutorials in Spanish on [Vimeo](https://vimeo.com/use
 * [Installing LibreTime from Git on a stand-alone VPS](install-vps.md)
 * [Securing icecast and customizing stream settings ](stream-settings.md)
 * [How to install player and calendar widgets on your website](widgets.md)
+* [Configuring track types](track-types.md)

docs/manual/tutorials/livestream.md

@@ -3,4 +3,60 @@
 
 [![How to Livestream Your Show](http://img.youtube.com/vi/4GLsU9hPTtM/0.jpg)](https://www.youtube-nocookie.com/embed/4GLsU9hPTtM "How to Livestream Your Show")
 
-* Step-by-Step Text-based [How-to](../../howtos/livestream)
+## Step-by-Step Text-based
+
+This how to is intended for DJs using butt to stream to their LibreTime
+server with an external USB audio card setup to route a mixer and sound.
+
+**Audience**: DJs
+
+## Set Up
+
+1. Download and install butt from <https://danielnoethen.de/> for your OS.
+*Note: be sure you have butt version 0.1.17 or newer installed*
+1. Open up butt
+1. Click **settings**
+1. Under **Main** under **Server **click **ADD**
+    * Type LibreTime (or your station) under Name
+    * Click the radio button next to **IceCast** under Type
+    * Type your stations URL (webpage address) under **Address**:
+    * Type **8002** under **Port**:
+    * Type your DJ login password under **Password**
+    *  Type **/show** under IceCast mountpoint:
+    * Type your dj login under **IceCast user:**
+1. Click **ADD**
+1. Still in settings click, **Audio** and select your external sound card under
+**Audio Device** *Note: if you only have an internal sound card you maybe able
+to use it but that is OS specific and outside of this tutorial. We are assuming
+you have a mic and mixer or a USB mixer hooked up to or as an external soundcard*
+
+## Show Time
+
+1. When its almost your show time go to your LibreTime page and look at the time
+in the top right when your show starts go to Butt.
+1. Click the white Play button (third button in the middle).
+1. If it says connecting… and then stream time with a counter– congratulations,
+your are connected!
+1.  Go to the LibreTime page and at the top right under Source Streams the
+tab besides Show Source is to the left and Orange – if it is and Current
+shows Live Show you are connected.
+1. If it is gray, click on the **Show Source** switch to the right of it and it
+will toggle your show on and you will be broadcasting. *Note: whether auto
+connect is turned on is a station specific setting so it could work either way*
+
+## Recording your show
+
+You can record your show under butt by clicking the red circle record button on
+the left. It will save a mp3 based upon the date and time in your home/user
+directory by default.
+
+Everything should now be working and you can broadcast for your entire time
+slot. If you choose to stop streaming before it is over click the white square
+**Stop** button to disconnect. Then go to the LibreTime page and if the Show
+Source didn’t automatically disconnect you can click it to the right and it
+should turn gray.
+
+You are now done streaming.
+
+If you have issues connecting check with your system administrator to see if you
+have the details right.

docs/manual/tutorials/outro-playlist.md

@@ -57,3 +57,7 @@ created **Outro Playlist**
 
 Now every autoloading playlist show will have tracks scheduled to
 fill any potential dead air.
+
+Watch the tutorial on YouTube
+
+* [![How to Upload use Smartblocks to Fill Time Between Shows](http://img.youtube.com/vi/kNT9R80Q42I/0.jpg)](https://www.youtube-nocookie.com/embed/kNT9R80Q42I "How to Upload use Smartblocks to Fill Time Between Shows ")

docs/manual/tutorials/podcast.md

@@ -37,3 +37,7 @@ scheduled along with this playlist.
 1. To add tracks before or after all autoloading playlists see the
 [Intro playlist](intro-playlist.md) and [Outro playlist](outro-playlist.md)
 tutorials.
+
+Watch the tutorial on YouTube
+
+* [![How to Set Up an Podcast to Play with Autoloading Playlist](http://img.youtube.com/vi/g-4UcD8qvR8/0.jpg)](https://www.youtube-nocookie.com/embed/g-4UcD8qvR8 "How to Set Up an Podcast to Play with Autoloading Playlist")

docs/manual/tutorials/stream-settings.md

@@ -1,2 +1,2 @@
 # How to Customize the Stream Settings - YouTube link
-[![Upload a promo to LibreTime](http://img.youtube.com/vi/QPNo52Fc0ck/0.jpg)](https://www.youtube-nocookie.com/embed/QPNo52Fc0ck "How to upload a promo")
+TBD

docs/manual/tutorials/upload-promo.md

@@ -3,4 +3,27 @@
 
 [![Upload a promo to LibreTime](http://img.youtube.com/vi/IC0cn3LaAXs/0.jpg)](https://www.youtube-nocookie.com/embed/IC0cn3LaAXs "How to upload a promo")
 
-* Step-by-step Text Based [How-To](../../howtos/upload-promo)
+## Step-by-step Text Based 
+
+**Audience**: DJs
+
+1. Record your promo and export it as a mp3. *Note: if you can set the genre
+metadata to **promo** you can skip the final step below*
+1. **Login** to LibreTime with your DJ username
+1. Click **Upload** and drag or click and browse to upload the track.
+1. Let the track upload. Once it is done and is shown as imported on the right,
+click **Tracks**
+1. Find the track in the list
+1. If it is not at the top click the **Uploaded** column until it sorts by the
+newest tracks first.
+1. If Uploaded doesn’t show up click **Columns** to the top right scroll down
+and click the box next to **Uploaded**
+1. Now click **Uploaded** twice and it should display your track at the top.
+1. Click the box next your track and click the **Edit** button above the track
+listing.
+1. A box saying Editing “track name” should show up on the right.
+1. Find **promo** type in **Genre** (or whatever metadata classification your
+station uses)
+1. Scroll down and click **Save**
+1. If you match the metadata requirements for the station smart block then your
+track will be included in the track list it pulls from.

docs/manual/tutorials/upload-tracks.md

@@ -3,5 +3,37 @@
 
 [![Upload Tracks](http://img.youtube.com/vi/TJtWUzAlP08/0.jpg)](https://www.youtube-nocookie.com/embed/TJtWUzAlP08 "How to upload tracks")
 
-* Step-by-step Text Based [How-To](../../howtos/upload)
+* Step-by-step Text Based
 
+**Audience**: DJ with permission to schedule a specific show
+
+1. **Login** to LibreTime with your DJ username and password at
+[http://HOSTNAME/user](http://HOSTNAME/user) *Note: replace HOSTNAME with the
+web site address given to you by your station admin*
+1. Click the blue **Upload** button in the top left of the screen.
+1. Click the background where it says **Drop files here or click to browse your
+computer** or drag on and drop your music files from your desktop.
+1. If you clicked then browse your file system to find the music files you want
+to play and click them and then click **Open**
+1. The tracks should start to upload and when they are completed show up on the
+right under **Recent Uploads**. *Note: you will need to keep this window open
+while they are uploading*
+1. You can also upload short segments to schedule between your tracks recorded,
+for instance, with Audacity.
+1. LibreTime in general supports mp3, ogg, flac, wav and m4a file types. If
+a track isn’t supported the import will be marked as failed under
+**Import Status**
+1. Once you have uploaded all of the tracks you plan on airing you click on
+**Calendar**
+1. Find your upcoming show in the Calendar and click on it and click **Schedule
+Tracks** from the pop-up menu.
+1. Now click the tracks you want to add and click **+ Add to show** or
+click and drag the tracks to the right.
+1. You can also add station **Smart Blocks**, **Playlists** and **Webstreams**
+by clicking those sections at the top of the screen.
+1. When you are done you can re-order your tracks by clicking and dragging
+them.
+1. When your tracks are in order and there is no empty time remaning click
+**Ok** to finish.
+1. Your next show should now be scheduled to play during its scheduled time
+slot.

docs/manual/webstreams/index.md

@@ -3,9 +3,9 @@ Adding a web stream
 
 A web stream URL and metadata can be added to the LibreTime library, so that a remote stream can be searched for and scheduled to be *pulled* into a show. For example, at the top of the hour your station may pull a news report from journalists working in another studio. This is a different concept from **Master Source** and **Show Source** remote streams which are *pushed* into the LibreTime playout schedule.
 
-To add a web stream, click the **New** button on the right side of the Library page, and select **New Webstream** from the pop-up menu. Like a playlist, web streams in the Library can have a title and **Description**, which may help you find them in searches later.
+To add a web stream, click the **+ New** button on the left side of the Webstreams page. Like a playlist, web streams in the Library can have a title and **Description**, which may help you find them in searches later.
 
-![](static/Screenshot516-New_remote_webstream.png)
+![](webstream.jpg)
 
 The **Stream URL** setting must include the *port number* (such as 8000) and *mount point* (such as remote\_stream) of the remote stream, in addition to the streaming server name. A **Default Length** for the remote stream can also be set. If the stream is added at the end of a show which becomes overbooked as a result, it will be faded out when the show ends.
 

docs/uninstall.md

@@ -0,0 +1,14 @@
+Uninstall LibreTime
+-------------------
+
+Hopefully it wasn't something that we did, but if you need to uninstall LibreTime for
+any reason, cd to the directory of the installer and run `sudo ./uninstall` and follow the prompts.
+If allowed, the installer will **permanently** delete all databases and uploaded content relative to
+LibreTime.
+
+If it was something we did, please open an issue request on our Github page, located
+[here](https://github.com/LibreTime/libretime/issues).
+
+Until we meet again, best of luck.
+
+<3 The LibreTime team

mkdocs.yml

@@ -24,11 +24,11 @@ pages:
     - 'Install': install.md
     - 'Preparing the Server': manual/preparing-the-server/index.md
     - 'Setting the Server Time': manual/setting-the-server-time/index.md
+    - 'Host Configuration': manual/host-configuration/index.md
   - 'Using LibreTime':
     - 'On Air in 60 seconds!': 'manual/on-air-in-60-seconds/index.md'
     - 'Getting Started': manual/getting-started/index.md
     - 'Tutorials': manual/tutorials/index.md
-    - 'How-Tos': manual/howtos/index.md
   - 'The Main Menus':
     - 'Upload': manual/upload/index.md
     - 'Dashboard': manual/dashboard/index.md
@@ -58,7 +58,6 @@ pages:
     - 'Live Shows with Mixxx': manual/live-shows-with-mixxx/index.md
     - 'Smartphone Journalism': manual/smartphone-journalism/index.md
     - 'Icecast and SHOUTcast': manual/icecast-and-shoutcast/index.md
-    - 'Recording Shows': manual/recording-shows/index.md
   - 'Administration':
     - 'Backing Up the Server': manual/backing-up-the-server/index.md
     - 'Media Folders': manual/media-folders/index.md
@@ -71,7 +70,6 @@ pages:
     - 'Exporting the Schedule': manual/exporting-the-schedule/index.md
     - 'Interface Customization': manual/interface-customization/index.md
     - 'Interface Localization': manual/interface-localization/index.md
-    - 'Host Configuration': manual/host-configuration/index.md
     - 'LibreTime API Authentication': manual/airtime-api-authentication/index.md
     - 'Secure Login with SSL or TLS': manual/secure-login-with-ssl/index.md
     - 'Icecast Statistics with Piwik': manual/icecast-statistics-with-piwik/index.md
@@ -85,3 +83,4 @@ pages:
   - 'Appendix':
     - 'HD Audio Models': manual/hd-audio-models/index.md
     - 'About This Manual': manual/about-this-manual/index.md
+    - 'Uninstall LibreTime': uninstall.md