Merge pull request #23 from Len-PGH/master

Adds and changes

source/Extensions-IVR.rst

@@ -1,5 +1,5 @@
 ************
-Extensions-IVR
+Accounts
 ************
 
 
@@ -8,3 +8,4 @@ Extensions-IVR
   :glob:
 
   Extensions-IVR/Extensions.rst
+  Gateway-Inbound-Outbound/Gateway1.rst

source/Extensions-IVR/Extensions.rst

@@ -2,58 +2,105 @@
 Extensions
 ************
 
+|
+|
+
 Welcome to the adding Extensions section.  Here you will find how to add Extensions. 
 
-.
+|
+|
+
 
+Goto **Accounts** then click **Extensions**
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12153364/86f061b8-b487-11e5-8667-5a753994a3b9.jpg
 
-.
+|
+|
+
+
+Then click the
+
+ .. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
 
+on the right.
+
+|
 
-.
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12153359/86e7c814-b487-11e5-91ef-c1a1d89198c5.jpg
 
-.
+|
+|
+
+Enter the desired *extension* starting number.  From the dropdown *Range* box you can choose the desired block of extensions to start with. This can be done again later if needing more extensions.  Click **save** once entry is completed.  Entry can be customized for each idividual extension after this point.
 
-.
+|
+|
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12153358/86e71cd4-b487-11e5-8e46-4d78dd358db1.jpg
 
-.
+|
+|
+
+
 
 
-.
+We now have extensions. Each extension has and edit icon beside it.  Click the edit icon
 
-.
+|
+|
 
-Click the edit icon
+ .. image:: https://cloud.githubusercontent.com/assets/13131198/12153361/86eba8b2-b487-11e5-9e81-c6bac7fa355b.jpg
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12153361/86eba8b2-b487-11e5-9e81-c6bac7fa355b.jpg
+to customize internal, external, emergency caller id and other fine tuned options.  You can also access **Call Control** from here. 
+
+
+
+|
+|
 
-.
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12153360/86ea9db4-b487-11e5-8b6a-2c6bf8768e74.jpg
 
-.
+|
+|
+
+
 
 
+Enter information as needed.
 
-.
+|
+
+- **Extenson:** This is the extension number or name if used with Number Alias
+- **Number Alias:** Number extension if extension is a name
+- **Password:** mouse over to see the password
+- **User List:** Add a user for this extesnion to login to the FusionPBX GUI interface
+- **Voicemail Password:** Password for this extensions voicemail
+- **Device Provisioning:** Used for hardware devices like voip phones and ata's
+- **Account Code:** Can be used for billing
+- **Effective Caller ID Name:** Used for internal caller id
+- **Effective Caller ID Number:** Used for internal caller id
+- **Outbound Caller ID Name:** Used for external (public) caller id
+- **Outbound Caller ID Number:** Used for external (public) caller id
+- **Emergency Caller ID Name:** Can be set to a national standard or local emergency entity
+- **Emergency Caller ID Number:** Can be set to a national standard or local emergency entity
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12153357/86e5a980-b487-11e5-81ad-2944bff0f0bf.jpg
 
-.
+|
+|
+
 
 
 
 
-.
+|
+|
+
 
 
-.
 
 ************
 IVR's
@@ -61,18 +108,52 @@ IVR's
 
 Welcome to the adding IVR section.  Here you will find how to add IVR's.
 
-.
+|
+|
+
+
+
+Click on **Apps** then **IVR Menu**
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12327857/a5afd258-baa6-11e5-8f95-d88ce89620f1.jpg
+
+|
+|
+
+
+
+
+Then click the
+
+ .. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
+
+on the right. 
+
+
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12327856/a5ad2666-baa6-11e5-9480-325a5466e360.jpg
+
+|
+|
+
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12327858/a5af734e-baa6-11e5-9b92-af7ead13206b.jpg
+
+|
+|
+
 
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12327855/a5ab18ee-baa6-11e5-9b0b-19a0a3e91cf2.jpg
 
-.
+|
+|
 
-.
 
-.
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12327859/a5b410d4-baa6-11e5-9580-60184aab32ff.jpg
 
-.
+|
+|
 
-.
 
 .. toctree::
   :maxdepth: 3

source/Gateway-Inbound-Outbound.rst

