浏览代码

Merge remote-tracking branch 'origin/master'

Len 9 年之前
父节点
当前提交
aeb603a490

+ 2 - 2
source/applications.rst

@@ -14,7 +14,7 @@ Applications
   :maxdepth: 3
   :maxdepth: 3
   :glob:
   :glob:
 
 
-  application/ivr.rst
-  application/recordings.rst
+  applications/ivr.rst
+  applications/recordings.rst
   applications/ring_group.rst
   applications/ring_group.rst
   applications/time_conditions.rst
   applications/time_conditions.rst

+ 0 - 0
source/application/ivr.rst → source/applications/ivr.rst


+ 0 - 0
source/application/recordings.rst → source/applications/recordings.rst


+ 1 - 1
source/conf.py

@@ -133,7 +133,7 @@ html_favicon = "_static/images/favicon.ico"
 # Add any paths that contain custom static files (such as style sheets) here,
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # .htaccess) here, relative to this directory. These files are copied

+ 0 - 8
source/extensions_ivr/extensions.rst

@@ -226,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
 * 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.
 * 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/
 * Visit Zoiper Community Supoprt http://community.zoiper.com/
-
-|
-
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  extensions_ivr/extensions.rst

+ 2 - 1
source/gateway_inbound_outbound/gateway1.rst

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

+ 1 - 1
source/getting_started.rst

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