ソースを参照

Merge pull request #47 from Len-PGH/master

Add content, images, format improvements
FusionPBX 9 年 前
コミット
b375a2144e

BIN
source/_static/images/fusionpbx_ring_group1.jpg


BIN
source/_static/images/fusionpbx_time_conditions.jpg


+ 43 - 43
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**

+ 6 - 7
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%

+ 4 - 9
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

+ 24 - 16
source/advanced/upgrade.rst

@@ -1,6 +1,6 @@
-##########
+**********
 Upgrade
-##########
+**********
 
 
 The FusionPBX code is constantly evolving. Bug fixes being submitted, additions to improve security, making FusionPBX look nicer, to be more flexible, and best of all new features. A complete summary of the changes can be found on the github code page https://github.com/fusionpbx/fusionpbx/commits/master .  Initially google code svn was the place to download code from but since that has closed github is where the code now lives.  
@@ -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:
 
 ::
 
@@ -213,18 +214,22 @@ Version Upgrade
 ################
 
 |
+
 Version Upgrade can take several steps to perform. Below will show how to upgrade from specific versions.
 
 |
+
 Version 4.0 to 4.2
 ^^^^^^^^^^^^^^^^^^
 
 1. Update code from the GUI. Advanced > Upgrade page (Only check this box then click execute)
 
-::
 
- [Note] 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.
+ .. note::
+ 
+  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.
+
 
 ::
 
@@ -288,7 +293,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:
@@ -300,19 +305,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. 
@@ -333,7 +339,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.
 
 ::

+ 5 - 4
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

+ 3 - 2
source/applications/ivr.rst

@@ -1,6 +1,6 @@
-************
+**********
 IVR's
-************
+**********
 
 Welcome to the adding IVR section.  Here you will find how to add IVR's.
 
@@ -25,6 +25,7 @@ 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)

+ 2 - 2
source/applications/recordings.rst

@@ -4,7 +4,7 @@ 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 #

+ 11 - 8
source/applications/ring_groups.rst → source/applications/ring_group.rst

@@ -1,6 +1,6 @@
-***********
-Ring Groups
-***********
+************
+Ring Group
+************
 
 |
 
@@ -15,11 +15,11 @@ To add a ring group click the plus.
 *  **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** 
--      **Rollover** 
--      **Random** A random destination will ring.
+*      **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.
@@ -27,3 +27,6 @@ To add a ring group click the plus.
 *  **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%
+

+ 17 - 0
source/applications/time_conditions.rst

@@ -1 +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 Time Condition.
+*  **Extension** Define an extension number that is NOT allready created.
+*  Presets US Holiday presets.
+*  Alternate Destination If the condition doesnt match the call will goto the defined alternate destination.
+*  **Order** Changes the order of which condition is evaluated first.
+*  **Enabled**  If the ring group is enabled.
+
+.. image:: ../_static/images/fusionpbx_time_conditions.jpg
+        :scale: 85%

+ 4 - 4
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

+ 2 - 2
source/conf.py

@@ -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.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 8 - 14
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

+ 2 - 2
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. 
 

+ 2 - 1
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.
   
 |

+ 2 - 2
source/getting_started.rst

@@ -1,6 +1,6 @@
-***************
+****************
 Getting Started
-***************
+****************
 
 Welcome! 
 Let's install FusionPBX.

+ 9 - 4
source/getting_started/installation_recommended.rst

@@ -1,9 +1,9 @@
-*****************
+*************
 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
@@ -60,12 +60,14 @@ CLICK HERE FOR THE NEW INSTALL http://docs.fusionpbx.com/en/latest/getting_start
      
     **4.** Web browser Installation part
      :Select Language: **Pick your language. Click next**
+
      .. image:: ../_static/images/install_lang.jpg
         :scale: 85%
 
 |
 
-     :Freeswitch Detect: **Detecting folder paths used** 
+     :Freeswitch Detect: **Detecting folder paths used**
+ 
      .. image:: ../_static/images/install_detect_freeswitch.jpg
         :scale: 85% 
 
@@ -75,6 +77,7 @@ CLICK HERE FOR THE NEW INSTALL http://docs.fusionpbx.com/en/latest/getting_start
 |
 
      :Database Configuration: **Click Execute**
+
      .. image:: ../_static/images/install_database_config.jpg
         :scale: 85% 
      
@@ -83,6 +86,7 @@ CLICK HERE FOR THE NEW INSTALL http://docs.fusionpbx.com/en/latest/getting_start
 |
 
      :Admin Login Configuration: **Click Next**
+
      .. image:: ../_static/images/install_admin_username.jpg
         :scale: 85% 
      
@@ -93,6 +97,7 @@ CLICK HERE FOR THE NEW INSTALL http://docs.fusionpbx.com/en/latest/getting_start
 
     **5.** Goto Console and press enter 
     ::
+
      When PostgreSQL is configured come back and press enter.
      
      The FusionPBX installation changed permissions of /usr/local/freeswitch/storage

+ 7 - 3
source/getting_started/installation_recommended_new.rst

@@ -1,7 +1,6 @@
-
-*****************
+*************
 New Install
-*****************
+*************
 .. image:: ../_static/images/logo_right.png
         :scale: 85% 
 
@@ -70,6 +69,7 @@ After you have completed the install you can login with the GUI username and pas
         :scale: 85%
 
 |
+
 Freeswitch Detect **Detecting folder paths used**
     
 .. image:: ../_static/images/install_detect_freeswitch_new.jpg
@@ -105,6 +105,7 @@ Install Finished  **Login with the username and password you choose during the i
     
 
 |
+
 Run App defaults
 
 ::
@@ -115,6 +116,7 @@ Run App defaults
         :scale: 85%  
 
 |
+
 Start Sip Profiles
 
 ::
@@ -125,6 +127,7 @@ Start Sip Profiles
         :scale: 85%
 
 |
+
 Start Memcached
 
 ::
@@ -135,6 +138,7 @@ Start Memcached
         :scale: 85%
         
 |
+
 **Note**: To display the logo at the top and not in the menu
 
 ::

+ 4 - 1
source/getting_started/post_installation.rst

@@ -1,7 +1,10 @@
 *****************
 Post Installation
 *****************
-.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+.. image:: _static/images/logo.png
+        :width: 130pt
+        :align: center
+        :height: 76.5pt
 
 
 After The install is complete please keep the login details from the install in a safe and secure place.  Just in case you need them later.

+ 14 - 13
source/index.rst

@@ -5,6 +5,7 @@
         :height: 76.5pt
 
 |
+
 Welcome to FusionPBX Docs
 =========================
 
@@ -64,19 +65,19 @@ Getting Started
 -------------------
 
 .. toctree::
-    :maxdepth: 2
-
-    getting_started.rst
-    home.rst
-    accounts.rst
-    dialplan.rst
-    applications.rst
-    status.rst
-    advanced.rst
-    manual/menu_add_ons.rst
-    additional_information.rst
-    contributing.rst
-    doc_guide.rst
+   :maxdepth: 2
+
+   getting_started.rst
+   home.rst
+   accounts.rst
+   dialplan.rst
+   applications.rst
+   status.rst
+   advanced.rst
+   manual/menu_add_ons.rst
+   additional_information.rst
+   contributing.rst
+   doc_guide.rst