diff --git a/docs/manual/airtime-api-authentication/index.md b/docs/manual/airtime-api-authentication/index.md
index 30259bfe9..9879db7c6 100644
--- a/docs/manual/airtime-api-authentication/index.md
+++ b/docs/manual/airtime-api-authentication/index.md
@@ -1,6 +1,6 @@
-The Libretime API enables many types of information about the broadcast schedule and configuration to be retrieved from the Libretime server. Other than the live-info and week-info data fetched by website widgets (see the chapter *Exporting the schedule*), all API requests must be authenticated using the secret API key stored in the file */etc/airtime/api\_client.cfg* on the Libretime server. This key is autogenerated during Libretime installation and should be unique for each server.
+The LibreTime API enables many types of information about the broadcast schedule and configuration to be retrieved from the LibreTime server. Other than the live-info and week-info data fetched by website widgets (see the chapter *Exporting the schedule*), all API requests must be authenticated using the secret API key stored in the file */etc/airtime/api\_client.cfg* on the LibreTime server. This key is autogenerated during LibreTime installation and should be unique for each server.
-If you intend to use the Libretime API across a public network, for security reasons it is highly recommended that all API requests are sent over encrypted https: and that the web server is configured to accept requests to the api/ directory from specific host names or IP addresses only.
+If you intend to use the LibreTime API across a public network, for security reasons it is highly recommended that all API requests are sent over encrypted https: and that the web server is configured to accept requests to the api/ directory from specific host names or IP addresses only.
The format of API requests is:
@@ -9,11 +9,11 @@ The format of API requests is:
where api-action is the type of request and XXXXXX is the secret API key. Available actions include:
- on-air-light - return true if the station is on air
-- status - get the status of Libretime components and resource usage
-- version - returns the version of Libretime installed
+- status - get the status of LibreTime components and resource usage
+- version - returns the version of LibreTime installed
- get-files-without-silan-value - list files for which silence detection has not yet been performed
-- get-stream-setting - gets the settings of Libretime output streams
-- get-stream-parameters - gets the parameters of Libretime output streams
+- get-stream-setting - gets the settings of LibreTime output streams
+- get-stream-parameters - gets the parameters of LibreTime output streams
For example, using the action *get-stream-setting* returns the following output for the first configured stream:
@@ -43,7 +43,7 @@ For example, using a request such as:
http://libretime.example.com/api/list-all-files/format/json/api_key/XXXXXX/dir_id/1/
-returns the full path to each media file in the Libretime storage directory:
+returns the full path to each media file in the LibreTime storage directory:
{"files":[
"imported\/1\/Mark Ronson feat. Saigon\/Here Comes the Fuzz\/7-Diduntdidunt-unknown.flac",
diff --git a/docs/manual/backing-up-the-server/index.md b/docs/manual/backing-up-the-server/index.md
index 1391c1a6f..9f56d398a 100644
--- a/docs/manual/backing-up-the-server/index.md
+++ b/docs/manual/backing-up-the-server/index.md
@@ -1,5 +1,5 @@
The following shell commands can be used for database backup and restore on a
-running *PostgreSQL* server in an Libretime system.
+running *PostgreSQL* server in an LibreTime system.
You can dump the entire database to a zipped file with the combination of the
**pg\_dumpall** command and **gzip**. The **pg\_dumpall** command is executed
@@ -13,7 +13,7 @@ sudo -u postgres pg_dumpall | gzip -c > libretime-backup.gz
This command can be automated to run on a regular basis using the standard
**cron** tool on your server.
-When restoring a production database on a cleanly installed Libretime system, it
+When restoring a production database on a cleanly installed LibreTime system, it
may be necessary to drop the empty database that was created during the new
installation, by using the **dropdb** command. Again, this command is executed
with **sudo** as the user *postgres*:
@@ -23,7 +23,7 @@ sudo -u postgres dropdb airtime
```
This **dropdb** command above is necessary to avoid 'already exists' errors on
-table creation when overwriting an empty Libretime database in the next step.
+table creation when overwriting an empty LibreTime database in the next step.
These errors might prevent some data from being restored, such as user account
data.
@@ -35,19 +35,19 @@ gunzip libretime-backup.gz
sudo -u postgres psql -f libretime-backup
```
-You should now be able to log in to the Libretime web interface in the usual way.
+You should now be able to log in to the LibreTime web interface in the usual way.
For safety reasons, your regular database backups should be kept in a directory
which is backed up by your storage backup tool of choice; for example, the
*/srv/airtime/database\_backups* directory. This should ensure that a storage
-restore can be made along with a matching and complete version of the Libretime
+restore can be made along with a matching and complete version of the LibreTime
database from the day that the storage backup was made.
Storage backup
--------------
-Backing up the Libretime database with **pg\_dumpall** will not back up the
-Libretime media storage server, which is likely to need a great deal more backup
+Backing up the LibreTime database with **pg\_dumpall** will not back up the
+LibreTime media storage server, which is likely to need a great deal more backup
space. Creating a compressed file from hundreds of gigabytes of storage server
contents is likely to take a very long time, and may have little benefit for the
amount of CPU power used, if the media files are already stored in a highly
@@ -55,8 +55,8 @@ compressed format. It is also impractical to copy very large backup files across
the network on a daily basis.
Instead, it is preferable to use an incremental backup technique to synchronize
-the production Libretime server storage with a backup server each day or night. If
-the backup server also contains an Libretime installation, it should be possible
+the production LibreTime server storage with a backup server each day or night. If
+the backup server also contains an LibreTime installation, it should be possible
to switch playout to this second machine relatively quickly, in case of a
hardware failure or other emergency on the production server.
diff --git a/docs/manual/dashboard/index.md b/docs/manual/dashboard/index.md
index 96b8d75f9..44bd5787d 100644
--- a/docs/manual/dashboard/index.md
+++ b/docs/manual/dashboard/index.md
@@ -10,7 +10,7 @@ The **Scheduled Shows** page provides a view of the content your station is will
playout, 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 installed Libretime, there might not be any content shown
+If you've only just installed LibreTime, 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.
@@ -74,9 +74,9 @@ be undone.
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 Libretime's library (main storage or watched folders)
+were removed from LibreTime's library (main storage or watched folders)
subsequently. Items which are included in forthcoming shows cannot be removed
-from the Library via the Libretime interface.
+from the Library via the LibreTime interface.
Adding content to a running show
--------------------------------
@@ -87,7 +87,7 @@ 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, in which the Libretime server's soundcard output is mixed with
+assist technique, in which the LibreTime 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.
@@ -101,7 +101,7 @@ 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 Libretime's library. Only *admin* users have permission to delete all
+from LibreTime's library. Only *admin* users have permission to delete all
items.
To insert checkbox selected items at a specific time in the show schedule, click
diff --git a/docs/manual/exporting-the-schedule/index.md b/docs/manual/exporting-the-schedule/index.md
index 448bf38aa..056579049 100644
--- a/docs/manual/exporting-the-schedule/index.md
+++ b/docs/manual/exporting-the-schedule/index.md
@@ -1,10 +1,10 @@
-Libretime has a feature which enables your station's show and schedule information to be displayed on remote websites. This feature is included in Libretime because you would not usually invite the general public to access your Libretime server directly. If you had very large numbers of people requesting data from the Libretime server at once, the burst of network traffic might overload the server, potentially disrupting your broadcasts. If carried out maliciously, this network overload is known as a *denial of service attack*.
+LibreTime has a feature which enables your station's show and schedule information to be displayed on remote websites. This feature is included in LibreTime because you would not usually invite the general public to access your LibreTime server directly. If you had very large numbers of people requesting data from the LibreTime server at once, the burst of network traffic might overload the server, potentially disrupting your broadcasts. If carried out maliciously, this network overload is known as a *denial of service attack*.
-Instead, your public-facing web server can retrieve the schedule information from the Libretime API. This information can then be displayed on your broadcast station or affiliate websites by a content management system, such as Sourcefabric's **Newscoop** (). It can be presented using Javascript widgets and styled with CSS, in any format that you require. The **Broadcaster** theme for Newscoop () integrates these widgets with ready-to-use styles.
+Instead, your public-facing web server can retrieve the schedule information from the LibreTime API. This information can then be displayed on your broadcast station or affiliate websites by a content management system, such as Sourcefabric's **Newscoop** (). It can be presented using Javascript widgets and styled with CSS, in any format that you require. The **Broadcaster** theme for Newscoop () integrates these widgets with ready-to-use styles.
-There are two kinds of information that can be retrieved remotely from the Libretime API without authentication; the metadata for the current show plus the following show (live-info), or the schedule for the current week and the week ahead (week-info). The week-info metadata includes show names, times, and individual show URLs on your public website. That way, the audience for your station can click through from the schedule information to find out more about a particular show, or download a previous show recording that you might have made available.
+There are two kinds of information that can be retrieved remotely from the LibreTime API without authentication; the metadata for the current show plus the following show (live-info), or the schedule for the current week and the week ahead (week-info). The week-info metadata includes show names, times, and individual show URLs on your public website. That way, the audience for your station can click through from the schedule information to find out more about a particular show, or download a previous show recording that you might have made available.
-If your Libretime server was accessible at https://libretime.example.com the live show information could be retrieved by your web server using this URL:
+If your LibreTime server was accessible at https://libretime.example.com the live show information could be retrieved by your web server using this URL:
https://libretime.example.com/api/live-info/?callback
@@ -126,22 +126,22 @@ In this case, the metadata returned would be in a different format from the abov
"sunday":[],
"AIRTIME_API_VERSION":"1.1"})
-If you see the message *You are not allowed to access this resource* when attempting to display schedule information in your web browser, log in to the Libretime administration interface, click *System* in the main menu, then *Preferences*. Set **Allow Remote Websites To Access "Schedule" Info?** to **Enabled**, click the **Save** button, then refresh the browser window opened on the schedule export URL. If you do not wish to make schedule information available to the public, set this option to **Disabled** instead.
+If you see the message *You are not allowed to access this resource* when attempting to display schedule information in your web browser, log in to the LibreTime administration interface, click *System* in the main menu, then *Preferences*. Set **Allow Remote Websites To Access "Schedule" Info?** to **Enabled**, click the **Save** button, then refresh the browser window opened on the schedule export URL. If you do not wish to make schedule information available to the public, set this option to **Disabled** instead.
Caching schedule information
----------------------------
-If the Libretime server is behind a firewall, or you want to protect the Libretime server from large numbers of schedule requests, you may wish to cache the schedule information on a public-facing or intermediate server. You can then create a firewall rule that only allows the schedule server to connect to the Libretime server, in addition to any remote users of the Libretime web interface.
+If the LibreTime server is behind a firewall, or you want to protect the LibreTime server from large numbers of schedule requests, you may wish to cache the schedule information on a public-facing or intermediate server. You can then create a firewall rule that only allows the schedule server to connect to the LibreTime server, in addition to any remote users of the LibreTime web interface.
Your system administrator can set up schedule caching on a standard Apache and PHP enabled web server with the *curl* program installed, using the following steps:
-1. Create a shell script on the schedule server (schedule.example.com) that polls the remote Libretime server (libretime.example.com), and writes the metadata returned into a pair of local temporary files:
+1. Create a shell script on the schedule server (schedule.example.com) that polls the remote LibreTime server (libretime.example.com), and writes the metadata returned into a pair of local temporary files:
sudo nano /usr/local/bin/libretime-schedule.sh
-The content of this file should be like the following script, replacing libretime.example.com with the name of your Libretime server:
+The content of this file should be like the following script, replacing libretime.example.com with the name of your LibreTime server:
#!/bin/sh
@@ -220,12 +220,12 @@ containing the line:
* * * * * www-data /usr/local/bin/libretime-schedule.sh
-The schedule server will now be serving the same show information as the Libretime server, with a cache lifetime of one minute. You can adjust the cache lifetime by altering the frequency of the cron job that polls the Libretime server.
+The schedule server will now be serving the same show information as the LibreTime server, with a cache lifetime of one minute. You can adjust the cache lifetime by altering the frequency of the cron job that polls the LibreTime server.
Pushing schedule information via FTP or SSH
-------------------------------------------
-If there is no inbound access to the Libretime server at all, an FTP script can be used to push cached schedule data from Libretime to an external web server. The standard ftp command should be available on the Libretime server and the external web server should have a suitably restricted FTP account set up. After following steps 1 and 2 above to export schedule data to a pair of temporary files on the Libretime server, create a new script on the Libretime server to automatically make the upload:
+If there is no inbound access to the LibreTime server at all, an FTP script can be used to push cached schedule data from LibreTime to an external web server. The standard ftp command should be available on the LibreTime server and the external web server should have a suitably restricted FTP account set up. After following steps 1 and 2 above to export schedule data to a pair of temporary files on the LibreTime server, create a new script on the LibreTime server to automatically make the upload:
sudo nano /usr/local/bin/upload-schedule-data.sh
diff --git a/docs/manual/general/index.md b/docs/manual/general/index.md
index 874e8bdcb..d30c706af 100644
--- a/docs/manual/general/index.md
+++ b/docs/manual/general/index.md
@@ -4,14 +4,14 @@
On the **Settings** menu, click **General** to set your **Station Name**. This
text is shown in your web browser's title bar when your station staff are logged
-into Libretime, and optionally in stream metadata. You can also set a **Station
+into LibreTime, and optionally in stream metadata. You can also set a **Station
Description** and **Station Logo** here.
The **Default Interface Language** drop-down menu sets the default localization
-for your Libretime instance, and the **Station Timezone** drop-down menu can be
-used to display local time at your station. Libretime stores show times
+for your LibreTime instance, and the **Station Timezone** drop-down menu can be
+used to display local time at your station. LibreTime stores show times
internally in UTC format (similar to *Greenwich Mean Time*), but displays local
time for the convenience of your station staff. You can also set the day of the
week that you wish to start your station's weekly schedule on, which defaults
@@ -43,7 +43,7 @@ default.
-You can enable live, read-only access to the Libretime schedule calendar for
+You can enable live, read-only access to the LibreTime schedule calendar for
your station's public website with the **Public LibreTime API** option, if you
wish. (There is more about this feature in the
[*Exporting the schedule*](../exporting-the-schedule/index.md) chapter, in the
@@ -70,7 +70,7 @@ form.
-Individual Libretime users can choose another interface localization when they
+Individual LibreTime users can choose another interface localization when they
log in, or set personal preferences for localization and time zone by clicking
their username on the right side of the menu bar.
diff --git a/docs/manual/hd-audio-models/index.md b/docs/manual/hd-audio-models/index.md
index b7d535e54..7bc58eee8 100644
--- a/docs/manual/hd-audio-models/index.md
+++ b/docs/manual/hd-audio-models/index.md
@@ -1,4 +1,4 @@
-This listing is provided to help ensure that the correct model parameter is passed to the ALSA kernel module for an Intel HDA soundcard, if one is fitted to your Libretime server. See the chapter *Preparing the server* in this book for more details.
+This listing is provided to help ensure that the correct model parameter is passed to the ALSA kernel module for an Intel HDA soundcard, if one is fitted to your LibreTime server. See the chapter *Preparing the server* in this book for more details.
Model name Description
---------- -----------
diff --git a/docs/manual/help/index.md b/docs/manual/help/index.md
index d4003de6d..1fc59a978 100644
--- a/docs/manual/help/index.md
+++ b/docs/manual/help/index.md
@@ -1,10 +1,10 @@
-The first entry on Libretime's **Help** menu offers a **Getting Started** guide
+The first entry on LibreTime's **Help** menu offers a **Getting Started** guide
for new users. Further down, there is also a link to the online version of this
**User Manual**.
-You can visit the Libretime online support forum at
+You can visit the LibreTime online support forum at
to ask for help from the community
regarding your LibreTime setup.
@@ -12,11 +12,11 @@ regarding your LibreTime setup.
Bug reporting
-------------
-Libretime needs your input to improve. If you think you've found a bug, please
+LibreTime needs your input to improve. If you think you've found a bug, please
visit . Create a bug report by selecting
-**Issues**, then **New Issue**. That way, the Libretime team can keep track of
+**Issues**, then **New Issue**. That way, the LibreTime team can keep track of
your problem and notify you when it has been fixed. You can also suggest
-improvements and new features for Libretime on that site.
+improvements and new features for LibreTime on that site.
diff --git a/docs/manual/history/index.md b/docs/manual/history/index.md
index 962c33b5a..a66096f9a 100644
--- a/docs/manual/history/index.md
+++ b/docs/manual/history/index.md
@@ -3,7 +3,7 @@ History
On the History menu, the **Playout History** page enables you to view a list of files played within a specific date and time range. This page is designed to help your station prepare reports for music royalty collection societies and regulatory agencies.
-Search results can be copied to the clipboard using the **Copy** button, exported as data in **CSV** format (comma separated values), exported as a document in **PDF** format, or displayed in a printer-friendly format using the **Print** button. (Your web browser must have an Adobe Flash plugin installed for these buttons to appear). Press the **Esc** key to return to the Libretime interface once the print job is complete.
+Search results can be copied to the clipboard using the **Copy** button, exported as data in **CSV** format (comma separated values), exported as a document in **PDF** format, or displayed in a printer-friendly format using the **Print** button. (Your web browser must have an Adobe Flash plugin installed for these buttons to appear). Press the **Esc** key to return to the LibreTime interface once the print job is complete.
This page has three tabs: **Log Sheet**, **File Summary** and **Show Summary**. On any of these tabs, you can select a date and time range by clicking the calendar and clock icons in the upper left corner of the page. Then click the search button, which has a magnifying glass icon, to the right. A list of files played during that date and time range will appear further down the page.
@@ -22,7 +22,7 @@ On the **Show Summary** tab, click the name of a show within the search range to
Manual logging
--------------
-If your station features playout from analogue sources such as turntables or microphones, there is no automatic metadata for Libretime to collect from these inputs. To ensure that the playout history is complete, you can add log entries manually by clicking the **+ Create Entry** button. This action opens a pop-up window with default fields of Start Time, End Time, Title and Creator. Click the **Find** button to automatically fill the **Choose Show Instance** menu with the names of shows that took place within the specified time range. Then click the **Save** button to enter the new item into the playout history.
+If your station features playout from analogue sources such as turntables or microphones, there is no automatic metadata for LibreTime to collect from these inputs. To ensure that the playout history is complete, you can add log entries manually by clicking the **+ Create Entry** button. This action opens a pop-up window with default fields of Start Time, End Time, Title and Creator. Click the **Find** button to automatically fill the **Choose Show Instance** menu with the names of shows that took place within the specified time range. Then click the **Save** button to enter the new item into the playout history.
diff --git a/docs/manual/host-configuration/index.md b/docs/manual/host-configuration/index.md
index ddef4b94e..c088cb20d 100644
--- a/docs/manual/host-configuration/index.md
+++ b/docs/manual/host-configuration/index.md
@@ -1,4 +1,4 @@
-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.
+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
---------------------------
@@ -7,7 +7,7 @@ Optionally, you may wish to edit the file */etc/airtime/airtime.conf* to set the
sudo nano /etc/airtime/airtime.conf
-You can also set options for RabbitMQ messaging, the Libretime server and SoundCloud uploads in this file, although you should not normally need to adjust the defaults unless you are running a large Libretime system distributed across multiple servers. To run the Libretime server in demo mode, which changes the greeting on the login page and prevents user accounts from being created or modified, set the value of *demo* to 1.
+You can also set options for RabbitMQ messaging, the LibreTime server and SoundCloud uploads in this file, although you should not normally need to adjust the defaults unless you are running a large LibreTime system distributed across multiple servers. To run the LibreTime server in demo mode, which changes the greeting on the login page and prevents user accounts from being created or modified, set the value of *demo* to 1.
[database]
host = localhost
@@ -46,9 +46,9 @@ Save and close the file with **Ctrl+O** and **Ctrl+X**. If you have changed the
sudo airtime-update-db-settings
-to make sure all of Libretime's database configuration files are updated. This command should output the following text to the server console:
+to make sure all of LibreTime's database configuration files are updated. This command should output the following text to the server console:
- Libretime root folder found at /usr/share/airtime
+ LibreTime root folder found at /usr/share/airtime
Updating /usr/share/airtime/application/configs/application.ini
Updating /usr/share/airtime/build/build.properties
Updating /usr/share/airtime/build/runtime-conf.xml
@@ -71,7 +71,7 @@ If you have changed the *base\_url*, *base\_port* or *base\_dir* setting in */et
Playout and recorder settings
-----------------------------
-Settings for pypo, the playout and recording engine used by Libretime, are found in the file */etc/airtime/airtime.conf*. After making changes to this file, you will have to issue the command:
+Settings for pypo, the playout and recording engine used by LibreTime, are found in the file */etc/airtime/airtime.conf*. After making changes to this file, you will have to issue the command:
sudo /etc/init.d/airtime-playout restart
diff --git a/docs/manual/icecast-and-shoutcast/index.md b/docs/manual/icecast-and-shoutcast/index.md
index 939b1302f..1152e8190 100644
--- a/docs/manual/icecast-and-shoutcast/index.md
+++ b/docs/manual/icecast-and-shoutcast/index.md
@@ -1,12 +1,12 @@
-Libretime supports direct connection to two popular streaming media servers, the open source **Icecast** () and the proprietary **SHOUTcast** (). Apart from the software license, the main difference between these two servers is that Icecast supports simultaneous MP3, AAC, Ogg Vorbis or Ogg Opus streaming from Libretime, whereas SHOUTcast supports MP3 and AAC streams but not Ogg Vorbis or Opus. The royalty-free Ogg Vorbis format has the advantage of better sound quality than MP3 at lower bitrates, which has a direct impact on the amount of bandwidth that your station will require to serve the same number of listeners. Ogg Opus also benefits from good sound quality at low bitrates, with the added advantage of lower latency than other streaming formats. Opus is now an IETF standard () and requires Icecast 2.4 or later to be installed on the streaming server.
+LibreTime supports direct connection to two popular streaming media servers, the open source **Icecast** () and the proprietary **SHOUTcast** (). Apart from the software license, the main difference between these two servers is that Icecast supports simultaneous MP3, AAC, Ogg Vorbis or Ogg Opus streaming from LibreTime, whereas SHOUTcast supports MP3 and AAC streams but not Ogg Vorbis or Opus. The royalty-free Ogg Vorbis format has the advantage of better sound quality than MP3 at lower bitrates, which has a direct impact on the amount of bandwidth that your station will require to serve the same number of listeners. Ogg Opus also benefits from good sound quality at low bitrates, with the added advantage of lower latency than other streaming formats. Opus is now an IETF standard () and requires Icecast 2.4 or later to be installed on the streaming server.
Ogg Vorbis playback is supported in **Mozilla Firefox**, **Google Chrome** and **Opera** browsers, via **jPlayer** (), and is also supported in several popular media players, including VideoLAN Client, also known as VLC (). (See the chapter *Stream player for your website* on how to deliver **jPlayer** to your audience). Ogg Opus is relatively new and is supported natively in the very latest browsers, such as Mozilla Firefox 25.0, and media players including VLC 2.0.4 or later.
Streaming MP3 below a bitrate of 128kbps is not recommended for music, because of a perceptible loss of high audio frequencies in the broadcast playout. A 96kbps or 64kbps MP3 stream may be acceptable for voice broadcasts if there is a requirement for compatibility with legacy hardware playback devices which do not support Ogg Vorbis or Opus streams.
-Because Libretime supports simultaneous streaming in multiple formats, it is possible to offer one or more streams via your website, and another independent stream for direct connection from hardware players. You can test whether Ogg streams sound better at low bitrates for yourself, by using the **LISTEN** button in Libretime's **Master Panel** to switch between streaming formats.
+Because LibreTime supports simultaneous streaming in multiple formats, it is possible to offer one or more streams via your website, and another independent stream for direct connection from hardware players. You can test whether Ogg streams sound better at low bitrates for yourself, by using the **LISTEN** button in LibreTime's **Master Panel** to switch between streaming formats.
-Conversely, you may have a music station which wants to stream at 160kbps or 192kbps to offer a quality advantage over stations streaming at 128kbps or less. Since Ogg, AAC and MP3 formats use lossy compression, listeners will only hear the benefit of higher streaming bitrates if the media files in the Libretime storage server are encoded at an equivalent bitrate, or higher.
+Conversely, you may have a music station which wants to stream at 160kbps or 192kbps to offer a quality advantage over stations streaming at 128kbps or less. Since Ogg, AAC and MP3 formats use lossy compression, listeners will only hear the benefit of higher streaming bitrates if the media files in the LibreTime storage server are encoded at an equivalent bitrate, or higher.
UTF-8 metadata in Icecast MP3 streams
-------------------------------------
diff --git a/docs/manual/icecast-handover/index.md b/docs/manual/icecast-handover/index.md
index 018e927a1..7a30e249f 100644
--- a/docs/manual/icecast-handover/index.md
+++ b/docs/manual/icecast-handover/index.md
@@ -1,14 +1,14 @@
-In a typical radio station configuration, the live output from the broadcast studio and the scheduled output from Libretime are mixed together before being sent further along the broadcast chain, to a transmitter or streaming media server on the Internet. (This may not be the case if your Libretime server is remote from the studio, and you are using the **Show Source Mount Point** or **Master Source Mount Point** to mix live and scheduled content. See the *Stream Settings* chapter for details).
+In a typical radio station configuration, the live output from the broadcast studio and the scheduled output from LibreTime are mixed together before being sent further along the broadcast chain, to a transmitter or streaming media server on the Internet. (This may not be the case if your LibreTime server is remote from the studio, and you are using the **Show Source Mount Point** or **Master Source Mount Point** to mix live and scheduled content. See the *Stream Settings* chapter for details).
If your **Icecast** server is hosted in a remote data centre, you may not have the option to handover the streaming media source manually, because you have no physical access to connect a broadcast mixer to the server. Disconnecting the stream and beginning another is less than ideal, because the audience's media players will also be disconnected when that happens.
-The **Icecast** server has a *fallback-mount* feature which can be used to move clients (media players used by listeners or viewers) from one source to another, as new sources become available. This makes it possible to handover from Libretime output to a show from another source, and handover to Libretime again once the other show has ended.
+The **Icecast** server has a *fallback-mount* feature which can be used to move clients (media players used by listeners or viewers) from one source to another, as new sources become available. This makes it possible to handover from LibreTime output to a show from another source, and handover to LibreTime again once the other show has ended.
To enable fallback mounts, edit the main Icecast configuration file to define the mount points you will use, and the relationship between them.
sudo nano /etc/icecast2/icecast.xml
-The example ** section provided in the *icecast.xml* file is commented out by default. Before or after the commented section, add three mount point definitions. The default mount point used by Libretime is */airtime\_128* which is shown in the */etc/airtime/liquidsoap.cfg* file. You must also define a mount point for the live source (called */live.ogg* in this example) and a mount point for the public to connect to (called */stream.ogg* in this example).
+The example ** section provided in the *icecast.xml* file is commented out by default. Before or after the commented section, add three mount point definitions. The default mount point used by LibreTime is */airtime\_128* which is shown in the */etc/airtime/liquidsoap.cfg* file. You must also define a mount point for the live source (called */live.ogg* in this example) and a mount point for the public to connect to (called */stream.ogg* in this example).
/airtime_128
@@ -29,7 +29,7 @@ The example ** section provided in the *icecast.xml* file is commented ou
0
-These mount point definitions mean that a client connecting to a URL such as *http://icecast.example.com:8000/stream.ogg* will first fall back to the */live.ogg* mount point if it is available. If not, the client will fall back in turn to the */airtime\_128* mount point for Libretime playout.
+These mount point definitions mean that a client connecting to a URL such as *http://icecast.example.com:8000/stream.ogg* will first fall back to the */live.ogg* mount point if it is available. If not, the client will fall back in turn to the */airtime\_128* mount point for LibreTime playout.
Setting the value of ** to 1 (enabled) means that when the */live.ogg* mount point becomes available again, the client will be re-connected to it. If you wish to hide the */airtime\_128* and */live.ogg* mount points from the public Icecast web interface, set the value of ** in each of these definitions to 1.
diff --git a/docs/manual/icecast-statistics-with-piwik/index.md b/docs/manual/icecast-statistics-with-piwik/index.md
index 5606aef35..4855e161a 100644
--- a/docs/manual/icecast-statistics-with-piwik/index.md
+++ b/docs/manual/icecast-statistics-with-piwik/index.md
@@ -1,4 +1,4 @@
-Piwik () is an open source web analytics platform which supports Icecast's log format, in Piwik version 2.0 or later. For your convenience, packages of Piwik for Debian and Ubuntu are provided in the repository. If you have already configured your Libretime server for this repository, you can install the **piwik** package and its dependencies with the command:
+Piwik () is an open source web analytics platform which supports Icecast's log format, in Piwik version 2.0 or later. For your convenience, packages of Piwik for Debian and Ubuntu are provided in the repository. If you have already configured your LibreTime server for this repository, you can install the **piwik** package and its dependencies with the command:
sudo apt-get install piwik php5-geoip php5-cli mysql-server
diff --git a/docs/manual/interface-customization/index.md b/docs/manual/interface-customization/index.md
index 9c2ff9b10..0530b0661 100644
--- a/docs/manual/interface-customization/index.md
+++ b/docs/manual/interface-customization/index.md
@@ -1,4 +1,4 @@
-The Libretime administration interface, as a web application, is fully customizable using the same methods that you might use to modify a website. For instance, you may wish to increase certain font sizes or change the colours in the Libretime interface to better suit staff users with impaired vision. To do this, open one of the CSS files in the */public/css/* directory under the Libretime *DocumentRoot* directory in an editor such as **nano**:
+The LibreTime administration interface, as a web application, is fully customizable using the same methods that you might use to modify a website. For instance, you may wish to increase certain font sizes or change the colours in the LibreTime interface to better suit staff users with impaired vision. To do this, open one of the CSS files in the */public/css/* directory under the LibreTime *DocumentRoot* directory in an editor such as **nano**:
sudo nano /usr/share/airtime/public/css/styles.css
@@ -14,7 +14,7 @@ To change the background colour of the administration interface from dark gray t
Save the file with **Ctrl+O**, then refresh your browser to see the change to the interface background colour.
-Any custom changes that you make to the administration interface should be backed up before upgrading Libretime to a newer version, otherwise they could be overwritten. If you have made improvements that you think might be useful to other Libretime users, please contact Libretime and tell us about them.
+Any custom changes that you make to the administration interface should be backed up before upgrading LibreTime to a newer version, otherwise they could be overwritten. If you have made improvements that you think might be useful to other LibreTime users, please contact LibreTime and tell us about them.
Modifying the Icecast interface
-------------------------------
diff --git a/docs/manual/interface-localization/index.md b/docs/manual/interface-localization/index.md
index 20ebce60d..3e270b3fe 100644
--- a/docs/manual/interface-localization/index.md
+++ b/docs/manual/interface-localization/index.md
@@ -1,10 +1,10 @@
-The Libretime administration interface can be localized using the standard GNU **gettext** method. Using GitHub for this task means you don't have to tackle the whole of a localization yourself; just as much as you can manage.
+The LibreTime administration interface can be localized using the standard GNU **gettext** method. Using GitHub for this task means you don't have to tackle the whole of a localization yourself; just as much as you can manage.
-First, you should check if a localization is already under way for your locale of choice. The best way to do this is to take a look at the 'master' branch in the GitHub repository for Libretime at . You can also ask in the Libretime development forum at , where you might find community members who can help you with the translation.
+First, you should check if a localization is already under way for your locale of choice. The best way to do this is to take a look at the 'master' branch in the GitHub repository for LibreTime at . You can also ask in the LibreTime development forum at , where you might find community members who can help you with the translation.
-GNU **gettext** means using a .po file for each language or dialect, a specially formatted plain text file with groups of three or more lines, like this example from Libretime's Korean localization:
+GNU **gettext** means using a .po file for each language or dialect, a specially formatted plain text file with groups of three or more lines, like this example from LibreTime's Korean localization:
#: airtime_mvc/application/configs/navigation.php:57
msgid "Media Folders"
@@ -16,11 +16,11 @@ If you use the cross-platform program **Poedit** () to e
Before manually translating strings in Poedit from scratch, you should take a look at the online translation services available, such as Lingohub () or Google's Translator Toolkit (), which both support gettext .po files. If using automatic translation, you can then use Poedit to fine-tune the localization and fix any formatting errors.
-If you don't already have a GitHub account, you can sign up at . Once you have a GitHub account, you can fork a copy () of the Libretime project. Work for the next major version of the software is done in the **master** branch of each project, so that's the branch to **checkout** after you have made the initial **git clone**.
+If you don't already have a GitHub account, you can sign up at . Once you have a GitHub account, you can fork a copy () of the LibreTime project. Work for the next major version of the software is done in the **master** branch of each project, so that's the branch to **checkout** after you have made the initial **git clone**.
In the locale code *de\_CH*, for example, *de* represents the German language and the suffix *\_CH* indicates the dialect spoken in Switzerland. Some languages have a wide variety of dialect localizations, which can be differentiated with a suffix in this way. You should update the header information in the .po file, which includes the language code and a country code, using one of the existing .po files as a guide.
-After forking the Libretime git repository, make sure you're in the **master** branch:
+After forking the LibreTime git repository, make sure you're in the **master** branch:
git branch
devel
@@ -40,18 +40,18 @@ and update the header information in the new copy of the *airtime.po* file using
For the example of Swiss German, the header of the file should now look like this:
- # SWISS GERMAN (de_CH) translation for Libretime.
+ # SWISS GERMAN (de_CH) translation for LibreTime.
# Copyright (C) 2013 Sourcefabric
- # This file is distributed under the same license as the Libretime package.
+ # This file is distributed under the same license as the LibreTime package.
# Sourcefabric , 2013.
#
msgid ""
msgstr ""
- "Project-Id-Version: Libretime 3.0-Alpha\n"
+ "Project-Id-Version: LibreTime 3.0-Alpha\n"
"Report-Msgid-Bugs-To: https://discourse.libretime.org/\n"
After using an online translation tool to begin a new localization, you can load the exported .po file into Poedit and complete your translation there. Enter the localization team's contact information and language into Poedit's **Edit -> Preferences** and **Catalog -> Settings** dialogs, which will be added to the .po file. When you save a .po file in Poedit, the corresponding binary .mo file will be compiled automatically.
-Finally, **git add**, **git commit** and **git push** these new .mo and .po files to your GitHub fork of the project, and send a git pull request () to the Libretime developers. The localization can then be added to a forthcoming Libretime release.
+Finally, **git add**, **git commit** and **git push** these new .mo and .po files to your GitHub fork of the project, and send a git pull request () to the LibreTime developers. The localization can then be added to a forthcoming LibreTime release.
-If you don't want to work with git, that's no problem - download a copy of the .po template file, edit the header, run it through an automatic translator and check it with Poedit. Then email your contribution to the Libretime team as an attachment - it will be very welcome! However, learning to use git is a good idea, because it means you can work directly on the current source code, share the localization work with the Libretime community, and avoid duplicated effort.
+If you don't want to work with git, that's no problem - download a copy of the .po template file, edit the header, run it through an automatic translator and check it with Poedit. Then email your contribution to the LibreTime team as an attachment - it will be very welcome! However, learning to use git is a good idea, because it means you can work directly on the current source code, share the localization work with the LibreTime community, and avoid duplicated effort.
diff --git a/docs/manual/listen/index.md b/docs/manual/listen/index.md
index df9ed24e4..2f03c3649 100644
--- a/docs/manual/listen/index.md
+++ b/docs/manual/listen/index.md
@@ -6,7 +6,7 @@ This button opens a pop-up **Live stream** window, which enables you to monitor
-Beneath the drop-down menu for stream selection is an orange volume control bar. This volume control only adjusts the output level of the pop-up **Live Stream** window, not the output level of the Libretime server itself. To adjust output level between muted and maximum, click on the corresponding place in the orange bar, with maximum level on the right side. Click on the left side speaker icon to mute the output.
+Beneath the drop-down menu for stream selection is an orange volume control bar. This volume control only adjusts the output level of the pop-up **Live Stream** window, not the output level of the LibreTime server itself. To adjust output level between muted and maximum, click on the corresponding place in the orange bar, with maximum level on the right side. Click on the left side speaker icon to mute the output.
@@ -14,4 +14,4 @@ To display the URL of the stream you are monitoring, so that you can copy and pa
-When you have finished monitoring the streams, you can close the pop-up window in the normal way, depending on the browser you are using. In Firefox, you can close the window by clicking the **X** button in the top right corner. This action will not shut down the output from the Libretime server, only the stream monitoring on your desktop computer or laptop.
+When you have finished monitoring the streams, you can close the pop-up window in the normal way, depending on the browser you are using. In Firefox, you can close the window by clicking the **X** button in the top right corner. This action will not shut down the output from the LibreTime server, only the stream monitoring on your desktop computer or laptop.
diff --git a/docs/manual/live-shows-with-mixxx/index.md b/docs/manual/live-shows-with-mixxx/index.md
index c6412352e..d04ca8f4a 100644
--- a/docs/manual/live-shows-with-mixxx/index.md
+++ b/docs/manual/live-shows-with-mixxx/index.md
@@ -1,13 +1,13 @@
Mixxx is a cross-platform Open Source application for DJs, available from
-Installed on a desktop or laptop computer, Mixxx complements your Libretime server to provide a complete system for both live and scheduled broadcasting. Although Mixxx has many features designed for dance music DJs that require beat matching and pitch independent time stretching, the program can be used for any kind of manually triggered broadcast playout, including live speech shows such as news or current affairs.
+Installed on a desktop or laptop computer, Mixxx complements your LibreTime server to provide a complete system for both live and scheduled broadcasting. Although Mixxx has many features designed for dance music DJs that require beat matching and pitch independent time stretching, the program can be used for any kind of manually triggered broadcast playout, including live speech shows such as news or current affairs.
Mixxx supports a wide variety of popular hardware control surfaces, which can be connected to your computer using a USB cable. A control surface might replace or augment an analogue mixer in your studio, depending on your live mixing and playout requirements.
Sound cards
-----------
-If you wish to use Libretime and Mixxx on the same machine, you will need two or more sound cards, as each program requires exclusive access to the sound hardware. Otherwise, you may see an error message that Mixxx cannot access the sound device.
+If you wish to use LibreTime and Mixxx on the same machine, you will need two or more sound cards, as each program requires exclusive access to the sound hardware. Otherwise, you may see an error message that Mixxx cannot access the sound device.
@@ -18,27 +18,27 @@ The solution is to configure Mixxx to use additional sound cards by clicking **O
Sharing storage
---------------
-If you make the Libretime server's storage directory */srv/airtime/stor/* accessible to a desktop machine as a read-only location, Mixxx will accept that location as its default music library when starting up for the first time. (This location can also be configured after installation by clicking **Options**, **Preferences**, then **Library** in the main Mixxx menu).
+If you make the LibreTime server's storage directory */srv/airtime/stor/* accessible to a desktop machine as a read-only location, Mixxx will accept that location as its default music library when starting up for the first time. (This location can also be configured after installation by clicking **Options**, **Preferences**, then **Library** in the main Mixxx menu).
You may need to adjust file and directory permissions so that the storage directory has read access from the desktop user account. Enabling write access directly to the storage server is not recommended, as this would allow desktop users to delete files which might be needed for playout later.
-If the filesystem path has been configured correctly, the metadata for the files in the Libretime storage server will be displayed in the main window of the Mixxx interface. Individual files from the Libretime storage server can then be added to either of Mixxx's live players with a right-click on the filename, or by using the appropriate hardware buttons on a control surface. Therefore it is possible to manage the station's storage archive remotely and collaboratively through Libretime, while using Mixxx as the live playout client in multiple, remote studios.
+If the filesystem path has been configured correctly, the metadata for the files in the LibreTime storage server will be displayed in the main window of the Mixxx interface. Individual files from the LibreTime storage server can then be added to either of Mixxx's live players with a right-click on the filename, or by using the appropriate hardware buttons on a control surface. Therefore it is possible to manage the station's storage archive remotely and collaboratively through LibreTime, while using Mixxx as the live playout client in multiple, remote studios.
-The Libretime storage archive can be exported like any other file server share. The method that you implement would depend on the operating system of your desktop client machines, and whether they were on the same local network as the Libretime server, or remote.
+The LibreTime storage archive can be exported like any other file server share. The method that you implement would depend on the operating system of your desktop client machines, and whether they were on the same local network as the LibreTime server, or remote.
For performance and redundancy reasons it is advisable to cache files required for a particular show on the client machine where Mixxx is installed. For example, for a GNU/Linux client machine, a nightly **rsync** download of new media in the archive would guard against network problems at playout time potentially disrupting a broadcast at a remote studio.
-Mixxx users can also record a show, and then upload it through the Libretime web interface on a local or remote server for collaborative or user-generated broadcasts.
+Mixxx users can also record a show, and then upload it through the LibreTime web interface on a local or remote server for collaborative or user-generated broadcasts.
-Streaming from Mixxx into Libretime
+Streaming from Mixxx into LibreTime
---------------------------------
-Mixxx 1.9.0 or later includes a live streaming client which, like Libretime, is compatible with the **Icecast** and **SHOUTcast** media servers. This feature can also be used to stream from Mixxx directly into Libretime, using either the **Show Source** or **Master Source**.
+Mixxx 1.9.0 or later includes a live streaming client which, like LibreTime, is compatible with the **Icecast** and **SHOUTcast** media servers. This feature can also be used to stream from Mixxx directly into LibreTime, using either the **Show Source** or **Master Source**.
-To configure **Mixxx** for streaming into Libretime, click **Options**, **Preferences**, then **Live Broadcasting** on the main Mixxx menu. For server **Type**, select the default of **Icecast 2**. For **Host**, **Mount**, **Port**, **Login** and **Password**, use the **Input Stream Settings** configured in the Libretime **Streams** page, on Libretime's **System** menu. See the chapter *Stream settings* for remote input connection details.
+To configure **Mixxx** for streaming into LibreTime, click **Options**, **Preferences**, then **Live Broadcasting** on the main Mixxx menu. For server **Type**, select the default of **Icecast 2**. For **Host**, **Mount**, **Port**, **Login** and **Password**, use the **Input Stream Settings** configured in the LibreTime **Streams** page, on LibreTime's **System** menu. See the chapter *Stream settings* for remote input connection details.
diff --git a/docs/manual/media-folders/index.md b/docs/manual/media-folders/index.md
index ffcb8d3b5..c36a9cf85 100644
--- a/docs/manual/media-folders/index.md
+++ b/docs/manual/media-folders/index.md
@@ -1,3 +1,3 @@
-Libretime's media library is inside the */srv/airtime/stor/* folder on your server, by default. Tracks are uploaded into the imported subdirectory and then a separate directory based upon the user ID # of the user who uploaded it and then into a folder based upon the artist.
+LibreTime's media library is inside the */srv/airtime/stor/* folder on your server, by default. Tracks are uploaded into the imported subdirectory and then a separate directory based upon the user ID # of the user who uploaded it and then into a folder based upon the artist.
LibreTime unlike Airtime does not currently monitor the files for changes after they are uploaded. The media library is not designed to be edited directly after files are uploaded. This was done as part of a move towards enabling cloud-based file hosting. There are currently two works in progress to support filesystem imports and sync but neither of them have been finished as of the time of this writing. See [#111](https://github.com/LibreTime/libretime/pull/111) and [#514](https://github.com/LibreTime/libretime/pull/514). In addition LibreTime does not write metadata changes back to the files. See [#621](https://github.com/LibreTime/libretime/issues/621)
diff --git a/docs/manual/on-air-in-60-seconds/index.md b/docs/manual/on-air-in-60-seconds/index.md
index 4a5262c8b..17a6ee75e 100644
--- a/docs/manual/on-air-in-60-seconds/index.md
+++ b/docs/manual/on-air-in-60-seconds/index.md
@@ -1,14 +1,14 @@
# On Air in 60 Seconds
-Here's how you can use Libretime to manage your broadcasts. Chapter names in
+Here's how you can use LibreTime to manage your broadcasts. Chapter names in
this book are shown in *italics*, to help you find the details of each step (if
you need to read more).
-1. Log in to your Libretime server with your **Username** and **Password**
+1. Log in to your LibreTime server with your **Username** and **Password**
(*Getting started*).
-2. Add your files to the Libretime library by clicking **Upload** on the left
+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**
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*).
diff --git a/docs/manual/playlists/index.md b/docs/manual/playlists/index.md
index c9b0041bd..1af6be997 100644
--- a/docs/manual/playlists/index.md
+++ b/docs/manual/playlists/index.md
@@ -28,7 +28,7 @@ With a playlist open, click on an item in the search results and then click **Ad
-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.
+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.
@@ -36,7 +36,7 @@ After adding files to the playlist, the total playlist time is displayed in the
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. 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.
@@ -62,7 +62,7 @@ If a **Fade In** and **Cue In** are set on the same item in the playlist, the fa
-When your playlist is complete, click the **New** button in the top left corner to create another playlist, click the close icon (a white cross in a black circle) in the top right corner, or browse to another page of the Libretime interface.
+When your playlist is complete, click the **New** button in the top left corner to create another playlist, click the close icon (a white cross in a black circle) in the top right corner, or browse to another page of the LibreTime interface.
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.
diff --git a/docs/manual/preparing-media-for-ingest/index.md b/docs/manual/preparing-media-for-ingest/index.md
index 811dfa99f..0c30ed2b4 100644
--- a/docs/manual/preparing-media-for-ingest/index.md
+++ b/docs/manual/preparing-media-for-ingest/index.md
@@ -1,11 +1,11 @@
-Before uploading media to an Libretime server, there are a number of factors which should be considered. Getting your ingest workflow right will save you a lot of time later.
+Before uploading media to an LibreTime server, there are a number of factors which should be considered. Getting your ingest workflow right will save you a lot of time later.
Metadata quality
----------------
-Libretime automatically imports any metadata that is in the files' ID3 tags. If these tags are incorrect or are missing information, you will have to either edit the metadata manually, or suffer the consequences. For example, if the files have creator or genre metadata missing, it will be impossible to search for, create playlists or generate smart blocks according to these criteria until you add it.
+LibreTime automatically imports any metadata that is in the files' ID3 tags. If these tags are incorrect or are missing information, you will have to either edit the metadata manually, or suffer the consequences. For example, if the files have creator or genre metadata missing, it will be impossible to search for, create playlists or generate smart blocks according to these criteria until you add it.
-There are a number of programs available which can be used to correct mistakes or incomplete information in ID3 tags. On GNU/Linux, the program **Ex Falso** ([http://code.google.com/p/quodlibet/](http://code.google.com/p/quodlibet/) "http://sourceforge.net/projects/dr14tmeter/")) can be useful for batch setting and editing ID3 tags before importing files into your Libretime server. On a Debian or Ubuntu desktop machine, you can install this program with the command:
+There are a number of programs available which can be used to correct mistakes or incomplete information in ID3 tags. On GNU/Linux, the program **Ex Falso** ([http://code.google.com/p/quodlibet/](http://code.google.com/p/quodlibet/) "http://sourceforge.net/projects/dr14tmeter/")) can be useful for batch setting and editing ID3 tags before importing files into your LibreTime server. On a Debian or Ubuntu desktop machine, you can install this program with the command:
sudo apt-get install exfalso
@@ -20,7 +20,7 @@ or from the desktop menu. The *Tags From Path* feature of this program is a part
Metadata in legacy character sets
---------------------------------
-Libretime expects file tag metadata to be stored in the international *UTF-8* character set. Programs such as **Ex Falso** (described above) encode metadata in UTF-8 by default. If you have an archive of files encoded with metadata in a legacy character set, such as the Cyrillic encoding *Windows-1251*, you should convert these files before import.
+LibreTime expects file tag metadata to be stored in the international *UTF-8* character set. Programs such as **Ex Falso** (described above) encode metadata in UTF-8 by default. If you have an archive of files encoded with metadata in a legacy character set, such as the Cyrillic encoding *Windows-1251*, you should convert these files before import.
The program **mid3iconv** (part of the **python-mutagen** package in Debian and Ubuntu) can be used to batch convert the metadata character set of files on the command line. You can install **python-mutagen** with the command:
@@ -55,15 +55,15 @@ CP1256: Arabic
Audio loudness
--------------
-On file ingest, Libretime analyzes each Ogg Vorbis, MP3, AAC or FLAC file's loudness, and stores a *ReplayGain* value for that file in its database. At playout time, the ReplayGain value is provided to Liquidsoap so that gain can be automatically adjusted to provide an average output of -14 dBFS loudness (14 decibels below full scale). See for more details of ReplayGain.
+On file ingest, LibreTime analyzes each Ogg Vorbis, MP3, AAC or FLAC file's loudness, and stores a *ReplayGain* value for that file in its database. At playout time, the ReplayGain value is provided to Liquidsoap so that gain can be automatically adjusted to provide an average output of -14 dBFS loudness (14 decibels below full scale). See for more details of ReplayGain.
Because of this automatic gain adjustment, any files with average loudness higher than -14 dBFS will not sound louder than quieter files at playout time, but the lower crest factor in the louder files (their relatively low peak-to-average ratio) may be apparent in the output, making those files sound less dynamic. This may be an issue for contemporary popular music, which can average at -9 dBFS or louder before ReplayGain adjustment. (See for a detailed analysis of the problem).
-Your station's producers should therefore aim for 14dB between peak and average loudness to maintain the crest factor of their prepared material (also known as *DR14* on some dynamic range meters, such as the command-line DR14 T.meter available from ). If the producers are working to a different loudness standard, the ReplayGain modifier in Libretime's Stream Settings page can be adjusted to suit their material.
+Your station's producers should therefore aim for 14dB between peak and average loudness to maintain the crest factor of their prepared material (also known as *DR14* on some dynamic range meters, such as the command-line DR14 T.meter available from ). If the producers are working to a different loudness standard, the ReplayGain modifier in LibreTime's Stream Settings page can be adjusted to suit their material.
Large transient peaks in otherwise quiet files should be avoided, to guard against the need for peak limiting when ReplayGain is applied to those quieter files.
-The **vorbisgain** command-line tool, available in the **vorbisgain** package in Debian/Ubuntu, can be used to indicate the ReplayGain of an individual Ogg Vorbis file before ingest into Libretime. (A similar tool for MP3 files is available in the **mp3gain** package in Debian/Ubuntu).
+The **vorbisgain** command-line tool, available in the **vorbisgain** package in Debian/Ubuntu, can be used to indicate the ReplayGain of an individual Ogg Vorbis file before ingest into LibreTime. (A similar tool for MP3 files is available in the **mp3gain** package in Debian/Ubuntu).
Here is an example of a very quiet file where the use of ReplayGain would make the output more than 17dB louder:
@@ -88,7 +88,7 @@ In the output from vorbisgain, *Peak* is the maximum sample value of the file be
Silence in media files
----------------------
-Before importing media, it is good practice to check for any silent sections in the media files. While Libretime compensates for leading and trailing silence with the use of automatic cue-in and cue-out points****, it may be preferable to trim these files to the intended length before upload. This is because media in the Libretime library could potentially be re-used in many different systems. **Audacity** is a cross-platform editor suitable for the task of trimming audio files, available from [http://audacity.sourceforge.net/](http://audacity.sourceforge.net "http://sourceforge.net/projects/dr14tmeter/")
+Before importing media, it is good practice to check for any silent sections in the media files. While LibreTime compensates for leading and trailing silence with the use of automatic cue-in and cue-out points****, it may be preferable to trim these files to the intended length before upload. This is because media in the LibreTime library could potentially be re-used in many different systems. **Audacity** is a cross-platform editor suitable for the task of trimming audio files, available from [http://audacity.sourceforge.net/](http://audacity.sourceforge.net "http://sourceforge.net/projects/dr14tmeter/")
Very quiet introductions or over-long fades can also lead to apparent gaps in your broadcast playout. Some audio CDs feature a 'hidden track' at the end, which in fact uses a long period of silence within the final track, rather than an actual separate track on the disc. This means that CD encoding programs will often encode both the hidden material and the silence in the media file. For example, the track *Debra* from the CD *Midnite Vultures* by *Beck* includes hidden material preceded by seven minutes of silence, as shown in the screen shot from Audacity below.
diff --git a/docs/manual/preparing-the-server/index.md b/docs/manual/preparing-the-server/index.md
index 21e9a8a62..d517807a5 100644
--- a/docs/manual/preparing-the-server/index.md
+++ b/docs/manual/preparing-the-server/index.md
@@ -4,14 +4,14 @@ 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 16.04 LTS (Xenial Xerus).
The server should have at least a 1GHz processor and 1GB of RAM, preferably 2GB
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
+plenty of storage capacity for the LibreTime library. A hot-swap RAID array is
recommended for media storage, in case of disk failure. You should also consider
a UPS or other battery-powered system to offer some protection against
short-term power failures.
diff --git a/docs/manual/secure-login-with-ssl/index.md b/docs/manual/secure-login-with-ssl/index.md
index 183c60b26..d25e68259 100644
--- a/docs/manual/secure-login-with-ssl/index.md
+++ b/docs/manual/secure-login-with-ssl/index.md
@@ -1,6 +1,6 @@
-To increase the security of your server, you can enable encrypted access to the Libretime administration interface, and direct your users towards this more secure login page. The main advantage of using this encryption is that your remote users' login names and passwords are not sent in plain text across the public Internet or untrusted local networks, such as shared Wi-Fi access points.
+To increase the security of your server, you can enable encrypted access to the LibreTime administration interface, and direct your users towards this more secure login page. The main advantage of using this encryption is that your remote users' login names and passwords are not sent in plain text across the public Internet or untrusted local networks, such as shared Wi-Fi access points.
-The padlock icon in a web browser's address bar depends on the browser's recognition of an encryption certificate. Because the users of your Libretime server will often be known to you personally, it is feasible to use a self-signed certificate for this purpose. Alternatively, you can pay a Certificate Authority to sign the certificate for you. Libretime Pro servers are pre-configured with a certificate signed by a Certificate Authority which is automatically recognised by all popular browsers.
+The padlock icon in a web browser's address bar depends on the browser's recognition of an encryption certificate. Because the users of your LibreTime server will often be known to you personally, it is feasible to use a self-signed certificate for this purpose. Alternatively, you can pay a Certificate Authority to sign the certificate for you. LibreTime Pro servers are pre-configured with a certificate signed by a Certificate Authority which is automatically recognised by all popular browsers.
Deploying a self-signed certificate
-----------------------------------
@@ -9,11 +9,11 @@ The Debian/Ubuntu package *ssl-cert* creates a *snakeoil* certificate and key ba
sudo apt-get install ssl-cert
-If the hostname of your server does not match the domain name you intend to use with the Libretime virtual host, the user's browser will present an additional security warning. You can set the domain name of the certificate by editing the file */usr/share/ssl-cert/ssleay.cnf* to replace the *@HostName@* variable:
+If the hostname of your server does not match the domain name you intend to use with the LibreTime virtual host, the user's browser will present an additional security warning. You can set the domain name of the certificate by editing the file */usr/share/ssl-cert/ssleay.cnf* to replace the *@HostName@* variable:
commonName = @HostName@
-with the domain name used by Libretime:
+with the domain name used by LibreTime:
commonName = airtime.example.com
@@ -25,13 +25,13 @@ You should enable additional Apache modules for page redirections, custom header
sudo a2enmod alias headers ssl
-Next, edit the virtual host configuration for your Libretime server to include a stanza for the https:// interface on port 443 and a redirect for logins from port 80:
+Next, edit the virtual host configuration for your LibreTime server to include a stanza for the https:// interface on port 443 and a redirect for logins from port 80:
sudo nano /etc/apache2/sites-available/airtime-vhost.conf
Using the following configuration for Apache 2.2 as a guide, replace *airtime.example.com* with the name of your server and *admin@example.com* with your email address. The older SSLv2 and SSLv3 protocols and SSL compression should be disabled, as they are generally believed to be insecure. You may wish to create a *ServerAlias* for users to access the administration interface over https:// if required.
-On port 80, Apache's *alias* module is used to set a *Redirect permanent* for the login page. Optionally, access could be denied to all sites except *localhost* and any other Libretime servers on your network, so that unencrypted communication between Libretime components can continue.
+On port 80, Apache's *alias* module is used to set a *Redirect permanent* for the login page. Optionally, access could be denied to all sites except *localhost* and any other LibreTime servers on your network, so that unencrypted communication between LibreTime components can continue.
SSLEngine on
@@ -84,7 +84,7 @@ When attempting to log into your server via http:// in future, you should be red
Importing a self-signed certificate into the browser
----------------------------------------------------
-The first time you access an Libretime server with a self-signed certificate over https:// your browser will block the login page and display a security warning. In **Mozilla Firefox**, you can click **Technical Details** to confirm that the warning is due to the certificate being self-signed before clicking the **Add Exception** button. In **Google Chrome**, the button to click on the security warning page is **Proceed Anyway**.
+The first time you access an LibreTime server with a self-signed certificate over https:// your browser will block the login page and display a security warning. In **Mozilla Firefox**, you can click **Technical Details** to confirm that the warning is due to the certificate being self-signed before clicking the **Add Exception** button. In **Google Chrome**, the button to click on the security warning page is **Proceed Anyway**.
@@ -92,7 +92,7 @@ On the next page in Firefox, click the **Get Certificate** button to inspect the
-If the users of your Libretime server wish to avoid going through these steps, or they do not trust the remote Libretime server to be what it claims to be, it is also possible to import a trusted local copy of a certificate file into the browser. For example, in Firefox version 30 preferences, you can go into the **Advanced** section, click the **Certificates** tab, then click the **View Certificates** button. On the **Servers** tab of the **Certificate Manager**, there is an **Import** button which enables you to load a certificate file from the local computer.
+If the users of your LibreTime server wish to avoid going through these steps, or they do not trust the remote LibreTime server to be what it claims to be, it is also possible to import a trusted local copy of a certificate file into the browser. For example, in Firefox version 30 preferences, you can go into the **Advanced** section, click the **Certificates** tab, then click the **View Certificates** button. On the **Servers** tab of the **Certificate Manager**, there is an **Import** button which enables you to load a certificate file from the local computer.
Mixed encrypted and unencrypted content
---------------------------------------
diff --git a/docs/manual/setting-the-server-time/index.md b/docs/manual/setting-the-server-time/index.md
index 13cd17758..d5ab2d333 100644
--- a/docs/manual/setting-the-server-time/index.md
+++ b/docs/manual/setting-the-server-time/index.md
@@ -1,4 +1,4 @@
-Accurate time keeping on your server is vital for Libretime performance. You can confirm that the date and time of your server are set correctly with the **date** command:
+Accurate time keeping on your server is vital for LibreTime performance. You can confirm that the date and time of your server are set correctly with the **date** command:
date
@@ -6,12 +6,12 @@ The server should respond with the date, time, time zone and year in a format si
Tue Jul 2 15:08:57 BST 2013
-If the time on your server is wrong, it is recommended that you take Libretime off-air until the problem is fixed.
+If the time on your server is wrong, it is recommended that you take LibreTime off-air until the problem is fixed.
Configuring NTP
---------------
-Although it is possible to set the date and time of the server manually, this is not recommended because the server clock can drift over time, compromising the accuracy of your broadcast schedule. If your Libretime server is permanently connected to the Internet, you can synchronize your server to a time server with the **ntp** ** program. If **ntp** is not yet installed, you can enter the following command on Debian or Ubuntu:
+Although it is possible to set the date and time of the server manually, this is not recommended because the server clock can drift over time, compromising the accuracy of your broadcast schedule. If your LibreTime server is permanently connected to the Internet, you can synchronize your server to a time server with the **ntp** ** program. If **ntp** is not yet installed, you can enter the following command on Debian or Ubuntu:
sudo apt-get install ntp
@@ -19,7 +19,7 @@ Optionally, open the **ntp** configuration file in the **nano** editor to add fu
sudo nano /etc/ntp.conf
-On Ubuntu GNU/Linux, the default time server is *ntp.ubuntu.com*, but there are many other time servers available on the public Internet, including the group of servers listed at for each country. Using a variety of NTP servers located closely to your Libretime server should produce the most accurate results. For example, for a server in the United Kingdom you could use the following list:
+On Ubuntu GNU/Linux, the default time server is *ntp.ubuntu.com*, but there are many other time servers available on the public Internet, including the group of servers listed at for each country. Using a variety of NTP servers located closely to your LibreTime server should produce the most accurate results. For example, for a server in the United Kingdom you could use the following list:
# You do need to talk to an NTP server or two (or three).
server ntp.ubuntu.com
@@ -51,7 +51,7 @@ Then use the **ntpq -p** command to confirm that **ntp** is working. This comman
Adjusting the server time zone
------------------------------
-The data centre which hosts your Libretime server could be located anywhere in the world. Some servers are set to *Coordinated Universal Time* or UTC (similar to *Greenwich Mean Time* or GMT), regardless of their location. Libretime uses UTC time in its database for scheduling purposes, independent of the server time zone.
+The data centre which hosts your LibreTime server could be located anywhere in the world. Some servers are set to *Coordinated Universal Time* or UTC (similar to *Greenwich Mean Time* or GMT), regardless of their location. LibreTime uses UTC time in its database for scheduling purposes, independent of the server time zone.
If the server time zone is not appropriate for integration with your station's other systems, on a Debian or Ubuntu server you can reconfigure the **tzdata** (time zone data) package with the command:
diff --git a/docs/manual/smartblocks/index.md b/docs/manual/smartblocks/index.md
index 2c8198348..76551cc2b 100644
--- a/docs/manual/smartblocks/index.md
+++ b/docs/manual/smartblocks/index.md
@@ -2,13 +2,13 @@
Creating a smart block
----------------------
-Smart blocks are automatically filled with media files from the Libretime library, according to the criteria that you specify. This feature is intended to save staff time, compared to selecting items for a playlist manually.
+Smart blocks are automatically filled with media files from the LibreTime library, according to the criteria that you specify. This feature is intended to save staff time, compared to selecting items for a playlist manually.
To create a smart block, click the **New** button on the right side of the Library page, and select **New Smart Block** from the pop-up menu. Like a playlist, smart blocks can have a title and **Description**, which you can edit. This helps you find relevant smart blocks in searches.
-Click the link **Smart Block Options** to display the criteria and modifiers for the smart block. The criteria can be any one of Libretime's metadata categories, such as **Title**, **Creator** or **Genre**. The modifier depends on whether the metadata in question contains letters or numbers. For example, **Title** has modifiers including *contains* and *starts with*, whereas the modifiers for **BPM** include *is greater than* and *is in the range*.
+Click the link **Smart Block Options** to display the criteria and modifiers for the smart block. The criteria can be any one of LibreTime's metadata categories, such as **Title**, **Creator** or **Genre**. The modifier depends on whether the metadata in question contains letters or numbers. For example, **Title** has modifiers including *contains* and *starts with*, whereas the modifiers for **BPM** include *is greater than* and *is in the range*.
You can also set the **smart block type**. A **Static** smart block will save the criteria and generate the block content immediately. This enables you to edit the contents of the block in the **Library** page before adding it to a show. A **Dynamic** smart block will only save the criteria, and the specific content will be generated at the time the block is added to a show. After that, the content of the show can be changed or re-ordered in the **Now Playing** page.
@@ -30,7 +30,7 @@ By default, a smart block will not contain repeated items, which will limit the
In addition Smart Blocks by default will never overflow the Time Limit. For instance if you set a time limit of 1 hour. It will add tracks to the schedule until it can't add any more tracks without exceeding the hour. This is to prevent tracks from being cut-off because they exceed the time limit of a show.
-If you want a smartblock to schedule tracks until it is longer than the Time Limit you can check "Allow last track to exceed time limit". This will make LibreTime add tracks that meet the criteria until it equals or is longer than the time limit. The was the default behaviour with the Libretime software.
+If you want a smartblock to schedule tracks until it is longer than the Time Limit you can check "Allow last track to exceed time limit". This will make LibreTime add tracks that meet the criteria until it equals or is longer than the time limit. The was the default behaviour with the LibreTime software.
If you have a large number of files which meet the criteria that you specify, you may wish to limit the duration of the smart block using the **Limit to** field, so that it fits within the show you have in mind. Select **hours**, **minutes** or **items** from the drop-down menu, and click the **Generate** button again, if it is a static smart block. Then click the **Save** button.
diff --git a/docs/manual/smartphone-journalism/index.md b/docs/manual/smartphone-journalism/index.md
index 88a3b82da..0e0dcd49d 100644
--- a/docs/manual/smartphone-journalism/index.md
+++ b/docs/manual/smartphone-journalism/index.md
@@ -1,4 +1,4 @@
-Using an ordinary smartphone and Libretime, you can upload your audio reports to the studio library or put them straight on the air. Here's how...
+Using an ordinary smartphone and LibreTime, you can upload your audio reports to the studio library or put them straight on the air. Here's how...
The basic voice recorder app on your phone may not have all the features you need for journalism, but there are plenty of more suitable recording apps available for both iPhone and Android. For instance, searching for 'ogg recorder' in the *Play Store* on an Android phone yields plenty of alternatives. The following example uses *RecForge Lite* because of its configurable recording formats. This free app is limited to three minutes per recording in Ogg and MP3 formats, but there is an unrestricted version available at very modest cost.
@@ -10,7 +10,7 @@ Back in the main recording window of RecForge, create a directory such as '*reco
-Open the web interface of your station's Libretime server in the phone's browser, log in with your username and password, and tap **Add Media** on Libretime's main menu. After tapping the **Add Files** button, the phone will offer a choice of file to upload. By tapping **Select music track** you can browse the */mnt/sdcard/media/audio/* directory on the SD card filesystem, without requiring the installation of a file manager app on the phone.
+Open the web interface of your station's LibreTime server in the phone's browser, log in with your username and password, and tap **Add Media** on LibreTime's main menu. After tapping the **Add Files** button, the phone will offer a choice of file to upload. By tapping **Select music track** you can browse the */mnt/sdcard/media/audio/* directory on the SD card filesystem, without requiring the installation of a file manager app on the phone.
@@ -18,7 +18,7 @@ Tap one of the date-and-time-stamped files listed from the '*recordings*' direct
-After tapping the **Start upload** button on the Add Media page, the files are now copied into the remote Libretime library.
+After tapping the **Start upload** button on the Add Media page, the files are now copied into the remote LibreTime library.
@@ -27,18 +27,18 @@ You can now add the uploaded files directly to a forthcoming show, use them to c
Going live
----------
-Mobile apps which enable you to stream directly into Libretime's live rebroadcast feature include **KoalaSan** for iOS: and **BroadcastMySelf** for Android: DemoIcesShout for Android also shows promise, although it can only stream a static file, rather than stream from a microphone:
+Mobile apps which enable you to stream directly into LibreTime's live rebroadcast feature include **KoalaSan** for iOS: and **BroadcastMySelf** for Android: DemoIcesShout for Android also shows promise, although it can only stream a static file, rather than stream from a microphone:
-A live workflow does of course depend on a steady network connection between the phone and Libretime server. Because streaming media on a regular basis can use a lot of bandwidth, it is advisable to use WiFi rather than mobile data (3G/4G) whenever possible, especially when roaming across networks.
+A live workflow does of course depend on a steady network connection between the phone and LibreTime server. Because streaming media on a regular basis can use a lot of bandwidth, it is advisable to use WiFi rather than mobile data (3G/4G) whenever possible, especially when roaming across networks.
KoalaSan can stream input from either the built-in microphone or the external jack of the iOS device. An example configuration for the **Settings** tab might be:
- Name: Libretime
+ Name: LibreTime
Server: libretime.example.com
Port: 8003
Mountpoint: mastermount
- Stream name: Libretime
- Description: A live stream to Libretime
+ Stream name: LibreTime
+ Description: A live stream to LibreTime
Genre: News
Username: masterstreamer
Password: masterpassword
@@ -82,6 +82,6 @@ You may also wish to configure the **Tracks Folder** setting, which enables you
/mnt/sdcard/media/audio/
-To connect the Android device to the Libretime server, tap the square button in the lower middle of the main interface. The connection indicator on the button should turn blue, and the message *connected* should be shown. Push up the fader on the left to increase input level from the internal microphone, or push up the fader on the right and tap one of the named files in the upper right window to stream it. Tap either of the **LOCK** buttons to prevent the stream input level being changed accidentally.
+To connect the Android device to the LibreTime server, tap the square button in the lower middle of the main interface. The connection indicator on the button should turn blue, and the message *connected* should be shown. Push up the fader on the left to increase input level from the internal microphone, or push up the fader on the right and tap one of the named files in the upper right window to stream it. Tap either of the **LOCK** buttons to prevent the stream input level being changed accidentally.
-When the connection is made, Libretime output will fade from scheduled play to the stream from your mobile device. See the chapter *Stream settings* for more details of connection preferences.
+When the connection is made, LibreTime output will fade from scheduled play to the stream from your mobile device. See the chapter *Stream settings* for more details of connection preferences.
diff --git a/docs/manual/tracks/index.md b/docs/manual/tracks/index.md
index 9ba92b0c7..1f2df2e08 100644
--- a/docs/manual/tracks/index.md
+++ b/docs/manual/tracks/index.md
@@ -1,6 +1,6 @@
# Tracks
-This page of the Libretime interface enables you to search the media library,
+This page of the LibreTime interface enables you to search the media library,
sort and display the search results by the criteria that you choose, audition
library items, and drag and drop those items into a playlist. You can also
adjust fade and cue points, create smart blocks (automatically generated
@@ -14,7 +14,7 @@ In the library table which opens, the upper section is for the **Advanced
Search Options**, which enable you to search within individual fields of the
database such as **Title** or **Creator**. Like an Internet search engine, you
do not have to type in the correct upper or lower case, press the **Enter** key,
-or even type the whole of the search term before matches from the Libretime
+or even type the whole of the search term before matches from the LibreTime
library are displayed.
@@ -60,7 +60,7 @@ 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 Libretime library. Media types which
+to audition the item, or remove it from the LibreTime 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
diff --git a/docs/manual/upload/index.md b/docs/manual/upload/index.md
index b94d6ea61..bd15491c4 100644
--- a/docs/manual/upload/index.md
+++ b/docs/manual/upload/index.md
@@ -1,5 +1,5 @@
# Upload
-The primary way you can add files to the Libretime library is using the
+The primary way you can add files to the LibreTime library is using the
**Upload** page of the administration interface. (The **Upload** page is not
visible to *Guest* users). This page includes an upload queue for media files,
which supports drag and drop from your computer's file manager if you are using
@@ -7,7 +7,7 @@ a recent web browser, such as *Mozilla Firefox 16* or later.
Some web browsers may set an upload limit for a single file, between 200MB and
2GB. In addition the default LibreTime webserver configuration limits file size
-to 500M. If you need to upload files larger than 500MB to the Libretime server
+to 500M. If you need to upload files larger than 500MB to the LibreTime server
on a regular basis, you will need to have your admin update the configuration at
`/etc/apache2/sites-available/airtime.conf `. Airtime previously supported
import via SFTP but this functionality is still under development for LibreTime.
@@ -23,7 +23,7 @@ window.
The upload speed will depend on the network connection between your computer and
-the Libretime server. While files are uploading you need to keep this browser
+the LibreTime server. While files are uploading you need to keep this browser
window open or it will interrupt the file transfer.
diff --git a/docs/manual/webstreams/index.md b/docs/manual/webstreams/index.md
index c088f5533..c921f3d84 100644
--- a/docs/manual/webstreams/index.md
+++ b/docs/manual/webstreams/index.md
@@ -1,7 +1,7 @@
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.
+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.