Merge pull request #608 from nikmartin/docfixes

docs: fix typos, airtime to libretime, getting started, import script

docs/install.md

@@ -9,7 +9,8 @@ Recommendations:
 - 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 instalation script by navigating into the folder containing the LibreTime codebase, and run it's install script from the command line:
+Once you have downloaded and extracted LibreTime, run the installation script by navigating into the 
+folder containing the LibreTime codebase, and run it's install script from the command line:
 
 ```
 sudo ./install
@@ -18,7 +19,9 @@ sudo ./install
 By default, the installer will install and configure all dependencies.
 
 ## Alternative OS installations
-Instalation in Debian 9 and other Linux distributions is possible, but multiple outstanding issues have yet to be resolved. Instalation on Ubuntu 14.04.5 LTS (Trusty Tahr) is also working, but deprecated due to the fact that this version will reach its official end of life in April 2019.
+Installation in Debian 9 and other Linux distributions is possible, but multiple outstanding issues have yet 
+to be resolved. Installation on Ubuntu 14.04.5 LTS (Trusty Tahr) is also working, but deprecated due to the 
+fact that this version will reach its official end of life in April 2019.
 
 Plans are in the works for `.deb` and `.rpm` packages, as well as Docker and AWS images.
 

docs/manual/getting-started/index.md

@@ -1,16 +1,17 @@
-If the server is only being used for Airtime and has a web browser installed, you can access the administration interface directly on that server by opening the address:
+If the server is only being used for LibreTime and has a web browser installed, you can access the administration interface directly on that server by opening the address:
 
     http://localhost/
 
-If you have set up Airtime so that it can be accessed from other computers, you would use a domain name instead. For example:
+If you have set up LibreTime so that it can be accessed from other computers, you would use a domain name instead. For example:
 
-    https://airtime.example.com/
+    https://libretime.example.com/
 
 You can log in for the first time with the user name *admin* and the password set during installation. Your browser should automatically focus on the **Username** field.
 
-![](static/Screenshot465-Airtime_login.png)
+![](static/Screenshot-Login.png)
 
-If you enter the password incorrectly three times, you will be presented with a reCAPTCHA challenge to prove that you are a human, and not a password-guessing robot. This feature helps protect your Airtime installation against brute force attacks.
+If you enter the password incorrectly three times, you will be presented with a reCAPTCHA challenge to prove that you are a human, and not a password-guessing robot. This feature helps protect your LibreTime installation against brute force 
+attacks.
 
 ![](static/Screenshot466-Recaptcha_login.png)
 
@@ -22,50 +23,48 @@ The **E-mail** address you enter must match the address stored in the database f
 
 ![](static/Screenshot468-Restore_password.png)
 
-Register Airtime
-----------------
-
-After you have logged in as *admin* for the first time, a pop-up window will ask if you wish to send technical support data about your server to Sourcefabric.
-
-![](static/Screenshot389-Yes_help_Airtime.png)
-
-These details can be viewed by clicking on the **Show me what I am sending** link, which expands a scrolling window. The data helps Sourcefabric engineers resolve any problems with your Airtime installation, as well as count the number of installations worldwide.
-
-<img src="static/Screenshot546-Remind_me_never_250.png" width="535" height="275" />
-
-Sourcefabric has a privacy policy regarding data collection, which you can read by clicking the link to <http://www.sourcefabric.org/en/about/policy/> further down. After checking the **Send support feedback** and **privacy policy** boxes, you can submit the data by clicking the **Yes, help Airtime** button.
-
-This window also offers the opportunity to **Promote my station on Sourcefabric.org** (on the page <http://www.sourcefabric.org/en/airtime/whosusing/>) by checking the box. Fill in the form which will appear with some details about your station. The contact details are only requested for verification purposes, and will not be made available to the public. Click the **Browse** button to select a **Station Logo** image from the file manager on your computer.
-
-![](static/Screenshot391-Promote_my_station.png)
 
 The Master Panel
 ----------------
 
-After the pop-up window is closed, you should now see the **Master Panel**, which is present at the top of every page of the Airtime interface. On the left hand side, the Master Panel displays the details of the **Previous** file played out, the current file playing (with an orange progress bar and time elapsed/time remaining), and the details of the **Next** file due to play. It also displays the name and scheduled time of the current show, with a blue progress bar.
+The **Master Panel** is present at the top of every page of the LibreTime interface. On the left hand side, the Master Panel displays the details of the **Previous** file played out, 
+the current file playing (with an orange progress bar and time elapsed/time remaining), and the details of the **Next** 
+file due to play. It also displays the name and scheduled time of the current show, with a blue progress bar.
 
-Beneath this side of the Master Panel is the main navigation menu, with sub-menus labelled **Now Playing**, **Add Media**, **Library**, **Calendar**, **System**, **History** and **Help**. We'll be looking at the contents of these menus in the following chapters of this book.
+![](static/Screenshot-MasterPanel.png)
 
-<img src="static/Screenshot542-Main_menus_250.png" width="595" height="145" />
+Beneath this side of the Master Panel is the main navigation menu. We'll be looking at the contents of these menus in the 
+following chapters of this book.
 
-On the right hand side of the Master Panel are the switches for the **Source Streams**, which enable you to switch from scheduled play to remote live sources, and back. (See the chapter *Stream settings* for details of this feature). The **On Air** indicator turns from dark grey to red whenever audio is being played out. Underneath this indicator is a **Listen** button, which opens a pop-up player that can be used to audition the available playout streams.
+![](static/Screenshot-MainMenu.png)
 
-There is also a clock indicating the **Station time** and time zone. Beneath the clock and just to the left, the name of the user currently logged in is displayed, and there is the link for you to **Logout**. 
+On the right hand side of the Master Panel are the switches for the **Source Streams**, which enable you to switch from 
+scheduled play to remote live sources, and back. (See the chapter *Stream settings* for details of this feature). The 
+**On Air** indicator turns from dark grey to red whenever audio is being played out. Underneath this indicator is a
+**Listen** button, which opens a pop-up player that can be used to audition the available playout streams.
+
+There is also a clock indicating the **Station time** and time zone. Beneath the clock and just to the left, the name of 
+the user currently logged in is displayed, and there is the link for you to **Logout**. 
 
 ![](static/Screenshot469-On_Air_light.png)
 
-Clicking the username link opens a page in which you can update your Airtime password, contact details, language and time zone preferences. Click the **Save** button once you have made the changes that you require.
+Clicking the username link opens a page in which you can update your LibreTime password, contact details, language and time
+zone preferences. Click the **Save** button once you have made the changes that you require.
 
 ![](static/Screenshot470-User_settings.png)
 
-On the right of the Logout link, clicking the green check mark opens a pop-up window with information about the version of Airtime installed. If your Airtime installation is not the latest version available, the green check mark changes to a green upgrade arrow. Should your Airtime installation get too far out of date, this arrow will change to a red exclamation mark.
+On the right of the Logout link, clicking the green check mark opens a pop-up window with information about the version of 
+LibreTime installed. If your LibreTime installation is not the latest version available, the green check mark changes to a 
+green upgrade arrow. Should your LibreTime installation get too far out of date, this arrow will change to a red exclamation
+mark.
 
 <img src="static/Screenshot543-Running_latest_version_250.png" width="595" height="230" />
 
 Checking an Icecast server
 --------------------------
 
-If you have installed an Icecast streaming media server, you can check that Icecast is running by opening its default server port of 8000 in your web browser. For example, on the server itself, you can use:
+If you have installed an Icecast streaming media server, you can check that Icecast is running by opening its default server
+port of 8000 in your web browser. For example, on the server itself, you can use:
 
     http://localhost:8000
 
@@ -73,6 +72,7 @@ or from another machine, using the domain name of the Icecast server:
 
     http://streaming.example.com:8000
 
-You should see the Icecast status page, with details of any connections that your Airtime server has made to this Icecast server. If you have only just installed Airtime, there may not be any media playing out yet.
+You should see the Icecast status page, with details of any connections that your LibreTime server has made to this Icecast 
+server. If you have only just installed LibreTime, there may not be any media playing out yet.
 
 ![](static/Screenshot293-Icecast_status_page.png)

docs/manual/using-the-airtime-import-script/index.md

@@ -1,75 +1,9 @@
-[Sourcefabric Manuals](http://sourcefabric.booktype.pro/)
-
--   [Sign In / Create Account](http://sourcefabric.booktype.pro/accounts/signin/?redirect=/airtime-25-for-broadcasters/using-the-airtime-import-script/)
-
- English |  <a href="index.html#" class="langes">Español</a> |  <a href="index.html#" class="langfr">Français</a> |  <a href="index.html#" class="langit">Italiano</a> |  <a href="index.html#" class="langpt">Português</a> |  <a href="index.html#" class="langru">Русский</a> |  <a href="index.html#" class="langsq">Shqip</a>
-
--   [Books](http://sourcefabric.booktype.pro/list-books/)
--   [Groups](http://sourcefabric.booktype.pro/list-groups/)
--   [People](http://sourcefabric.booktype.pro/list-people/)
-
-Airtime 2.5 for Broadcasters
-----------------------------
-
--   **Introduction**
--   [What is Airtime?](../index.html)
--   [Rights and royalties](../rights-and-royalties/index.html)
--   **Using Airtime**
--   [On air in 60 seconds!](../on-air-in-60-seconds/index.html)
--   [Getting started](../getting-started/index.html)
--   [Smartphone journalism](../smartphone-journalism/index.html)
--   **The System menu**
--   [Preferences](../preferences/index.html)
--   [Users](../users/index.html)
--   [Media folders](../media-folders/index.html)
--   [Stream settings](../stream-settings/index.html)
--   [Support feedback](../support-feedback/index.html)
--   [Status](../status/index.html)
--   [Listener stats](../listener-stats/index.html)
--   **The main menus**
--   [Now playing](../now-playing/index.html)
--   [Add media](../add-media/index.html)
--   [Library](../library/index.html)
--   [Calendar](../calendar/index.html)
--   [History](../playout-history/index.html)
--   [Listen](../listen/index.html)
--   [Help](../help/index.html)
--   **Airtime in the studio**
--   [Recording shows](../recording-shows/index.html)
--   [Live shows with Mixxx](../live-shows-with-mixxx/index.html)
--   [Icecast and SHOUTcast](../icecast-and-shoutcast/index.html)
--   **Installation**
--   [Preparing the server](../preparing-the-server/index.html)
--   [Easy setup](../easy-setup/index.html)
--   [Installation](../install)
--   [Setting the server time](../setting-the-server-time/index.html)
--   **Administration**
--   [Preparing media for ingest](../preparing-media-for-ingest/index.html)
--   [Using the airtime-import script](index.html)
--   [The airtime-log command](../the-airtime-log-command/index.html)
--   [Backing up the server](../backing-up-the-server/index.html)
--   [Upgrading](../upgrading/index.html)
--   [Troubleshooting](../troubleshooting/index.html)
--   [Using Monit](../using-monit/index.html)
--   **Advanced configuration**
--   [Automated file import](../automated-file-import/index.html)
--   [Icecast handover](../icecast-handover/index.html)
--   [Promoting your station](../promoting-your-station/index.html)
--   [Stream player for your website](../stream-player-for-your-website/index.html)
--   [Exporting the schedule](../exporting-the-schedule/index.html)
--   [Interface customization](../interface-customization/index.html)
--   [Interface localization and Git](../interface-localization/index.html)
--   [Host configuration](../host-configuration/index.html)
--   [Airtime API authentication](../airtime-api-authentication/index.html)
--   [Secure login with SSL or TLS](../secure-login-with-ssl/index.html)
--   [Icecast statistics with Piwik](../icecast-statistics-with-piwik/index.html)
--   **Appendix**
--   [HD Audio Models](../hd-audio-models/index.html)
--   [About this manual](../about-this-manual/index.html)
-
 Using the import script
 =======================
 
+###NOTE: This page has issues, as the import script is not currently functional
+
+
 If you have a large number of files in your media library, importing these files one at a time into a broadcast automation system would be time-consuming and tedious. That's why Airtime includes a script that can import an entire directory of files in one go.
 
 Copying versus watching