@@ -1,5 +1,5 @@
 *************
-Gateway Inbound Outbound
+Dialplan
 *************
 
 

source/Gateway-Inbound-Outbound/Gateway.rst

@@ -1,57 +1,3 @@
-Gateway setup
-===========
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
-  
-  
-.. rubric:: .
-.. rubric:: .
-
-**In this example we will be using** `VoiceTel <http://tiny.cc/voicetel>`_ .  **Each Gateway provider has their own setings to use.**    
-   
-    
-
-
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12149664/e05ebd40-b472-11e5-83c3-5931c7c409d3.jpg 
-
-`Click to visit <http://tiny.cc/voicetel>`_  
-    
-.. rubric:: .
-.. rubric:: .
-    
-
-
-Select **Accounts** from the drop-down list and click on **Gateways**. 
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148465/999cf76a-b46c-11e5-85ae-e42c0d3dc97b.jpg
-
-.
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148464/999caf08-b46c-11e5-832e-b13240e01bc5.jpg
-
-
-Click the 
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
-
-button on the right. Enter the gateway information below and Click on **Save** once complete.
-
-::
-
-  Gateway: VoiceTel 
-  Username: 0123456789 
-  Password: 1b3d5f7h9j 
-  From user: 0123456789 
-  From domain: sbc.voicetel.com 
-  Proxy: sbc.voicetel.com 
-  Register: true 
-  Enabled: true 
-.
-
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148466/99a8a5ba-b46c-11e5-80d2-4aca54114640.jpg
-
-
 Inbound Destination setup
 ===========
 
@@ -81,14 +27,16 @@ button on the right.
  Enabled: true
  Description: VoiceTel-in
  
- 
+|
+|
  
 ::
 
  Optional: Replace ^(?:\+?1)?(\d{10})$ in Inbound Routes with either 0123456789 or a DID Number depending on the Route Destination setting.
  
 
-.
+|
+|
 
 
 Outbound setup
@@ -110,14 +58,19 @@ Click the
 
 button on the right. Enter the route information below and Click **Save** once complete.
 
-.
+|
+|
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12156743/e8f91c0c-b49a-11e5-88c5-f2475fc1bfad.jpg
 
-.
+|
+|
 
 .. image:: https://cloud.githubusercontent.com/assets/13131198/12157521/633bfb4c-b4a0-11e5-9019-8217560076cc.jpg
 
+|
+|
+
 ::
 
  Gateway: VoiceTel
@@ -126,6 +79,8 @@ button on the right. Enter the route information below and Click **Save** once c
  Enabled: true
  Description: VoiceTel-out
 
+|
+|
 
 **By using** `VoiceTel <http://tiny.cc/voicetel>`_ **you help support FusionPBX.  Thank you for your support!**
 

source/Gateway-Inbound-Outbound/Gateway1.rst

@@ -0,0 +1,56 @@
+Gateway setup
+===========
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+  
+  
+|
+|
+
+**In this example we will be using** `VoiceTel <http://tiny.cc/voicetel>`_ .  **Each Gateway provider has their own setings to use.**    
+   
+    
+
+
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12149664/e05ebd40-b472-11e5-83c3-5931c7c409d3.jpg 
+
+`Click to visit <http://tiny.cc/voicetel>`_  
+    
+|
+|
+    
+
+
+Select **Accounts** from the drop-down list and click on **Gateways**. 
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12148465/999cf76a-b46c-11e5-85ae-e42c0d3dc97b.jpg
+
+|
+|
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12148464/999caf08-b46c-11e5-832e-b13240e01bc5.jpg
+
+
+Click the 
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
+
+button on the right. Enter the gateway information below and Click on **Save** once complete.
+
+::
+
+  Gateway: VoiceTel 
+  Username: 0123456789 
+  Password: 1b3d5f7h9j 
+  From user: 0123456789 
+  From domain: sbc.voicetel.com 
+  Proxy: sbc.voicetel.com 
+  Register: true 
+  Enabled: true 
+
+|
+|
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12148466/99a8a5ba-b46c-11e5-80d2-4aca54114640.jpg
+

source/Iptables.rst

@@ -7,30 +7,45 @@ Basic Rules
 ===========
 
 | ``iptables -A INPUT -i lo -j ACCEPT``
