Merge remote-tracking branch 'refs/remotes/origin/master' into fusionpbx/master

source/additional_information/feature_codes.rst

@@ -15,37 +15,37 @@ Feature Codes
 +--------------------+----------------------+------------------------------------------------------------------------------+
 | Feature Code       | Name                 | Detail                                                                       |
 +====================+======================+==============================================================================+
-| *1                 | Call Transfer        |Transfer a call to another extension                                          |
+| '*'1               | Call Transfer        |Transfer a call to another extension                                          |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *2                 | Record Active Call   |                                                                              |
+| '*'2               | Record Active Call   |                                                                              |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *4                 |Attended Call Transfer| Attended call transfer to another extension. After extension number press #  |
+| '*'4               |Attended Call Transfer| Attended call transfer to another extension. After extension number press #  |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *411               | Directory            | *DIR to dial by name.                                                        |
+| '*'411             | Directory            | '*'DIR to dial by name.                                                      |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *3472              | DISA                 | *DISA followed by Administrative PIN to receive a dialtone and call out.     |
+| '*'3472            | DISA                 | '*'DISA followed by Administrative PIN to receive a dialtone and call out.   |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *5900              | Valet Park           | Attended Transfer (park). The park extension will be played back to you.     |
+| '*'5900            | Valet Park           | Attended Transfer (park). The park extension will be played back to you.     |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *5901-5999         | Valet Un-Park        | Retrieve a Valet Parked call.                                                |
+| '*'5901-5999       | Valet Un-Park        | Retrieve a Valet Parked call.                                                |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *67 <phone number> | Call Privacy         | Activate call privacy                                                        |
+| '*'67<phone number>| Call Privacy         | Activate call privacy                                                        |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *69                | Call Return          | Call back the last incoming number                                           |
+| '*'69              | Call Return          | Call back the last incoming number                                           |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *732               | Record               |*REC followed by Administrative PIN to record a message.                      |
+| '*'732             | Record               |'*'REC followed by Administrative PIN to record a message.                    |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *8[ext]            | Extension Intercom   | Page a specific extension.                                                   |
+| '*'8[ext]          | Extension Intercom   | Page a specific extension.                                                   |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *870               | Redial               | Redial a number                                                              |
+| '*'870             | Redial               | Redial a number                                                              |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *xx                | Talking Date         | To Do                                                                        |
+| '*'xx              | Talking Date         | To Do                                                                        |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *xx                | Talking Time         | To Do                                                                        |
+| '*'xx              | Talking Time         | To Do                                                                        |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *xx                | Talking Date & Time  | To Do                                                                        |
+| '*'xx              | Talking Date & Time  | To Do                                                                        |
 +--------------------+----------------------+------------------------------------------------------------------------------+
-| *925               | Wakeup Call          | Schedule a wakeup call                                                       |
+| '*'925             | Wakeup Call          | Schedule a wakeup call                                                       |
 +--------------------+----------------------+------------------------------------------------------------------------------+
 
 | **Administrative PIN** (Recordings pin) can be found here `Administrative PIN </en/latest/applications/recordings.html>`__ page
@@ -57,13 +57,13 @@ Feature Codes
 +----------------------+-------------------------+-------------------------------------------------------------------------+
 | Feature Code         | Name                    | Detail                                                                  |
 +======================+=========================+=========================================================================+
-| *97                  | Voicemail               | The system detects the extension, and will prompt for your password     |
+| '*'97                | Voicemail               | The system detects the extension, and will prompt for your password     |
 +----------------------+-------------------------+-------------------------------------------------------------------------+
-| *98                  | Check any Voicemail box | The system will prompt for both your id (extension number) and password |
+| '*'98                | Check any Voicemail box | The system will prompt for both your id (extension number) and password |
 +----------------------+-------------------------+-------------------------------------------------------------------------+
-| *4000                | Check any Voicemail box | The system will prompt for both your id (extension number) and password |
+| '*'4000              | Check any Voicemail box | The system will prompt for both your id (extension number) and password |
 +----------------------+-------------------------+-------------------------------------------------------------------------+
-| *99 <extension>      | Send to Voicemail       | Send a call directly to voicemail                                       |
+| '*'99 <extension>    | Send to Voicemail       | Send a call directly to voicemail                                       |
 +----------------------+-------------------------+-------------------------------------------------------------------------+
 
 **Conference**
