Merge branch 'master' of https://github.com/fusionpbx/fusionpbx-docs

source/additional_information/testimonials.rst

@@ -13,6 +13,12 @@ Businesses of all sizes use FusionPBX daily.  We love to see folks happy saving
 
 ------------
 
+*I've been a longtime VoIP enthusiast for years, since 2005, and I have tried several different hosted/self-hosted PBX systems. Honestly, FusionPBX wins hands down. What makes it even more amazing is the passion that the FusionPBX developers and contributors have in their software. I honestly couldn't be happier with a turn-key PBX system.
+
+**-Digital Crisis**
+
+------------
+
 *Just want to give a thankful shout out to everyone at FusionPBX that have helped in education, contribution and support. The FusionPBX team have developed a leading product. Its been a joy from day one joining this community and I look forward to the road ahead.*
 
 **-Kissvoice**

source/applications.rst

@@ -20,6 +20,7 @@ In the **Applications** menu (Apps) section you will find Call Block, Call Broad
   applications/call_routing.rst
   applications/conference.rst 
   applications/conference_center.rst
+  applications/conference_controls.rst
   applications/contacts.rst
   applications/fax_server.rst
   applications/follow_me.rst

source/applications/conference_controls.rst

@@ -0,0 +1 @@
+

source/applications/streams.rst

@@ -7,3 +7,21 @@ Define details for streaming audio.
 .. image:: ../_static/images/applications/fusionpbx_streams.jpg
         :scale: 85%
 
+
+* To add a stream click the plus icon on the right
+* Edit the fields:
+ 		* Name: Can be anything
+		* Location: Must start with shout://
+		* Enabled: If you want the stream enabled
+		* Domain: Choose a domain that will only have the stream. Choose Global for all domains
+		* Description: To help organize ;-)
+		
+
+.. image:: ../_static/images/applications/fusionpbx_streams1.jpg
+        :scale: 85%
+
+
+.. Note::
+
+  Please be aware of your countries copyright laws for streaming the content you are going to stream
+	

source/getting_started.rst

@@ -10,13 +10,14 @@ Follow the menu to the left and you will have a working PBX in no time. For PDF
 
   There are many ways to install FusionPBX depending on how you want to build your solution.
   What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
-  For advanced topics like Bi Directional Replication or High Availability, consider attending the in person or online training at https://www.fusionpbx.com/training.php.
+  For advanced topics like Bi Directional Replication or High Availability, consider attending the in person or online training at https://www.fusionpbx.com/training.php. Additional FusionPBX training is available via Continuing Education.  This is a monthly affordable option to keep you current and ahead of the competition!
 
 
 .. toctree::
   :maxdepth: 3
   :glob:
 
+  getting_started/training.rst
   getting_started/quick_install.rst
   applications/provision.rst
   getting_started/security.rst

source/getting_started/training.rst

@@ -0,0 +1,45 @@
+###########
+Training
+###########
+
+FusionPBX offers different levels of training. We love helping people and companies succeed.  From the small family business, someone that loves to tinker with technology, to major companies all around the world.
+
+Free
+------
+
+* Free Self help is available for you right here at docs.fusionpbx.com
+* Video's at https://youtube.com/fusionpbx
+
+
+`Paid Training and technical support <https://www.fusionpbx.com/training.php>`_
+-------------------------------------
+
+FusionPBX offers an Admin class, Advanced class and an affordable Continuing Education class.  If you want to accelerate your understanding of how to use FusionPBX and unleash your full potential these classes are for you.
+
+* `Admin Class <https://www.fusionpbx.com/training.php>`_
+    * Online or Webex
+    * Access to Class Documentation
+    * Recorded video of the class for you to keep
+    * Interactive question and answer with the FusionPBX founder and trainer
+    * Covers the basics and some advanced topics with FusionPBX
+    * Plus much more...
+
+* `Advanced Class <https://www.fusionpbx.com/training.php>`_
+    * Online or Webex
+    * Access to Class Documentation
+    * Recorded video of the class for you to keep
+    * Interactive question and answer with the FusionPBX founder and trainer
+    * Covers advanced topics and methods
+    * Plus much more...
+    
+* `Continuing Education <https://www.fusionpbx.com/training.php>`_
+    * Monthly Webex meeting on changes with FusionPBX
+    * Option to take the advanced or admin over again (included in the monthly price)
+    * Report bugs or ask questions that might not have came up until now
+    * Get a closer more indepth look into FusionPBX
+    * Know how to use new features when they are added
+    * Know how to upgrade to the next release version
+    * Plus much more...
+ 
+`Come join us!  We look forward to meeting you! <https://www.fusionpbx.com/training.php>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

source/status/active_calls.rst

@@ -10,5 +10,5 @@ Use this to monitor and interact with the active calls.
 Here you can view the sip profile used, time the call was created, number, cid number, destination, application, Codecs used, and if the call is secure (encrypted)
 
 *  Click the X to end the call
-*  Click the Show All button to show calls for all tenants.
+*  Click the Show All button to show calls in all domains.