+
 | ``iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT``
+
 | ``iptables -A INPUT -p tcp --dport 22 -j ACCEPT``
+
 | ``iptables -A INPUT -p tcp --dport 80 -j ACCEPT``
+
 | ``iptables -A INPUT -p tcp --dport 443 -j ACCEPT``
+
 | ``iptables -A INPUT -p tcp --dport 5060 -j ACCEPT``
+
 | ``iptables -A INPUT -p udp --dport 5060 -j ACCEPT``
+
 | ``iptables -A INPUT -p tcp --dport 5080 -j ACCEPT``
+
 | ``iptables -A INPUT -p udp --dport 5080 -j ACCEPT``
+
 | ``iptables -A INPUT -p udp --dport 16384:32768 -j ACCEPT``
+
 | ``iptables -A INPUT -p udp --dport 1194 -j ACCEPT``
+
 | ``iptables -P INPUT DROP``
+
 | ``iptables -P FORWARD DROP``
+
 | ``iptables -P OUTPUT ACCEPT``
+|
 
 ICMP (optional)
 ===============
 
-`` iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT``
+| ``iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT``
 
 Friendly Scanner
 ================
 
 Rules to block not so friendly scanner
 
+|
 | ``iptables -I INPUT -j DROP -p tcp --dport 5060 -m string --string "friendly-scanner" --algo bm``
 | ``iptables -I INPUT -j DROP -p tcp --dport 5080 -m string --string "friendly-scanner" --algo bm``
 | ``iptables -I INPUT -j DROP -p udp --dport 5060 -m string --string "friendly-scanner" --algo bm``
@@ -39,29 +54,31 @@ Rules to block not so friendly scanner
 Show iptable rules
 ==================
 
-``sudo iptables -L -v``
+| ``sudo iptables -L -v``
 
 Show line numbers
 =================
 
-``iptables -L -v --line-numbers``
+| ``iptables -L -v --line-numbers``
 
 Delete a line
 =============
 
 Delete line 2
 
-``iptables -D INPUT 2``
+| ``iptables -D INPUT 2``
 
 Block IP address
 ================
 
-iptables -I INPUT -s 62.210.245.132 -j DROP
+| ``iptables -I INPUT -s 62.210.245.132 -j DROP``
 
 Save Changes
 ============
 
-Debian / Ubuntu
+Debian & Ubuntu
 
-| `` apt-get install iptables-persistent``
-| `` service iptables-persistent save``
+|
+| ``apt-get install iptables-persistent``
+| ``service iptables-persistent save``
+|

source/Phones.rst

@@ -0,0 +1,20 @@
+************
+Applications
+************
+
+|
+|
+
+Welcome to the Registering Phones section.  Here you will find how to configure some of the most popular phones to use with FusionPBX. 
+
+|
+|
+
+
+
+.. toctree::
+  :maxdepth: 3
+  :glob:
+
+
+  Phones/Phones.rst

source/Phones/Phones.rst

@@ -0,0 +1,27 @@
+************
+Registering Phones
+************
+
+|
+|
+
+Welcome to the Registering Phones section.  Here you will find how to configure some of the most popular phones to use with FusionPBX. 
+
+|
+|
+
+Grandstream
+============
+
+|
+|
+
+
+Zoiper
+=======
+
+|
+|
+
+
+

source/domains.rst

@@ -1,5 +1,5 @@
 ************
-Domains
+Advanced
 ************
 
 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

source/domains/domains.rst

@@ -1,9 +1,47 @@
 ************
 Domains
 ************
+|
 
-Welcome to the adding a domain section.  Here you will find how to add a domain so that you can reach the specific tennant from
-the multi-tennant domain side menu to configure and allow secure administration from the world wide web. 
+  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. 
+
+|
+|
+
+===============
+Adding a domain
+===============
+
+|
+|
+
+
+  There are several reasons to create a domain (tenant).  One reason would be to organize customers and so customers have a unique login *ie* [email protected] or [email protected] as the username. 
+
+  In this example we will create a domain.  
+
+Goto advanced then click Domains.
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12263211/4e5f9e7c-b8fb-11e5-8765-2088871e3abb.jpg
+
+Then click the
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
+
+on the right.
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12263214/4e6107da-b8fb-11e5-990d-94ad3c684965.jpg
+
+This will bring you to enter domain info. (Be sure to create an "A record" from your domain hosting account)
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12263212/4e601550-b8fb-11e5-806c-927c6f2ee3eb.jpg
+
+Click **save** once entry is complete.
+
+.. image:: https://cloud.githubusercontent.com/assets/13131198/12263214/4e6107da-b8fb-11e5-990d-94ad3c684965.jpg
+
+|
+|
 
 .. toctree::
   :maxdepth: 3