@@ -73,13 +73,13 @@ Feature Codes
 +-----------------------+-------------------------+---------------------------------------------------------+
 | Feature Code          | Name                    | Detail                                                  |
 +=======================+=========================+=========================================================+
-| *3001-3099            | Conference (8khz)       | Conference room with 8khz (cellphone quality) audio     |
+| '*'3001-3099          | Conference (8khz)       | Conference room with 8khz (cellphone quality) audio     |
 +-----------------------+-------------------------+---------------------------------------------------------+
-| *3101-3199            | Conference (16khz)      | Conference room with 16khz audio                        |
+| '*'3101-3199          | Conference (16khz)      | Conference room with 16khz audio                        |
 +-----------------------+-------------------------+---------------------------------------------------------+
-| *3201-3299            | Conference (32khz)      | Conference room with 32khz audio                        |
+| '*'3201-3299          | Conference (32khz)      | Conference room with 32khz audio                        |
 +-----------------------+-------------------------+---------------------------------------------------------+
-| *3301-3399            | Conference (48khz)      | Conference room with 48khz (cd quality) audio           |
+| '*'3301-3399          | Conference (48khz)      | Conference room with 48khz (cd quality) audio           |
 +-----------------------+-------------------------+---------------------------------------------------------+
 |                       |                         |  Additional Conference numbers can be added via the GUI |
 +-----------------------+-------------------------+---------------------------------------------------------+
@@ -91,19 +91,19 @@ Feature Codes
 +-----------------------+-------------------------+------------------------------------------------------------------------+
 | Feature Code          | Name                    | Detail                                                                 |
 +=======================+=========================+========================================================================+
-| *8                    | Group Intercept         |                                                                        |
+| '*'8                  | Group Intercept         |                                                                        |
 +-----------------------+-------------------------+------------------------------------------------------------------------+ 
-| *80 <Group ID>        | Delete from Group       | Remove extension from a group using 2 digit group ID. See Call Groups. |
+| '*'80 <Group ID>      | Delete from Group       | Remove extension from a group using 2 digit group ID. See Call Groups. |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
-| **81 <Group ID>       | Add to Group            | Add extension to a group using 2 digit group ID. See Call Groups.      |
+| '**'81 <Group ID>     | Add to Group            | Add extension to a group using 2 digit group ID. See Call Groups.      |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
-| **82 <Group ID>       | Simultaneous Ring       | Ring an entire group simultaneously (using a 2 digit group ID)         |
+| '**'82 <Group ID>     | Simultaneous Ring       | Ring an entire group simultaneously (using a 2 digit group ID)         |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
-| **83 <Group ID>       | Sequential Ring         | Ring an entire group sequentially (using a 2 digit group ID)           |
+| '**'83 <Group ID>     | Sequential Ring         | Ring an entire group sequentially (using a 2 digit group ID)           |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
-| **2001                | Ring Billing            | Ring the Billing Group                                                 |
+| '**'2001              | Ring Billing            | Ring the Billing Group                                                 |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
-| **2002                | Ring Support            | Ring the Support Group                                                 |
+| '**'2002              | Ring Support            | Ring the Support Group                                                 |
 +-----------------------+-------------------------+------------------------------------------------------------------------+
 
 
@@ -114,13 +114,13 @@ Feature Codes
 +---------------+-------------------------+-------------------------------------------------------------------------------+
 | Feature Code  | Name                    | Detail                                                                        |
 +===============+=========================+===============================================================================+
-| *8[ext]       | Extension Intercom      | Page a specific extension.                                                    |
+| '*'8[ext]     | Extension Intercom      | Page a specific extension.                                                    |
 +---------------+-------------------------+-------------------------------------------------------------------------------+
-| *33 <ext>     | Eavesdrop               | Listen to the call. Press 1 for remote, 2 for local, 3 for full conversation. |
+| '*'33 <ext>   | Eavesdrop               | Listen to the call. Press 1 for remote, 2 for local, 3 for full conversation. |
 +---------------+-------------------------+-------------------------------------------------------------------------------+
-| *886          | Global Intercept        | Intercept a call that is ringing.                                             |
+| '*'886        | Global Intercept        | Intercept a call that is ringing.                                             |
 +---------------+-------------------------+-------------------------------------------------------------------------------+
-| **8 <ext>     | Intercept an extension  | Intercept a specific extension.                                               |
+| '**'8 <ext>   | Intercept an extension  | Intercept a specific extension.                                               |
 +---------------+-------------------------+-------------------------------------------------------------------------------+
 
 
