浏览代码

Corrections and improvements to docs, updated TOC (#286)

* Update default_settings.md

* Update gmail.md

* Update email_error_log.md

* Update smtp2go.md

* Update freeswitch.md

* Update sip_tls.md

* Update toll_allow.md

* Update nat.md

* Update provision.md

* Update provision.md

* Update provision_auto_cisco.md

* Update provision_auto_htek.md

* Update provision_auto_cisco.md

* Update provision_auto_snom.md

* Create provision_auto_avaya.md

* Update provision_auto_avaya.md
AdSecIT 5 月之前
父节点
当前提交
0ec8546e63

+ 3 - 5
source/additional_information/freeswitch.md

@@ -364,9 +364,9 @@ or
 
 Add the following
 
-::
 
-:   #check process freeswitch with pidfile
+
+    #check process freeswitch with pidfile
     /usr/local/freeswitch/run/freeswitch.pid check process freeswitch
     with pidfile /run/freeswitch/freeswitch.pid start program =
     \"/usr/bin/service freeswitch start\" stop program =
@@ -374,9 +374,7 @@ Add the following
 
 or
 
-::
-
-:   #check process freeswitch with pidfile
+    #check process freeswitch with pidfile
     /usr/local/freeswitch/run/freeswitch.pid #start program =
     \"/usr/local/freeswitch/bin/./freeswitch -nc -u www-data\" #stop
     program = \"/usr/local/freeswitch/bin/./freeswitch -stop\" check

+ 7 - 7
source/additional_information/nat.md

@@ -7,9 +7,9 @@ audio working in both directions.
 
 ## Default config
 
-The external[rtp_ip]{#rtp_ip} and external[sip_ip]{#sip_ip} are set to
-\$\${local[ip_v4]{#ip_v4}} in Advanced -\> Variables by default or
-Advanced \> Sip Profile settings. The local[ip_v4]{#ip_v4} variable is
+The external_rtp_ip and external_sip_ip are set to
+$${local_ip_v4} in Advanced -\> Variables by default or
+Advanced \> Sip Profile settings. The local_ip_v4 variable is
 auto detected by FreeSWITCH. The variable can be also be overidden as a
 preset variable before it is used if you want to control the IP address
 that it represents.
@@ -32,9 +32,9 @@ move SIP to a non standard port.
 FusionPBX is behind NAT and you have a static public IP address and you
 have phones on the same network and/or outside the network.
 
--   Set external[rtp_ip]{#rtp_ip} to autonat:xxx.xxx.xxx.xxx
+-   Set external_rtp_ip to autonat:xxx.xxx.xxx.xxx
     (xxx.xxx.xxx.xxx can be used also in some instances)
--   Set external[sip_ip]{#sip_ip} to autonat:xxx.xxx.xxx.xxx
+-   Set external_sip_ip to autonat:xxx.xxx.xxx.xxx
     (xxx.xxx.xxx.xxx can be used also in some instances)
 -   If you don\'t register a gateway to the carrier you may need to port
     forward SIP and RTP.
@@ -47,8 +47,8 @@ have a firewall that is capable of UPnP or PMP.
 -   Enable UPnP or PMP in your firewall
 -   In Debian OS /etc/default/freeswitch remove -nonat
 -   Make systemd aware of the changes. systemctl daemon-reload
--   Set external[rtp_ip]{#rtp_ip} to auto-nat
--   Set external[sip_ip]{#sip_ip} to auto-nat
+-   Set external_rtp_ip to auto-nat
+-   Set external_sip_ip to auto-nat
 -   Restart FreeSWITCH. service freeswitch restart
 
 ## Symptoms of misconfigured NAT

+ 2 - 2
source/additional_information/sip_tls.md

@@ -1,7 +1,7 @@
 # SSL/TLS Setup
 
 On a new installation of FusionPBX, TLS for SIP is available to use once
-you run [letsencrypt.sh](../getting_started/lets_encrypt.html) and make
+you run [letsencrypt.sh](../getting_started/lets_encrypt.md) and make
 a few setting changes in FusionPBX.
 
 ## Configure TLS
@@ -11,7 +11,7 @@ steps.
 
 -   First open an ssh terminal or console window.
 -   cd /usr/src/fusionpbx-install.sh/debian/resources/
--   Execute [letsencrypt.sh](../getting_started/lets_encrypt.html)
+-   Execute [letsencrypt.sh](../getting_started/lets_encrypt.md)
 -   Login to your FusionPBX installation.
 -   Go to Advanced \> Variables.
 -   Scroll down to **SIP Profile:** Internal (This can be done on any

+ 7 - 7
source/additional_information/toll_allow.md

@@ -6,7 +6,7 @@ is provided in the extension configuration, the default dialplan DOES
 NOT make use of it. Therefore if you want to use it you need to add
 statements to the dialplan to enable it.
 
-An example for the contents of the toll[allow]{#allow} variable would
+An example for the contents of the toll_allow variable would
 be:
 
 You can then add information to your dialplan to process this variable.
@@ -25,12 +25,12 @@ FusionPBX GUI select an outbound route and add
 You\'ll need to do that for all of your outbound routes, tag them local,
 domestic, or international depending on what they are. On some
 installations this example file will be present in
-/usr/local/freeswitch/conf/dialplan/default/01[example.com.xml]{#example.com.xml}:
+/usr/local/freeswitch/conf/dialplan/default/01_example.com.xml:
 
 ## PERMIT TOLL CALLS
 
 This example assumes all calls are bad (except internal) unless they are
-flagged as good by the value of the toll[allow]{#allow} variable.
+flagged as good by the value of the toll_allow variable.
 
     <include>
     <extension name="local.example.com">
@@ -112,10 +112,10 @@ there is a gateway for each type of route.
 
 <br>
 
-Edit extensions with proper toll[allow]{#allow} variables to permit use of new outbound routes.
+Edit extensions with proper toll_allow variables to permit use of new outbound routes.
 
 - Each extension can have multiple permissions listed in
-    toll[allow]{#allow}.
+    toll_allow.
 
 Extension with **local** and **domestic** calling permission can dial
 out via both the \"local\" and \"domestic\" outbound routes above
@@ -129,7 +129,7 @@ or 11 digit numbers in the \"domestic\" outbound route
 
 ![image](../_static/images/additional_information/toll-allow-example-extension-domestic-only.png)
 
-Outbound routes can also have multiple toll[allow]{#allow} patterns. For
+Outbound routes can also have multiple toll_allow patterns. For
 example, if you only define a single variable per extension, you would
 probably want the *domestic* permission to include *local* calls
 
@@ -138,6 +138,6 @@ defined.
 
 ![image](../_static/images/additional_information/toll-allow-example-outbound-route-edit.png)
 
-With the above toll[allow]{#allow} condition test, if an extension has
+With the above toll_allow condition test, if an extension has
 either \"local\" or \"domestic\" assigned they are allowed to use the
 **local** outbound route

+ 51 - 46
source/advanced/default_settings.md

@@ -1,23 +1,23 @@
 # Default Settings
 
-Default Settings used for all domains. Branding can be done in this section, [see here to adjust](../advanced/domains.html#override-a-default-setting-for-one-domain) or copy settings to specific domains.
+Default Settings used for all domains. Branding can be done in this section, [see here to adjust](../advanced/domains.md#override-a-default-setting-for-one-domain) or copy settings to specific domains.
 
 ![FusionPBX Advanced Default Settings](../_static/images/advanced/fusionpbx_advanced_default_settings.jpg)
 
 Default Settings have several different categories. Click on the category to view more details.
 
-## [Cache](default_settings/cache.html)
+## Cache
 
 Option to use file cache for XML and not memcache.
 
 | Default Setting Subcategory | Default Setting Name | Default Setting Value | Default Setting Enabled | Default Setting Description     |
 |-----------------------------|----------------------|-----------------------|-------------------------|---------------------------------|
-| method                      | text                 | memcache              | TRUE                    | Cache methods file or memcache. |
-| location                    | text                 | /tmp                  | TRUE                    | Location for the file cache.    |
+| method                      | text                 | file              | TRUE                    | Cache methods file or memcache. |
+| location                    | text                 | /var/cache/fusionpbx  | TRUE                    | Location for the file cache.    |
 
-## [Call Center](default_settings/call_center.html)
+## Call Center
 
-FusionPBX menu [Apps > Call Center](../applications/call_center.html)
+FusionPBX menu [Apps > Call Center](../applications/call_center.md)
 
 Defaults for the amount of agent rows for Call Center.
 
@@ -26,9 +26,9 @@ Defaults for the amount of agent rows for Call Center.
 | agent_add_rows              | numeric              | 5                     | TRUE                    | Number of default "add" rows.  |
 | agent_edit_rows             | numeric              | 1                     | TRUE                    | Number of default "edit" rows. |
 
-## [CDR](default_settings/cdr.html)
+## CDR
 
-FusionPBX menu [Apps > CDR](../applications/call_detail_record.html)
+FusionPBX menu [Apps > CDR](../applications/call_detail_record.md)
 
 CDR Stat hour limit, call leg, format, limit, http_enabled, archive database, and storage type settings can be set here.
 
@@ -50,9 +50,9 @@ CDR Stat hour limit, call leg, format, limit, http_enabled, archive database, an
 | archive_database              | boolean                | FALSE                   | FALSE                     | Enable Dedicated CDR Database Access |
 | archive_database_name         | text                   | fusionpbx               | FALSE                     | Archive Database Name                |
 
-## [Dashboard](default_settings/dashboard.html)
+## Dashboard
 
-FusionPBX menu [Home > Dashboard](../home/dashboard.html)
+FusionPBX menu [Home > Dashboard](../home/dashboard.md)
 
 Different user level settings that control what is seen and not seen on the dashboard for each user access level.
 
@@ -85,7 +85,7 @@ Different user level settings that control what is seen and not seen on the dash
 
 ## Destinations
 
-FusionPBX menu [Dialplan > Destinations](../dialplan/destinations.html)
+FusionPBX menu [Dialplan > Destinations](../dialplan/destinations.md)
 
 Destinations specific defaults.
 
@@ -93,15 +93,15 @@ Destinations specific defaults.
 |-----------------------------|----------------------|-----------------------|-------------------------|-----------------------------|
 | dialplan_details            | boolean              | TRUE                  | TRUE                    |                             |
 
-## [Domains](default_settings/domain.html)
+## Domains
 
-FusionPBX menu [Advanced > Domains](../advanced/domains.html)
+FusionPBX menu [Advanced > Domains](../advanced/domains.md)
 
 Domain specific defaults.
 
 | Default Setting Subcategory | Default Setting Name | Default Setting Value                                                                                                           | Default Setting Enabled | Default Setting Description                                         |
 |-----------------------------|----------------------|-------------------------------------------------------------------------------------------------------------------------------|-------------------------|---------------------------------------------------------------------|
-| dial_string                 | text                 | {sip_invite_domain=${domain_name},leg_timeout=${call_timeout},presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(*/${dialed_user}@${dialed_domain})} | TRUE                    | The dial string used                                               |
+| dial_string                 | text                 | {sip_invite_domain=\${domain_name},leg_timeout=\${call_timeout},presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(*/\${dialed_user}@\${dialed_domain})} | TRUE                    | The dial string used                                               |
 | template                    | name                 | default                                                                                                                       | TRUE                    | The template used                                                  |
 | menu                        | uuid                 | b4750c3f-2a86-b00d-b7d0-345c14eca286                                                                                          | TRUE                    | The menu uuid                                                      |
 | language                    | code                 | en-us                                                                                                                         | TRUE                    | Choose the language                                                |
@@ -111,7 +111,7 @@ Domain specific defaults.
 | paging                      | numeric              | 100                                                                                                                           | TRUE                    | Set the maximum number of records displayed per page. (Default: 50) |
 | time_zone                   | name                 | America/Los_Angeles                                                                                                           | TRUE                    | Time zone used. Follows UNIX format                                 |
 
-## [Editor](default_settings/domain.html)
+## Editor
 
 FusionPBX menu Advanced > php editor, grammar editor, provision editor, and xml editor.
 
@@ -119,21 +119,21 @@ Editor specific defaults.
 
 | Default Setting Subcategory | Default Setting Name | Default Setting Value | Default Setting Enabled | Default Setting Description                                               |
 |-----------------------------|----------------------|-----------------------|-------------------------|---------------------------------------------------------------------------|
-| indent_guides               | boolean              | FALSE                 | FALSE                   | Set the default visibility of indent guides for Editor.                   |
-| invisibles                  | boolean              | FALSE                 | FALSE                   | Set the default state of invisible characters for Editor.                 |
-| line_numbers                | boolean              | FALSE                 | FALSE                   | Set the default visibility of line numbers for Editor.                    |
+| indent_guides               | text              | FALSE                 | FALSE                   | Set the default visibility of indent guides for Editor.                   |
+| invisibles                  | text              | FALSE                 | FALSE                   | Set the default state of invisible characters for Editor.                 |
+| line_numbers                | text              | FALSE                 | FALSE                   | Set the default visibility of line numbers for Editor.                    |
 | theme                       | text                 | Cobalt                | FALSE                   | Set the default theme.                                                    |
 | font_size                   | text                 | 14px                  | FALSE                   | Set the default text size for Editor.                                     |
 | live_previews               | boolean              | FALSE                 | FALSE                   | Enable or disable live previewing of syntax, text size and theme changes. |
 
-## [Email](default_settings/email.html)
+## Email
 
 This is where you configure email settings to receive email notifications of voicemail, missed calls, and fax.
 
 Here are some example settings for some of the most common email providers:
 
-- [SMTP2GO](http://docs.fusionpbx.com/en/latest/advanced/default_settings/smtp2go.html)
-- [GMAIL](http://docs.fusionpbx.com/en/latest/advanced/default_settings/gmail.html)
+- [SMTP2GO](./default_settings/smtp2go.md)
+- [GMAIL](./default_settings/gmail.md)
 
 | Default Setting Subcategory | Default Setting Name | Default Setting Value          | Default Setting Enabled | Default Setting Description                                                       |
 |-----------------------------|----------------------|--------------------------------|-------------------------|-----------------------------------------------------------------------------------|
@@ -149,12 +149,17 @@ Here are some example settings for some of the most common email providers:
 | method                      | text                 | smtp                           | TRUE                    | smtp\|sendmail\|mail\|qmail                                                       |
 
 Error log for failed or successfully sent messages:
+```{toctree}
+:hidden:
+default_settings/smtp2go.md
+default_settings/gmail.md
+default_settings/email_error_log.md
+```
+- [Email Log](./default_settings/email_error_log.md)
 
-- [Email Log](http://docs.fusionpbx.com/en/latest/advanced/default_settings/email_error_log.rst)
+## Fax
 
-## [Fax](default_settings/fax.html)
-
-[Apps > Fax Server](../applications/fax_server.html)
+[Apps > Fax Server](../applications/fax_server.md)
 
 Specific default settings for fax server.
 
@@ -184,9 +189,9 @@ Specific default settings for fax server.
 | cover_font                        | text                 | times                           | FALSE                   | Font used to generate cover page. Can be full path to .ttf file or font name already installed.|
 | cover_footer                      | text                 |                                 | TRUE                    | Notice displayed in the footer of the cover sheet.                                             |
 
-## [Follow Me](default_settings/follow_me.html)
+## Follow Me
 
-FusionPBX menu [Apps > Follow Me](../applications/follow_me.html)
+FusionPBX menu [Apps > Follow Me](../applications/follow_me.md)
 
 Specific defaults for Follow Me.
 
@@ -195,9 +200,9 @@ Specific defaults for Follow Me.
 | max_destinations            | numeric              | 5                     | FALSE                   | Set the maximum number of Follow Me Destinations. |
 | timeout                     | numeric              | 30                    | FALSE                   | Set the default Follow Me Timeout value.          |
 
-## [IVR Menu](default_settings/ivr_menu.html)
+## IVR Menu
 
-FusionPBX menu [Apps > IVR Menus](../applications/ivr.html)
+FusionPBX menu [Apps > IVR Menus](../applications/ivr.md)
 
 Specific default for IVR Menu.
 
@@ -206,7 +211,7 @@ Specific default for IVR Menu.
 | option_add_rows             | numeric              | 5                     | TRUE                    | Number of default "add" rows.  |
 | option_edit_rows            | numeric              | 1                     | TRUE                    | Number of default "edit" rows. |
 
-## [Limit](default_settings/limit.html)
+## Limit
 
 Limit specific default settings.
 
@@ -221,7 +226,7 @@ Limit specific default settings.
 | ring_groups                 | numeric              | 3                     | FALSE                   | Limit used in Ring Groups.         |
 | users                       | numeric              | 3                     | FALSE                   | Limit used in Users.               |
 
-## [Login](default_settings/login.html)
+## Login
 
 Login specific default settings.
 
@@ -232,7 +237,7 @@ Login specific default settings.
 | domain_name                 | array                | pbx1.yourdomain.com        | FALSE                   | Domain select option displayed on the login box.                                        |
 | message                     | text                 | Welcome to FusionPBX!      | TRUE                    | Display a message at login.                                                             |
 
-## [Provision](default_settings/provision.html)
+## Provision
 
 In the Provisioning section, there are a few key options that have to be set in order to turn auto provisioning on.
 
@@ -418,9 +423,9 @@ In the Provisioning section, there are a few key options that have to be set in
 | yealink_call_waiting                              | text                 | 0                                                                                                                                    | TRUE                    | Call Waiting 1=enabled 0=disable                                                                                                                                            |
 | grandstream_dial_plan                             | text                 | {x+\|*x+\|*++\|\\p\\a\\r\\k\\+*x+\|\\f\\l\\o\\w\\+*x+}                                                                                             | TRUE                    | Define the digits that are allowed to be called.                                                                                                                            |
 
-## [Recordings](default_settings/recordings.html)
+## Recordings
 
-FusionPBX menu [Apps > Recordings](../applications/recordings.html)
+FusionPBX menu [Apps > Recordings](../applications/recordings.md)
 
 Recordings specific default settings.
 
@@ -428,9 +433,9 @@ Recordings specific default settings.
 |-----------------------------|----------------------|-----------------------|-------------------------|---------------------------------------------------|
 | storage_type                | text                 | base64                | FALSE                   | Save recordings in the database in base64 format. |
 
-## [Ring Group](default_settings/ring_group.html)
+## Ring Group
 
-FusionPBX menu [Apps > Ring Group](../applications/ring_group.html)
+FusionPBX menu [Apps > Ring Group](../applications/ring_group.md)
 
 Ring Groups specific default settings.
 
@@ -439,7 +444,7 @@ Ring Groups specific default settings.
 | destination_add_rows        | numeric              | 5                     | TRUE                    | Ring Group "add" rows default.  |
 | destination_edit_rows       | numeric              | 1                     | TRUE                    | Ring Group "edit" rows default. |
 
-## [Security](default_settings/security.html)
+## Security
 
 Security specific default settings.
 
@@ -453,7 +458,7 @@ Security specific default settings.
 | password_lowercase          | boolean              | TRUE                  | TRUE                    | Set whether to require at least one lowercase letter in passwords.                                                            |
 | password_strength           | numeric              | 4                     | TRUE                    | Set the default strength for generated passwords. Valid Options: 1 - Numeric Only, 2 - Include Lower Alpha, 3 - Include Upper Alpha, 4 - Include Special Characters. |
 
-## [Server](default_settings/server.html)
+## Server
 
 Server specific default settings.
 
@@ -461,7 +466,7 @@ Server specific default settings.
 |-----------------------------|----------------------|-----------------------|-------------------------|-----------------------------|
 | temp                        | text                 | /tmp                  | TRUE                    | Set the temp directory.     |
 
-## [Switch](default_settings/switch.html)
+## Switch
 
 Switch specific default settings. These defaults will change depending if you compiled the SWITCH source or used the newest default of packages.
 
@@ -485,7 +490,7 @@ Switch specific default settings. These defaults will change depending if you co
 | storage                     | dir                  | /var/lib/freeswitch/storage           | TRUE                    | Server path for SWITCH storage.           |
 | voicemail                   | dir                  | /var/lib/freeswitch/storage/voicemail | TRUE                    | Server path for SWITCH voicemails.        |
 
-## [Theme](default_settings/theme.html)
+## Theme
 
 Theme specific default settings.
 
@@ -686,9 +691,9 @@ Theme specific default settings.
 | body_color                                      | text                                    | rgba(255,255,255,0.77)                                       | TRUE                    | Set the body background color (and opacity) of the content.                                   |
 | background_image                                | array                                   | /themes/default/images/backgrounds/yellowstone_3.jpg         | FALSE                   |                                                                                               |
 
-## [Time Conditions](default_settings/time_conditions.html)
+## Time Conditions
 
-FusionPBX menu [Apps > Time Conditions](../applications/time_conditions.html)
+FusionPBX menu [Apps > Time Conditions](../applications/time_conditions.md)
 
 Time Conditions specific default settings.
 
@@ -723,9 +728,9 @@ Time Conditions specific default settings.
 | preset_usa                  | array                | {"thanksgiving_day":{"wday":"5","mon":"11","mday":"22-28"}}                 | TRUE                    | USA Holiday                                                 |
 | preset_canada               | array                | {"thanksgiving_day":{"wday":"2","mon":"10","mday":"8-14"}}                  | TRUE                    | Canada Holiday                                              |
 
-## [User](default_settings/user.html)
+## User
 
-FusionPBX menu [Accounts > Users](../accounts/users.html)
+FusionPBX menu [Accounts > Users](../accounts/users.md)
 
 User specific default settings.
 
@@ -738,9 +743,9 @@ User specific default settings.
 | password_lowercase          | boolean              | TRUE                  | TRUE                    | Set whether to require at least one lowercase letter in user passwords.  |
 | password_uppercase          | boolean              | TRUE                  | TRUE                    | Set whether to require at least one uppercase letter in user passwords.  |
 
-## [Voicemail](default_settings/voicemail.html)
+## Voicemail
 
-FusionPBX menu [Apps > Voicemail](../applications/voicemail.html)
+FusionPBX menu [Apps > Voicemail](../applications/voicemail.md)
 
 Voicemail specific default settings.
 

+ 38 - 75
source/advanced/default_settings/email_error_log.md

@@ -1,80 +1,43 @@
 # Email Log
 
-Sucessfully sent email example.
+Successfully sent email example.
 
-    cat /tmp/mailer-app.log
+```
+cat /tmp/mailer-app.log
+```
 
-| X-FusionPBX-Domain-Name: sub.domain.tld
-| 
-| X-FusionPBX-Email-Type: voicemail
-| 
-| X-FusionPBX-Call-UUID: 9jys3222-e9dd-4dc1-89df-aafb21349c5f
-| 
-| X-FusionPBX-Domain-UUID: f98j8df-37da-4cef-bf42-0dc8c2093f9b
-| 
-| Subject: =?utf-8?B?Vm9pY2VtYWlsIGZyb20gNDIwIDw0MjA+IDAwOjAwOjE0?=
-| 
-| From: server notify\<server notify\>
-| 
-| Reply-to:
-| 
-| To: <[email protected]>
-| 
-| Date:
-| 
-| Add Address: <[email protected]>
-| 
-| SMTP -\> FROM SERVER:220 smtp.gmail.com ESMTP d192-v6sm2771356qkb.46 -
-  gsmtp
+- X-FusionPBX-Domain-Name: sub.domain.tld
+- X-FusionPBX-Email-Type: voicemail
+- X-FusionPBX-Call-UUID: 9jys3222-e9dd-4dc1-89df-aafb21349c5f
+- X-FusionPBX-Domain-UUID: f98j8df-37da-4cef-bf42-0dc8c2093f9b
+- Subject: =?utf-8?B?Vm9pY2VtYWlsIGZyb20gNDIwIDw0MjA+IDAwOjAwOjE0?=
+- From: server notify<server notify>
+- Reply-to:
+- To: [email protected]
+- Date:
+- Add Address: [email protected]
+- SMTP -> FROM SERVER:220 smtp.gmail.com ESMTP d192-v6sm2771356qkb.46 - gsmtp
+- SMTP -> FROM SERVER: 250-smtp.gmail.com at your service, [192.168.100.113]
+- 250-SIZE 35882577
+- 250-8BITMIME
+- 250-STARTTLS
+- 250-ENHANCEDSTATUSCODES
+- 250-PIPELINING
+- 250-CHUNKING
+- 250 SMTPUTF8
+- SMTP -> FROM SERVER:220 2.0.0 Ready to start TLS
+- SMTP -> FROM SERVER: 250-smtp.gmail.com at your service, [192.168.100.113]
+- 250-SIZE 35882577
+- 250-8BITMIME
+- 250-AUTH LOGIN PLAIN XOAUTH2 PLAIN-CLIENTTOKEN OAUTHBEARER XOAUTH
+- 250-ENHANCEDSTATUSCODES
+- 250-PIPELINING
+- 250-CHUNKING
+- 250 SMTPUTF8
+- SMTP -> FROM SERVER:250 2.1.0 OK d192-v6sm2771356qkb.46 - gsmtp
+- SMTP -> FROM SERVER:250 2.1.5 OK d192-v6sm2771356qkb.46 - gsmtp
+- SMTP -> FROM SERVER:354  Go ahead d192-v6sm2771356qkb.46 - gsmtp
+- SMTP -> FROM SERVER:250 2.0.0 OK 1527795092 d192-v6sm2771356qkb.46 - gsmtp
+- SMTP -> FROM SERVER:221 2.0.0 closing connection d192-v6sm2771356qkb.46 - gsmtp
 
-| 
-
-| SMTP -\> FROM SERVER: 250-smtp.gmail.com at your service,
-  \[192.168.100.113\]
-| 
-| 250-SIZE 35882577
-| 
-| 250-8BITMIME
-| 
-| 250-STARTTLS
-| 
-| 250-ENHANCEDSTATUSCODES
-| 
-| 250-PIPELINING
-| 
-| 250-CHUNKING
-| 
-| 250 SMTPUTF8
-| 
-| SMTP -\> FROM SERVER:220 2.0.0 Ready to start TLS
-| 
-| SMTP -\> FROM SERVER: 250-smtp.gmail.com at your service,
-  \[192.168.100.113\]
-| 
-| 250-SIZE 35882577
-| 
-| 250-8BITMIME
-| 
-| 250-AUTH LOGIN PLAIN XOAUTH2 PLAIN-CLIENTTOKEN OAUTHBEARER XOAUTH
-| 
-| 250-ENHANCEDSTATUSCODES
-| 
-| 250-PIPELINING
-| 
-| 250-CHUNKING
-| 
-| 250 SMTPUTF8
-| 
-| SMTP -\> FROM SERVER:250 2.1.0 OK d192-v6sm2771356qkb.46 - gsmtp
-| 
-| SMTP -\> FROM SERVER:250 2.1.5 OK d192-v6sm2771356qkb.46 - gsmtp
-| 
-| SMTP -\> FROM SERVER:354 Go ahead d192-v6sm2771356qkb.46 - gsmtp
-| 
-| SMTP -\> FROM SERVER:250 2.0.0 OK 1527795092 d192-v6sm2771356qkb.46 -
-  gsmtp
-| 
-| SMTP -\> FROM SERVER:221 2.0.0 closing connection
-  d192-v6sm2771356qkb.46 - gsmtp
-| 
-| Message sent!
+Message sent!

+ 22 - 77
source/advanced/default_settings/gmail.md

@@ -1,89 +1,34 @@
 # Gmail
 
-Goto Advanced \> Default Settings and under the `Email` Section. Make
-sure these settings are enabled. Once these values are set press the
-**Reload** button at the top right of the page.
+Goto Advanced > Default Settings and under the `Email` Section. Make sure these settings are enabled. Once these values are set press the **Reload** button at the top right of the page.
 
--   There is a good chance you will have to do this via command line on
-    your FusionPBX install
-    <https://accounts.google.com/b/0/DisplayUnlockCaptcha>
--   If you have a headless install(no desktop gui) then you will have to
-    install lynx. Lynx is a command line web browser. For Debian you
-    would type the example below. Follow the prompts for email address
-    and password.
+- There is a good chance you will have to do this via command line on your FusionPBX install https://accounts.google.com/b/0/DisplayUnlockCaptcha
+- If you have a headless install(no desktop gui) then you will have to install lynx. Lynx is a command line web browser. For Debian you would type the example below. Follow the prompts for email address and password.
 
-<!-- -->
+~~~
+apt-get install lynx
+lynx https://accounts.google.com/b/0/DisplayUnlockCaptcha
+~~~
 
-    apt-get install lynx
-    lynx https://accounts.google.com/b/0/DisplayUnlockCaptcha
+- You may also have to enable less secure apps https://support.google.com/accounts/answer/6010255?hl=en
 
--   You may also have to enable less secure apps
-    <https://support.google.com/accounts/answer/6010255?hl=en>
+| Default Setting Subcategory | Default Setting Name | Default Setting Value      | Default Setting Enabled | Default Setting Description                                                       |
+|-----------------------------|----------------------|----------------------------|-------------------------|-----------------------------------------------------------------------------------|
+| smtp_host                   | text                 | smtp.gmail.com             | True                    | email providers server address                                                    |
+| smtp_from                   | text                 | [email protected]     | True                    | smtp from emaill address                                                          |
+| smtp_port                   | numeric              | 587                        | True                    | port number of the mail server provider                                           |
+| smtp_from_name              | text                 | Voicemail                  | True                    | smtp from name                                                                    |
+| smtp_auth                   | text                 | true                       | True                    | smtp auth is required                                                             |
+| smtp_username               | text                 | [email protected]     | True                    | Use the full email address                                                        |
+| smtp_password               | text                 | ************************** | True                    | typically the email password                                                      |
+| smtp_secure                 | text                 | tls                        | True                    | tls or ssl depending on the provider.                                             |
+| smtp_validate_certificate   | boolean              | true                       | True                    | set to false to ignore SSL certificate warnings e.g. for self-signed certificates |
+| method                      | text                 | smtp                       | True                    | smtp\|sendmail\|mail\|qmail                                                       |
 
-+----------+-------+---------+--------+------------------------------+
-| Default  | De    | Default | D      | Default Setting Description  |
-| Setting  | fault | Setting | efault |                              |
-| Sub      | Se    | Value   | S      |                              |
-| category | tting |         | etting |                              |
-|          | Name  |         | E      |                              |
-|          |       |         | nabled |                              |
-+==========+=======+=========+========+==============================+
-| s        | text  | smtp.gm | True   | > email providers server     |
-| mtp[host |       | ail.com |        | > address                    |
-| ]{#host} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | <em     | True   | > smtp from emaill address   |
-| mtp[from |       | ailaddr |        |                              |
-| ]{#from} |       | ess@gma |        |                              |
-|          |       | il.com> |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | nu    | 587     | True   | port number of the mail      |
-| mtp[port | meric |         |        | server provider              |
-| ]{#port} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| smt      | text  | Vo      | True   | > smtp from name             |
-| p[from_n |       | icemail |        |                              |
-| ame]{#fr |       |         |        |                              |
-| om_name} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | true    | True   | > smtp auth is required      |
-| mtp[auth |       |         |        |                              |
-| ]{#auth} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | <em     | True   | > Use the full email address |
-| mtp[user |       | ailaddr |        |                              |
-| name]{#u |       | ess@gma |        |                              |
-| sername} |       | il.com> |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | -----   | True   | > typically the email        |
-| mtp[pass |       |         |        | > password                   |
-| word]{#p |       |         |        |                              |
-| assword} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| smtp[    | text  | tls     | True   | > tls or ssl depending on    |
-| secure]{ |       |         |        | > the provider.              |
-| #secure} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | bo    | true    | True   | set to false to ignore SSL   |
-| mtp[vali | olean |         |        | certificate warnings e.g.    |
-| date_cer |       |         |        | for self-signed certificates |
-| tificate |       |         |        |                              |
-| ]{#valid |       |         |        |                              |
-| ate_cert |       |         |        |                              |
-| ificate} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| method   | text  | smtp    | True   | smtp[\|sendmail\|](##S       |
-|          |       |         |        | UBST##|sendmail|)mail\|qmail |
-+----------+-------+---------+--------+------------------------------+
-
-To see if there are any failed email attempts goto Status \> Emails.
-Once the issue causing the emails to fail is found you can click to
-resent them.
+To see if there are any failed email attempts goto Status > Emails. Once the issue causing the emails to fail is found you can click to resend them.
 
 :::: note
-::: title
-Note
-:::
+<p class="admonition-title">Note</p>
 
 The log is stored in the /tmp directory.
 ::::

+ 24 - 74
source/advanced/default_settings/smtp2go.md

@@ -1,88 +1,38 @@
 # SMTP2GO
 
-SMTP2GO is a paid email service for sending email. They do however have
-1,000 free messages a month and paid plans that are reasonable.
+SMTP2GO is a paid email service for sending email. They do however have 1,000 free messages a month and paid plans that are reasonable.
 
-1.  Sign up for the service
+1. Sign up for the service
 
-![image](../../_static/images/advanced/default_settings/fusionpbx_smtp2go.jpg)
+![SMTP2GO Signup](../../_static/images/advanced/default_settings/fusionpbx_smtp2go.jpg)
 
-2.  After you confirm your email, sign in. You can create an smtp user
-    at this screen or in the next step.
+2. After you confirm your email, sign in. You can create an smtp user at this screen or in the next step.
 
-![image](../../_static/images/advanced/default_settings/fusionpbx_smtp2go3.jpg)
+![SMTP2GO Signin](../../_static/images/advanced/default_settings/fusionpbx_smtp2go3.jpg)
 
-3.  Go to Settings \> Users and create an smtp user or additional smtp
-    users.
+3. Go to Settings > Users and create an smtp user or additional smtp users.
 
-![image](../../_static/images/advanced/default_settings/fusionpbx_smtp2go_users.jpg)
+![SMTP2GO Users](../../_static/images/advanced/default_settings/fusionpbx_smtp2go_users.jpg)
 
-4.  You can set authentication by ip address. It\'s a good idea to set
-    the limit here also from Unlimited to match which plan you choose.
+4. You can set authentication by ip address. It's a good idea to set the limit here also from Unlimited to match which plan you choose.
 
-![image](../../_static/images/advanced/default_settings/fusionpbx_smtp2go1.jpg)
+![SMTP2GO Authentication](../../_static/images/advanced/default_settings/fusionpbx_smtp2go1.jpg)
 
-5.  Set the domain to your domain to make delivery seem as it came right
-    from your own mail server. This can help sending to strict email
-    domains.
+5. Set the domain to your domain to make delivery seem as it came right from your own mail server. This can help sending to strict email domains.
 
-![image](../../_static/images/advanced/default_settings/fusionpbx_smtp2go2.jpg)
+![SMTP2GO Domain](../../_static/images/advanced/default_settings/fusionpbx_smtp2go2.jpg)
 
-6.  From your FusionPBX server install go to Advanced \> Default
-    Settings \> Email section.
+6. From your FusionPBX server install go to Advanced > Default Settings > Email section.
 
-+----------+-------+---------+--------+------------------------------+
-| Default  | De    | Default | D      | Default Setting Description  |
-| Setting  | fault | Setting | efault |                              |
-| Sub      | Se    | Value   | S      |                              |
-| category | tting |         | etting |                              |
-|          | Name  |         | E      |                              |
-|          |       |         | nabled |                              |
-+==========+=======+=========+========+==============================+
-| s        | text  | ma      | True   | > email providers server     |
-| mtp[host |       | il.smtp |        | > address                    |
-| ]{#host} |       | 2go.com |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | <em     | True   | > smtp from emaill address   |
-| mtp[from |       | ailaddr |        |                              |
-| ]{#from} |       | ess@gma |        |                              |
-|          |       | il.com> |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | nu    | 587     | True   | port number of the mail      |
-| mtp[port | meric |         |        | server provider              |
-| ]{#port} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| smt      | text  | Vo      | True   | > smtp from name             |
-| p[from_n |       | icemail |        |                              |
-| ame]{#fr |       |         |        |                              |
-| om_name} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | TRUE    | True   | > smtp auth is required      |
-| mtp[auth |       |         |        |                              |
-| ]{#auth} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | <em     | True   | > Use the full email address |
-| mtp[user |       | ailaddr |        |                              |
-| name]{#u |       | ess@gma |        |                              |
-| sername} |       | il.com> |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | text  | -----   | True   | > typically the email        |
-| mtp[pass |       |         |        | > password                   |
-| word]{#p |       |         |        |                              |
-| assword} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| smtp[    | text  | tls     | True   | > tls or ssl depending on    |
-| secure]{ |       |         |        | > the provider.              |
-| #secure} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| s        | bo    | TRUE    | True   | set to false to ignore SSL   |
-| mtp[vali | olean |         |        | certificate warnings e.g.    |
-| date_cer |       |         |        | for self-signed certificates |
-| tificate |       |         |        |                              |
-| ]{#valid |       |         |        |                              |
-| ate_cert |       |         |        |                              |
-| ificate} |       |         |        |                              |
-+----------+-------+---------+--------+------------------------------+
-| method   | text  | s       | False  | smtp[\|sendmail\|](##S       |
-|          |       | endmail |        | UBST##|sendmail|)mail\|qmail |
-+----------+-------+---------+--------+------------------------------+
+| Default Setting Subcategory | Default Setting Name | Default Setting Value      | Default Setting Enabled | Default Setting Description                                                       |
+|-----------------------------|----------------------|----------------------------|-------------------------|-----------------------------------------------------------------------------------|
+| smtp_host                   | text                 | mail.smtp2go.com           | True                    | email providers server address                                                    |
+| smtp_from                   | text                 | [email protected]     | True                    | smtp from emaill address                                                          |
+| smtp_port                   | numeric              | 587                        | True                    | port number of the mail server provider                                           |
+| smtp_from_name              | text                 | Voicemail                  | True                    | smtp from name                                                                    |
+| smtp_auth                   | text                 | TRUE                       | True                    | smtp auth is required                                                             |
+| smtp_username               | text                 | [email protected]     | True                    | Use the full email address                                                        |
+| smtp_password               | text                 | ************************** | True                    | typically the email password                                                      |
+| smtp_secure                 | text                 | tls                        | True                    | tls or ssl depending on the provider.                                             |
+| smtp_validate_certificate   | boolean              | TRUE                       | True                    | set to false to ignore SSL certificate warnings e.g. for self-signed certificates |
+| method                      | text                 | sendmail                   | False                   | smtp\|sendmail\|mail\|qmail                                                       |

+ 6 - 6
source/applications/provision.md

@@ -37,7 +37,7 @@ How to setup the device using the phone\'s web interface.
 ## Advanced \> Default Settings
 
 In the [Provisioning
-section](/en/latest/advanced/default_settings.html#id17), there are a
+section](../advanced/default_settings.md#provision), there are a
 few key options that have to be set in order to turn auto provisioning
 on.
 
@@ -62,13 +62,13 @@ on.
 <p class="admonition-title">Note</p>
 
 [Click here to view how to add a
-device](https://docs.fusionpbx.com/en/latest/accounts/devices.html).
+device](../accounts/devices.md).
 ::::
 
 ## Phone Book
 
 Remote phone book (Address Book) are based on the FusionPBX [Contacts
-App](/en/latest/applications/contacts.html).
+App](./contacts.md).
 
 ### Phone Book Settings
 
@@ -76,14 +76,14 @@ In order to use the phone book a few steps are needed.
 
 -   Assign the device to a user.
 -   Create or import the
-    [Contacts](/en/latest/applications/contacts.html).
+    [Contacts](./contacts.md).
 -   Set **Enabled** as **True** in [Default
-    Settings](/en/latest/advanced/default_settings.html).
+    Settings](../advanced/default_settings.md).
 
 ![image](../_static/images/provision/fusionpbx_remote_phonebook1.png)
 
 -   Set **Enabled True** for contact_extensions, contact_users and contact_groups in [Default
-    Settings](/en/latest/advanced/default_settings.html).
+    Settings](../advanced/default_settings.md).
 
 ![image](../_static/images/provision/fusionpbx_phone_book2.png)
 

+ 39 - 0
source/applications/provision/provision_auto_avaya.md

@@ -0,0 +1,39 @@
+# Avaya
+
+## Using DHCP Option 242 to Deploy the Phone
+
+DHCP is an excellent option for phones deployed in a local office. Your Avaya phone can be removed from its box and simply plugged into the network. All the setting will be retrieved from the server.
+
+Avaya phones look for DHCP option 242 for auto-provisioning. 242 needs to be of type _string_.
+
+Here is a sample string:
+
+```
+"HTTPSRVR=company.domain.com,HTTPDIR=/app/provision,FORCE_HTTP_AUTH_USERNAME=admin,FORCE_HTTP_AUTH_PASSWORD=password,DES_STAT=0"
+```
+
+Below is an explanation of all of the Key-values:
+
+1. HTTPSRVR - The fqdn of the provisioning server
+2. HTTPDIR - The folder that the phone should look for the provisioning files 
+3. FORCE_HTTP_AUTH_USERNAME - HTTP username (optional)
+4. FORCE_HTTP_AUTH_PASSWORD - HTTP password (optional)
+5. DES_STAT - Set to 0 to disable Avaya's Device Enrollment Service
+
+When a phone boots up and retrieves option 242, it will first begin looking for the `J100Supgrade.txt` file inside of the HTTPDIR. This file contains a pointer to the MAC specific file that has the extension settings.
+
+## Using DHCP Option 242 to Set the VLAN
+
+One method of getting phones to switch to the voice vlan is through the use of DHCP.
+
+Avaya looks for option 242 (string) for the VLAN ID that it should be on. This is accomplished by adding the following to option 242: "L2Q=1,L2QVLAN=11,VLANTEST=0"
+
+Below is an explanation of all of the Key-values:
+
+1. L2Q - This is a true (1) or false (0) as to if vlan tagging should be used.
+2. L2QVLAN - This is the vlan id
+3. VLANTEST - Specifies the number of seconds that the phone waits prior to failing back to a different VLAN ID if no response is received from the DHCP server
+
+When a phone boots, if you have option 242 set to "xxx" where xxx is your vlan id, the phone will release it's address lease and request a new one with it's frames tagged with the vlan ID.
+
+This option is needed on the default vlan DHCP scope to make the phone switch.

+ 9 - 11
source/applications/provision/provision_auto_cisco.md

@@ -1,25 +1,27 @@
-\######## Cisco SPA \########
+# Cisco
+
+## SPA
 
 The following information can be used to provisioning Cisco SPA phones.
 
-# Basic URL
+## Basic URL
 
 An example URL for provisioning URL for a Cisco SPA.
 
 <http://mydomain.com/app/provision/?mac=$MA>
 
-# HTTP Authentication
+## HTTP Authentication
 
 Phone web interface -\> Provision - \> Profile Rule
 
     [--uid myUser --pwd myPass]http://mydomain.com/app/provision/?mac=$MA
 
-# HTTPS
+## HTTPS
 
 Requires a Cisco Certificate that you will likely need to obtain from a
 Cisco distributor.
 
-# Browser Command
+## Browser Command
 
 Use your web browser to send the following command to pass the provision
 the phone now and this will pass URL to the phone so it has the location
@@ -29,22 +31,18 @@ tenant domain name.
 
 **No HTTP Authentication**
 
-:
-
 <http://192.168.1.5/admin/resync?http://domain.com/app/provision/?mac=$MA>
 
 **With HTTP Authentication**
 
-:
-
 <http://192.168.1.4/admin/resync?%5B--uid+admin+--pwd+555%5Dhttp://domain.com/app/provision/?mac=$MA>
 
-# DHCP Option
+## DHCP Option
 
 Use the DHCP Option 66 to deliver the provisioning URL to the phones
 without using the web interface.
 
-# Additional Information
+## Additional Information
 
 More information can also be found at
 <https://www.cisco.com/c/dam/en/us/td/docs/voice_ip_comm/csbpvga/spa100-200/provisioning/guide/SPA100-200_Provisioning.pdf>

+ 2 - 4
source/applications/provision/provision_auto_htek.md

@@ -30,11 +30,9 @@ certificate.
 
 -   Left menu click **Trusted CA**
 
--   
+-   Choose the following
 
-    Choose the following
-
-    :   -   Only Accept Trusted Certificates: OFF
+        -   Only Accept Trusted Certificates: OFF
         -   Common Name Validation: OFF
         -   Trusted Certificates: All Certificates
 

+ 5 - 7
source/applications/provision/provision_auto_snom.md

@@ -33,9 +33,7 @@ following:
     continue to set up line keys or adjust any other phone settings.
 
 :::: note
-::: title
-Note
-:::
+<p class="admonition-title">Note</p>
 
 The provisioning template can be tested by opening up a web browser and
 entering the provisioning url. The provisioning url is:
@@ -67,8 +65,8 @@ Note: The hostname should be replaced with your FusionPBX domain name.
 5.  If using HTTP Auth, go to \"Setup \> Advanced \> QoS / Security\"
 
 In HTTP Client, enter the username found in
-[http_auth_username]{.title-ref} and the password found in
-[http_auth_password]{.title-ref}.
+http_auth_username. and the password found in
+http_auth_password.
 
 6.  Click the \"Reboot\" button and confirm to reboot the phone.
 
@@ -81,8 +79,8 @@ DHCP is an excellent option for phones deployed in a local office. Your
 Snom phone can be removed from its box and simply plugged into the
 network. All the setting will be retrieved from the server. Be careful
 when exposing your FusionPBX server to the internet. You should always
-have the [http_auth_username]{.title-ref} and
-[http_auth_password]{.title-ref} default settings enabled and with
+have the http_auth_username and
+http_auth_password default settings enabled and with
 strong settings.
 
 Your DHCP option should look something like this: