Merge pull request #1050 from zklosko/master

Fixing copyright, organization as per @robbt

airtime_mvc/application/configs/constants.php

@@ -15,13 +15,13 @@ define('SUPPORT_ADDRESS'    , 'https://discourse.libretime.org/');
 define("AIRTIMEPRO_API_URL", "https://account.example.com:5001/api/");
 
 define('HELP_URL'                   , 'https://discourse.libretime.org/');
-define('FAQ_URL'                    , 'http://libretime.org/faq/');
+define('FAQ_URL'                    , 'http://libretime.org/faq');
 define('WHOS_USING_URL'             , 'https://github.com/orgs/LibreTime/people');
 define('TERMS_AND_CONDITIONS_URL'   , 'https://github.com/LibreTime/libretime/blob/master/README.md');
 define('PRIVACY_POLICY_URL'         , 'https://github.com/LibreTime/code-of-conduct/blob/master/CODE_OF_CONDUCT.md');
-define('USER_MANUAL_URL'            , 'http://libretime.org/manual/');
+define('USER_MANUAL_URL'            , 'http://libretime.org/');
 define('ABOUT_AIRTIME_URL'          , 'http://libretime.org');
-define('AIRTIME_TRANSIFEX_URL'      , 'http://libretime.org/translating/');
+define('LIBRETIME_CONTRIBUTE_URL'   , 'https://libretime.org/contribute');
 define('LIBRETIME_DISCOURSE_URL'    , 'https://discourse.libretime.org');
 define('UI_REVAMP_EMBED_URL'        , 'https://www.youtube.com/embed/nqpNnCKGluY');
 define('LIBRETIME_WHATS_NEW_URL'    , 'https://github.com/LibreTime/libretime/releases');

airtime_mvc/application/configs/navigation.php

@@ -179,8 +179,8 @@ $pages[] = array(
             'target'    => "_blank"
         ),
         array(
-            'label'      => _('Help Translate Libretime'),
-            'uri'        => AIRTIME_TRANSIFEX_URL,
+            'label'      => _('Contribute to LibreTime'),
+            'uri'        => LIBRETIME_CONTRIBUTE_URL,
             'target'     => "_blank"
         ),
         array(

docs/_data/navigation.yml

@@ -32,6 +32,8 @@ sidebar:
       url: live-broadcast
     - page: Adding Users
       url: users
+    - page: Help!
+      url: troubleshooting
       subsubfolderitems:
       - page: More Tutorials
         url: tutorials
@@ -43,8 +45,6 @@ sidebar:
     - page:   
   - title: Appendix
     subfolderitems:
-    - page: Help!
-      url: troubleshooting
     - page: HD Audio Modules
       url: hd-audio-modules
     - page: Rights and Royalties

docs/_layouts/default.html

@@ -95,7 +95,7 @@
       <footer>
         <br>
         <p><small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small>
-        <br><small>Copyright (c) 2020 The LibreTime Foundation</small></p>
+        <small>Code and docs licensed under GPLv2. More details <a href="http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/about-this-manual/">here</a>. </small>
       </footer>
     </div>
     <script src="{{ "/assets/js/scale.fix.js" | relative_url }}"></script>

docs/contribute.md

@@ -21,7 +21,7 @@ Have an idea that would make LibreTime even better than it is right now? Start a
 LibreTime can run in over 15 different languages due to the gracious help of our volunteers. Is your language not
 supported? Follow [this guide](interface-localization) to add your language to LibreTime!
 
-## Help build and text LibreTime
+## Help write code for LibreTime
 
 Are you familar with coding in PHP? Have you made projects in Liquidsoap and some of the other services we use?
 Take a look at the bugs and feature requests [here](https://github.com/LibreTime/libretime/issues), and then
@@ -30,9 +30,12 @@ your desktop, open up a favorite editor and make some changes, and then commit,
 Knowledge on how to use [Github](https://guides.github.com/activities/hello-world/) and [Git](https://git-scm.com/docs/gittutorial)
 will suit you well, use the links for a quick 101.
 
+### Testing LibreTime in Vagrant
+
 Before submitting code to the project, it's a good idea to test it first. To do this, it's easiest to install
 LibreTime in a virtural machine on your local system or in a cloud VM. Instructions on how to set up a virtural
 instance of LibreTime with Vagrant are located [here](vagrant).
+
 If you would like to try LibreTime in a Docker image,
 Odclive has instructions [here](https://github.com/kessibi/libretime-docker) for setting up a test image
 and a more persistant install.

docs/quickstart.md

@@ -60,7 +60,7 @@ sudo ufw allow 80/tcp
 sudo ufw allow 8000/tcp
 ```
 
-If you plan on broadcasting live with Libretime, also unblock ports 8001 and 8002.
+Unblock ports 8001 and 8002 if you plan on broadcasting live with Libretime.
 
 ```
 sudo ufw enable 8001/tcp
@@ -73,27 +73,26 @@ sudo ufw enable 8002/tcp
 
 Installing LibreTime consists of running the following commands in the terminal:
 
-Option 1:
 ```
 git clone https://github.com/LibreTime/libretime.git
 cd libretime
 sudo ./install -fiap
 ```
 
-Option 2:
-```
-sudo add-apt-repository ppa:libretime/libretime
-sudo apt-get update
-sudo apt-get install libretime icecast2
-```
-
 After the install is completed, head to the IP address of the server LibreTime was just installed on
 to complete the welcome wizard. While not strictly necessary, it is recommended that you change the passwords prompted in the welcome wizard if you intend on accessing the server from the Internet. The welcome wizard will
 walk you through the rest of the installation process.
 
 Congratulations! You've successfully set up LibreTime!
 
-## Next Steps
+## Post-install
+
+If you plan to have LibreTime output analog audio directly from its server to a mixing console or transmitter,
+the `www-data` user needs to be added to the `audio` user group using the command below.
+
+```
+sudo adduser www-data audio
+```
 
 Now that the install is complete, use these guides to help you continue to set up your LibreTime server