@@ -131,21 +131,21 @@ Feature Codes
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
 | Feature Code          | Name                    | Detail                                                                        |
 +=======================+=========================+===============================================================================+
-| *9192                 | Info                    | Sends information to the console.                                             |
+| '*'9192               | Info                    | Sends information to the console.                                             |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9193                 | Video Record            | Record Video.                                                                 |
+| '*'9193               | Video Record            | Record Video.                                                                 |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9194                 | Video Playback          | Playback Video.                                                               |
+| '*'9194               | Video Playback          | Playback Video.                                                               |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9195                 | Delay Echo              | Audio is played back after a slight delay.                                    |
+| '*'9195               | Delay Echo              | Audio is played back after a slight delay.                                    |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9196                 | Echo Test               | Echo Test.                                                                    |
+| '*'9196               | Echo Test               | Echo Test.                                                                    |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9197                 | Milliwatt Tone          | Tone Playback                                                                 |
+| '*'9197               | Milliwatt Tone          | Tone Playback                                                                 |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *9664                 | Test MoH                | Test Music on Hold                                                            |
+| '*'9664               | Test MoH                | Test Music on Hold                                                            |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
-| *5000                 | Default Attendant       | Call the default auto-attendant                                               |
+| '*'5000               | Default Attendant       | Call the default auto-attendant                                               |
 +-----------------------+-------------------------+-------------------------------------------------------------------------------+
 
 **Adding extra feature codes**

source/advanced.rst

@@ -1,13 +1,12 @@
-************
+###########
 Advanced
-************
+###########
 
-|
-In the Advanced menu you will find Access Controls, Adminer, App Manager, Backup, Command, Databases, Default Settings, Domain, Grammer Editor, Group Manager, Menu Manager, Modules, Notifications, PHP Editor, Provision Editor, Script Editor, Settings, SIP Profiles, SQL Query, Upgrade, Variables and XML Editor.
 
-|
-Welcome to the adding a domain section.  Here you will find how to add a domain so that you can reach the specific tenant from
-the multi-tenant domain side menu to configure and allow secure administration from the world wide web. 
+| In the Advanced menu you will find Access Controls, Adminer, App Manager, Backup, Command, Databases, Default Settings, Domain, Grammer Editor, Group Manager, Menu Manager, Modules, Notifications, PHP Editor, Provision Editor, Script Editor, Settings, SIP Profiles, SQL Query, Upgrade, Variables and XML Editor.
+
+
+| Welcome to the adding a domain section.  Here you will find how to add a domain so that you can reach the specific tenant from the multi-tenant domain side menu to configure and allow secure administration from the world wide web. 
 
 .. image:: _static/images/fusionpbx_advanced_menu.jpg
         :scale: 85%

source/advanced/domains.rst

@@ -1,6 +1,6 @@
-************
+###########
 Domains
-************
+###########
 
 |  Welcome to the adding a domain section.  Here you will find how to add a domain so that you can reach the specific tenant from the multi-tenant domain side menu to configure and allow secure administration from the world wide web. 
 
@@ -9,9 +9,9 @@ Domains
   
 |
 
-***************
+===============
 Adding a domain
-***************
+===============
 
 | Control the list of domains to manage.
 
@@ -65,8 +65,3 @@ Domain Selection
         :scale: 75%
 
 
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  domains/domains.rst

source/advanced/upgrade.rst

@@ -10,10 +10,10 @@ The FusionPBX code is constantly evolving. Bug fixes being submitted, additions
 Maintenance Upgrade
 ####################
 
-|
-A Maintenance Upgrade can be done daily depending on development activity.  This is typically for bug fixes, added features, security patches or small version upgrades.
 
-|
+| A Maintenance Upgrade can be done daily depending on development activity.  This is typically for bug fixes, added features, security patches or small version upgrades.
+
+
 .. image:: ../_static/images/fusionpbx_upgrade.jpg
         :scale: 85%
 