source/getting-started/installation-recommended.rst

@@ -15,7 +15,7 @@ New Install
      
      cd /usr/src 
      apt-get install wget  
-     wget https://raw.githubusercontent.com/fusionpbx/fusionpbx-scripts/master/install/ubuntu/install_fusionpbx.sh  
+     wget https://raw.githubusercontent.com/fusionpbx/fusionpbx-scripts/master/install/debian/install_fusionpbx.sh  
      chmod 755 install_fusionpbx.sh 
      ./install_fusionpbx.sh install-both auto 
      

source/index.rst

@@ -12,6 +12,8 @@ Welcome to FusionPBX Docs
 flexible web interface to the very powerful and highly scalable
 multi-platform voice switch called `FreeSWITCH`_.
 
+|
+
 It can be run on the operating system you are comfortable with, and
 hardware of your choice. FusionPBX provides a GUI for for unlimited
 extensions, voicemail-to-email, music on hold, call parking, analog
@@ -20,14 +22,20 @@ provides the functionality your business needs, and brings corporate
 level phone system features to small, medium and large businesses. Read
 more at `FusionPBX`_.
 
+|
+
 Benefits of FusionPBX
 ---------------------
 
+|
+
 1. Adds extra functionality to the incredibly robust FreeSWITCH VoIP Platform.
 2. Makes FreeSWITCH easy to administer - while at the same time
    still allowing you to work directly within FreeSWITCH CLI when you need to. 
 3. Gives your users and tenants an attractive GUI interface to interact with the myriad PBX services FusionPBX provides:
 
+|
+
 * Voicemail
 * Fax
 * Follow-Me
@@ -44,15 +52,21 @@ Benefits of FusionPBX
 * Voicemail
 * and lots more...
 
+|
+
 Our Eco-System
 --------------
 We are **community** driven and as such have a open and **very friendly** eco-system, we encourage community engagement, contribution and feedback. Please join us and get involved by giving us feedback and new feature ideas or helping out with code or Documentation.
 
+|
+
 Most of the core folks who develop and use FusionPBX can be found hanging out in Freenode IRC in the **#fusionpbx** channel. Why not come join us and meet the team?
 
 .. _FreeSWITCH: http://www.freeswitch.org
 .. _FusionPBX: http://www.fusionpbx.com
 
+|
+
 Getting Started
 -------------------
 
@@ -60,10 +74,10 @@ Getting Started
     :maxdepth: 2
 
     getting-started.rst
-    installation.rst
-    domains.rst
     Extensions-IVR.rst
     Gateway-Inbound-Outbound.rst
+    Phones.rst
+    domains.rst
     manual.rst
     contributing.rst
     doc-guide.rst

source/installation.rst

@@ -1,13 +0,0 @@
-************
-Installation
-************
-
-Welcome to the Installation section.  Here you will find Getting started Guides on how to install FusionPBX different operating systems.  The default method is on Debian 8 (Jessie) with the recomended install script 
-
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  getting-started/new-install.rst
-  installation/debian-pkgs
-  installation/debian-iso-install

source/installation/debian-iso-install.rst

@@ -1,9 +0,0 @@
-********************
-Debian - ISO Install
-********************
-
-.. warning::
-
-   The version of the ISO available is extremely old and at this time is not recommended for use. If at a later stage a newer ISO is available this warning will be removed and a link to the ISO will be added.
-
-

source/installation/debian-pkgs.rst

@@ -1,5 +0,0 @@
-***********************
-Debian - Manual Install
-***********************
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 

source/manual.rst

@@ -14,4 +14,4 @@ User Manual
   manual/apps
   manual/status
   manual/advanced
-  manual/multi-tenancy
+  manual/multi-tenant