@@ -53,13 +53,14 @@ How to Upgrade
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 | 1. GUI -> Advanced -> Upgrade (doesn't update all files)
+
 Used to update FusionPBX to the latest release.
 
 **Upgrade the code via Github/GIT**
 
-| *Login into the web interface with a user account assigned to the superadmin group.
-| *Login to the console with either the ssh, the locally.
-| *Backup It's a good idea to make a backup. If using sqlite, your backup will easily include the SQL database.
+| Login into the web interface with a user account assigned to the superadmin group.
+| Login to the console with either the ssh, the locally.
+| Backup It's a good idea to make a backup. If using sqlite, your backup will easily include the SQL database.
  
 ::
 
@@ -155,7 +156,7 @@ Used to update FusionPBX to the latest release.
  cd /var/www/fusionpbx
  /usr/bin/php /var/www/fusionpbx/core/upgrade/upgrade.php
 
-| *If your screen was nicely formatted with a fusionpbx theme, and suddenly now goes to a black and white screen with familiar text but no theme, it is because you were using a theme which no longer exists in the latest version of the code.  If this happens to you navigate to:
+| If your screen was nicely formatted with a fusionpbx theme, and suddenly now goes to a black and white screen with familiar text but no theme, it is because you were using a theme which no longer exists in the latest version of the code.  If this happens to you navigate to:
 
 ::
 
@@ -216,30 +217,60 @@ Version Upgrade
 
 Version Upgrade can take several steps to perform. Below will show how to upgrade from specific versions.
 
-Release Revisions
+|
 
-* r0001 is 1.0 release - 6 Nov 2009
-* r2523 is 3.0 release - 3 May 2012
-* r2585 is 3.0.4 release - 24 May 2012
-* r2757 is 3.1 release - 18 Aug 2012
-* r2777 is 3.1.1 release - 26 Aug 2012
-* r2827 is 3.1.2 release - 12 Sep 2012
-* r2897 is 3.1.3 release - 26 Sep 2012
-* r2907 is 3.1.4 release - 27 Sep 2012
-* r3694 is 3.2 release - 19 Jan 2013
-* r3978 is 3.3 release - 1 May 2013
-* r4605 is 3.4 release - 28 Sep 2013
-* r6747 is 3.6.1 release - 22 Aug 2014
-* r8481 is 3.8.3 release - 11 May 2014
-* r793d386 is 4.0 release - Aug 2015
-* r4fdb6e9 is 4.1 release - Dec 2015
+Version 4.0 to 4.2
+^^^^^^^^^^^^^^^^^^
+
+1. Update code from the GUI. Advanced > Upgrade page (Only check this box then click execute)
+
+
+  .. note::
+ 
+<<<<<<< HEAD
+  If you get a red bar error at the top when trying to upgrade
+  you will need SSH access to the install and run these commands.
+=======
+  If you get a red bar error at the top when trying to upgrade you will need SSH access to the install and run these commands.
+>>>>>>> origin/master
+
+
+::
+
+ cd /var/www/freeswitch
+ git stash
+ git pull
+ chown -R www-data:www-data *
+ 
+2. Check box Schema (Only check this box then click execute)
 
 |
-Version 4.0 to 4.1
-^^^^^^^^^^^^^^^^^^
+
+3. You will notice a big difference in the menu. (Logo can be placed above the menu also)
+
+.. image:: ../_static/images/fusionpbx_new_menu.jpg
+        :scale: 85%
 
 |
 
+4. Check box Default Settings. (Only check this box then click execute)
+
+|
+
+5. If the page goes blank type in the url http://domain.tld/logout.php  This should bring you back to the login screen. Login.
+
+|
+
+6. Goto Dialplan > Dialplan Manager and delete "local_extension".  Then goto Advanced > Upgrade and only check box App Defaults and click execute. This will regenerate the new local_extension version.
+
+|
+
+7. Goto Applications > Conference profiles. Edit each profile and replace $${hold_music} with local_stream://default
+
+|
+
+8. Goto Advanced > Variables hold_music. Make sure it's value is set as local_stream://default
+
 |
 
 Version 3.8 to 4.0
@@ -266,7 +297,7 @@ Rebooting FreeSWITCH is required for this to take effect.
 Version 3.6 to 3.8
 ^^^^^^^^^^^^^^^^^^
 
-|
+
 | **Note: Upgrading can get very complex. If the production system is critical or you are intimidated from these upgrade instructions you may want FusionPBX paid support at http://www.fusionpbx.com/support.php**
 
 | A standard 'upgrade' procedure should always be followed:
@@ -278,19 +309,20 @@ Beyond the standard upgrade procedure just described, the following will also ne
 
  uncomment: <param name="script-directory" value="$${base_dir}/scripts/?.lua"/>
  in: /usr/local/freeswitch/conf/autoload_configs/lua.conf.xml 
+
 |
 
 | * Rebuild all time conditions. 
-| *After you edit a particular time condition, click the Dialplan button on the top right to see what was there originally. 
+| * After you edit a particular time condition, click the Dialplan button on the top right to see what was there originally. 
 | * Delete the following dialplans from each domain then run Advanced -> Upgrade -> App Defaults. If using XML handler for the dialplan flush memcache. If using dialplans XML on the file system resave one of the dialplans to have FusionPBX rewrite the XML files. 
 | * user_exists - call_timeout variable was added
 | * extension-intercom - It has been renamed to 'page-extension'
-| * eavesdrop - Change *88[ext] to *33[ext] so that it doesn't conflict with page-extension at *8[ext] 
+| * eavesdrop - Change '*'88[ext] to '*'33[ext] so that it doesn't conflict with page-extension at '*'8[ext] 
 | * user_status - Has been renamed to 'agent_status'
 | * page - Dialplan has been simplified.
 | * valet_park_out - Changed regex variable from $1 to $2
 | * local_extension - failure handler was added to support call forward on busy and no answer
-| * If using call center feature code *22 edit each agent and add an agent id and password (pin number)
+| * If using call center feature code '*'22 edit each agent and add an agent id and password (pin number)
 | * Delete any dialplan with the 'features' context. These have been moved into the dialplan domain contexts.
 | * If using App -> XMPP, Content Manager, or Schema they have been moved dev -> branches -> apps directory need to pull files from there if you want to use any of them.
 | * For single tenant systems 'default' context is no longer used by default. 
@@ -311,7 +343,9 @@ Beyond the standard upgrade procedure just described, the following will also ne
 | If you go to Advanced Group Manager -> And you see what looks like duplicates of user, admin and superadmin groups then you need do the following instructions.
 
 |
+
 | Remove permissions associated with all domain groups with names that match default global groups...
+
 | Use the **Advanced -> SQL Query tool** to do the following.
 
 ::
@@ -569,6 +603,25 @@ Version 2 to 3.0
 | * Double check the SMTP settings on the System -> Settings page
 | * Save it, even if you haven't changed anything
 
+Release Revisions
+
+* r0001 is 1.0 release - 6 Nov 2009
+* r2523 is 3.0 release - 3 May 2012
+* r2585 is 3.0.4 release - 24 May 2012
+* r2757 is 3.1 release - 18 Aug 2012
+* r2777 is 3.1.1 release - 26 Aug 2012
+* r2827 is 3.1.2 release - 12 Sep 2012
+* r2897 is 3.1.3 release - 26 Sep 2012
+* r2907 is 3.1.4 release - 27 Sep 2012
+* r3694 is 3.2 release - 19 Jan 2013
+* r3978 is 3.3 release - 1 May 2013
+* r4605 is 3.4 release - 28 Sep 2013
+* r6747 is 3.6.1 release - 22 Aug 2014
+* r8481 is 3.8.3 release - 11 May 2014
+* r793d386 is 4.0 release - Aug 2015
+* r4fdb6e9 is 4.1 release - Dec 2015
+* rxxxxxxx is 4.2 release - xxx 2016
+
 |
 
 SQLite
@@ -595,13 +648,18 @@ Configure
 ^^^^^^^^^^
 
 To enable PostgresSQL as a native client in FreeSWITCH you must enable it during the build when running configure.
-** ./configure --enable-core-pgsql-support **
+
+ ::
+ 
+ ** ./configure --enable-core-pgsql-support **
 
 switch.conf.xml
 ^^^^^^^^^^^^^^^^^
 
 Under the Settings area insert the following line
 
+ ::
+ 
  <param name="core-db-dsn" value="pgsql;hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" />
 
 Additional Information

source/applications.rst

@@ -1,19 +1,20 @@
-************
+############
 Applications
-************
+############
 
 | In the **Applications** menu (Apps) section you will find Call Block, Call Broadcast, Call Center, Call Detail Records, Call Flows, Conference Center, Contacts, Fax Server, Follow Me, IVR Menu, Music on Hold, Operator Panel, Phrases, Queues, Recordings, Ring Groups, Time Conditions and Voicemail.
 
 .. image:: _static/images/fusionpbx_apps.jpg
         :scale: 85%
         :align: left
+
 |
 
 .. toctree::
   :maxdepth: 3
   :glob:
 
-
   applications/ivr.rst
   applications/recordings.rst
-  
+  applications/ring_group.rst
+  applications/time_conditions.rst

source/applications/ivr.rst

@@ -1,10 +1,9 @@
-************
+############
 IVR's
-************
+############
 
 Welcome to the adding IVR section.  Here you will find how to add IVR's.
 
-|
 |
 
 Click on **Apps** then **IVR Menu**
@@ -13,7 +12,6 @@ Click on **Apps** then **IVR Menu**
         :scale: 85%
 
 |
-|
 
 Then click the
 
@@ -27,18 +25,19 @@ on the right.
         :scale: 85%
 
 |
-| *Options in* **bold** *are mandatory.*
-| **Name:** Enter a name for the IVR menu
-| **Extension:** Enter the extension number (This must a new extension that isn't allready created)
-| **Greet Long:** The long greeting when entering the menu.
-| Greet Short: The short greeting is played when returning to the menu.
-| Options: Define caller options for the IVR menu.
-| **Timeout:** The number of milliseconds to wait after playing the greeting or the confirm macro.
-| Exit Action: Select the exit action to be performed if the ivr exists.
-| **Direct Dial:** Define whether the callers can dial directly to registered extensions.
-| Ring Back: Defines what the caller will hear while the destination is being called.
-| Caller ID Name Prefix: Set a prefix on the caller ID name.
-| Enabled: set the status of the IVR Menu.
+
+*  *Options in* **bold** *are mandatory.*
+*  **Name:** Enter a name for the IVR menu
+*  **Extension:** Enter the extension number (This must a new extension that isn't allready created)
+*  **Greet Long:** The long greeting when entering the menu.
+*  Greet Short: The short greeting is played when returning to the menu.
+*  Options: Define caller options for the IVR menu.
+*  **Timeout:** The number of milliseconds to wait after playing the greeting or the confirm macro.
+*  Exit Action: Select the exit action to be performed if the ivr exists.
+*  **Direct Dial:** Define whether the callers can dial directly to registered extensions.
+*  Ring Back: Defines what the caller will hear while the destination is being called.
+*  Caller ID Name Prefix: Set a prefix on the caller ID name.
+*  Enabled: set the status of the IVR Menu.
 
 |
 
@@ -48,7 +47,14 @@ on the right.
 
 |
 
-You can get very creative with IVR's and are almost limitless in possibilities. In the basic example below we **name** the IVR "IVR Main" , **Extension** "200" , **Greet Long** a phrase that was made from the **phrase section** under **apps** , entry in options for sales, billing, tech support, and after hours, made the **timeout** 3000 milliseconds, Exit Action to the extension 109 (after hours) , **Direct Dial** to False and Ring back to Default.
+You can get very creative with IVR's and are almost limitless in possibilities. In the basic example below we;
+
+*  **Name** the IVR "IVR Main"
+*  **Extension** "200"
+*  **Greet Long** a phrase that was made from the **phrase section** under **apps**
+*  Number entry in **options** ,choose an extension for **Destination** and **descriptions** *ie* sales, billing, tech support, and after hours. **timeout** 3000 milliseconds
+*  Exit Action to the extension 109 (after hours)
+*  **Direct Dial** to False and Ring back to Default.
 
 |
 

source/applications/recordings.rst

@@ -1,10 +1,10 @@
-***********
+###########
 Recordings
-***********
+###########
 
 |
 
-Dial *732 to create a recording, or (for best results) upload a 16bit 8khz/16khz mono WAV file.
+Dial '*'732 to create a recording, or (for best results) upload a 16bit 8khz/16khz mono WAV file.
 
 |
 
@@ -23,7 +23,7 @@ Create a Recording
 
 |
 
-1. Dial *732 and wait for the voice prompt
+1. Dial '*'732 and wait for the voice prompt
 2. Enter the password (pin_number) followed by the pound sign# 
    Enter at least a 3 digit number.  This will label the recording file. (recording100.wav)
 3. start talking to make the recording after the voice prompt and press the pound key #

source/applications/ring_group.rst

@@ -0,0 +1,32 @@
+###########
+Ring Group
+###########
+
+|
+
+A ring group is a set of destinations that can be called with a ring strategy.
+
+To add a ring group click the plus.
+
+.. image:: ../_static/images/fusionpbx_ring_group.jpg
+        :scale: 85%
+
+
+*  **Name** Simply the meaningful name of the Ring group (shows after the Extension in menu selections).
+*  **Extension** The Dial-able extension for this group standard config states as a 2-7 number extension.
+*  **Strategy** The selectable way in which the destinations are being used.
+*      **Simultaneous** Rings all defined Destinations.
+*      **Sequence**  Where order that is lower goes first.
+*      **Enterprise** Works with follow me.
+*      **Rollover** calls destinations in sequence and skips busy destinations.
+*      **Random** A random destination will ring.
+*  **Destinations** The extensions that this ring group applies to.
+*  **Prompt** Where you determine if the call must have a dial to confirm before a pickup event.
+*  **CID Name Prefix** The string that is added to the caller ID when it displays on the ringing extension.
+*  **CID Number Prefix** The **Number** that is added to the caller ID when it displays on the ringing extension.
+*  **Ring Back** What the caller hears when they are waiting for the **Destinations** to answer.
+*  **Context** The grouping that this ring group will search as specified in the configuration of your Extensions (if this excludes an extension it will not ring)
+
+.. image:: ../_static/images/fusionpbx_ring_group1.jpg
+        :scale: 85%
+

source/applications/time_conditions.rst

@@ -0,0 +1,18 @@
+################
+Time Conditions
+################
+
+|
+
+Dynamically route calls to an IVR menu, external numbers, scripts, or other destinations based on time conditions.  Fields in **bold** are mandatory.
+
+
+*  **Name** Name of the 
+*  **Extension** Define an extension number that is NOT allready created.
+*  Presets
+*  Alternate Destination 
+*  **Order** 
+*  **Enabled**  If the ring group is enabled.
+
+.. image:: ../_static/images/fusionpbx_time_conditions.jpg
+        :scale: 85%

source/applications_optional/xmpp.rst

@@ -78,7 +78,8 @@ XMPP Manager
  Advanced -> Context: your.domain.com
 
 | Save the settings and restart the module. Restart the 'XMPP' module from Advanced -> Modules page. 
-Go back to Accounts -> XMPP if the status says **'AUTHORIZED'** then you are ready to go.
+| Go back to Accounts -> XMPP if the status says **'AUTHORIZED'** then you are ready to go.
+
 | **Note** If you are not getting AUTHORIZED you might need to goto the google account settings and choose "Allow less secure apps: ON" under the Sign-in & security section.
 
 |
@@ -100,7 +101,7 @@ Go back to Accounts -> XMPP if the status says **'AUTHORIZED'** then you are rea
  Press Save
 
 | If your XMPP profile is named something other than gtalk edit the outbound route you just created.
-Bridge statement should look like: dingaling/gtalk/[email protected] replace gtalk with the profile name you chose and then save it.
+| Bridge statement should look like: dingaling/gtalk/[email protected] replace gtalk with the profile name you chose and then save it.
 
 |
 
@@ -136,8 +137,7 @@ Goto Fusionpbx GUI
 | Goto the GUI and click advanced > menu manager > edit icon > click "Restore Defaults" at top right
 |
 
-| Then goto Advanced > Upgrade
-click Schema, Data Types, and Permission Defaults then click execute
+| Then goto Advanced > Upgrade click Schema, Data Types, and Permission Defaults then click execute
 
 |
 | Click status > sip status > Flush Memcache

source/conf.py

@@ -24,7 +24,7 @@ import os
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
-
+#umpydoc_show_class_members = False
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
@@ -56,9 +56,9 @@ copyright = u'2008-2016, Mark J Crane'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0'
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0'
+release = '4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -133,7 +133,7 @@ html_favicon = "_static/images/favicon.ico"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

source/extensions_ivr/extensions.rst

@@ -1,6 +1,6 @@
-************
+===========
 Extensions
-************
+===========
 
 | Welcome to the adding Extensions section.  Here you will find how to add Extensions. 
 
@@ -75,9 +75,9 @@ Enter information as needed.
 
 |
 
-************
+==================
 Registering Phones
-************
+==================
 
 |
 
@@ -141,9 +141,9 @@ Click **Update** then click **Apply** at the bottom
 
 |
 
-- Troubleshooting tips
+Troubleshooting tips
+~~~~~~~~~~~~~~~~~~~~
 
-|
 
 * Check, double check that the correct extension number and password is being used.
 * Reboot the device.
@@ -151,6 +151,7 @@ Click **Update** then click **Apply** at the bottom
 * Make sure you have created an DNS A record for the domain being used and there are no typos
 * Nat, firewalls and router settings.  Some brands of routers can cause issues.  Google the make and model of router or firewall appliance for common settings or remedies.
 * Visit Grandstream Supoprt http://www.grandstream.com/support
+
 |
 
 Zoiper
@@ -165,6 +166,7 @@ Registering an **Extension** using the softphone Zoiper.
 In the ever changing world of voip businesses are moving away from hardware phones.  From call centers to home offices Zoiper and many other softphones make use of software for communication needs for not only voice but video and faxing. This example will show how to register an extension using Zoiper for Windows. *Note* Zoiper can be used on several operating systems and mobile devices.
 
 |
+
 1. Download the software. .. Zoiper: http://www.zoiper.com/
 2. Install the software.
 3. If the software isn't open click the Zoiper icon to open from the desktop or start menu.
@@ -224,11 +226,3 @@ In the ever changing world of voip businesses are moving away from hardware phon
 * Make sure you have created an DNS A record for the domain being used and there are no typos
 * Nat, firewalls and router settings.  Some brands of routers can cause issues.  Google the make and model of router or firewall appliance for common settings or remedies.
 * Visit Zoiper Community Supoprt http://community.zoiper.com/
-
-|
-
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  extensions_ivr/extensions.rst

source/gateway_inbound_outbound/gateway.rst

@@ -1,5 +1,5 @@
 Inbound Destination setup
-===========
+==========================
 
 Inbound destinations are the DID/DDI, DNIS or Alias for inbound calls.
 
@@ -48,7 +48,7 @@ button on the right.
 
 
 Outbound setup
-===========
+===============
 
 Route outbound calls to gateways, tdm, enum and more. When a call matches the conditions the call to outbound routes. 
 

source/gateway_inbound_outbound/gateway1.rst

@@ -1,10 +1,11 @@
 Gateway setup
-===========
+==============
 
 .. image:: ../_static/images/logo_right.png
         :scale: 85%
   
 |
+
 Gateways provide access into other voice networks. These can be voice providers or other systems that require SIP registration.
   
 |

source/getting_started.rst

@@ -20,4 +20,4 @@ Follow the menu to the left and you will have a working PBX in no time. For PDF
   getting_started/installation_recommended_new.rst
   getting_started/register_phones.rst
   getting_started/post_installation.rst
-  iptables.rst
+  iptables1.rst

source/getting_started/installation_recommended.rst

@@ -1,10 +1,14 @@
 *****************
-New Install
+Old Install
 *****************
 .. image:: ../_static/images/logo_right.png
         :scale: 85% 
 *************
 
+
+CLICK HERE FOR THE NEW INSTALL http://docs.fusionpbx.com/en/latest/getting_started/installation_recommended_new.html
+
+
     Welcome to the FUSIONPBX getting started guide.  In this section we will show how to install FUSIONPBX.  FUSIONPBX can be used on multiple different operating systems, databases, and web servers.  In this guide we will show on Debian 8 (Jessie), Postgresql and NGINX.  **Please note to have a clean install.  The install script will install everthing but the Operating System**
     
     

source/getting_started/installation_recommended_new.rst

@@ -11,6 +11,8 @@ Welcome to the FUSIONPBX getting started guide.  In this section we will show ho
 **1.** Goto a console and follow the recomended steps from http://fusionpbx.com/download.php for a standard installation.  Some installations require special considerations.  Visit https://github.com/fusionpbx/fusionpbx-install.sh readme section for more details.
 
 This install script is designed to be an fast, simple, and in a modular way to install FusionPBX. Start with a minimal install of Debian 8 with SSH enabled. Run the following commands under root. The script installs FusionPBX, FreeSWITCH release package and its dependencies, IPTables, Fail2ban, NGINX, PHP FPM and PostgreSQL.
+
+Also, be sure to watch the youtube video from FreeSWITCH Cluecon Weekly https://www.youtube.com/embed/kejAxlYSW3o FusionPBX is installed and more!
      
 ::
      
@@ -101,6 +103,17 @@ Install Finished  **Login with the username and password you choose during the i
         :scale: 80%
       
     
+
+|
+Run App defaults
+
+::
+
+  Go to the menu and choose Advanced -> Upgrade select the checkbox for App defaults then execute.
+  
+.. image:: ../_static/images/fusionpbx_upgrade_page.jpg
+        :scale: 85%  
+
 |
 Start Sip Profiles
 
@@ -120,17 +133,7 @@ Start Memcached
     
 .. image:: ../_static/images/fusionpbx_start_memcached.jpg
         :scale: 85%
-
-|
-Run App defaults
-
-::
-
-  Go to the menu and choose Advanced -> Upgrade select the checkbox for App defaults then execute.
-  
-.. image:: ../_static/images/fusionpbx_upgrade_page.jpg
-        :scale: 85%  
-
+        
 |
 **Note**: To display the logo at the top and not in the menu