Merge branch 'master' of https://github.com/Len-PGH/fusionpbx-docs

source/accounts.rst

@@ -10,5 +10,5 @@ In the **Accounts** menu you have access to devices, extensions, gateways and us
   :maxdepth: 3
   :glob:
 
-  Extensions-IVR/Extensions.rst
-  Gateway-Inbound-Outbound/Gateway1.rst
+  extensions_ivr/extensions.rst
+  gateway_inbound_outbound/gateway1.rst

source/contributing.rst

@@ -34,9 +34,9 @@ How to Get Started:
   :maxdepth: 4
   :glob:
 
-  contributing/contributing-code.rst
-  contributing/contributing-documentation.rst
-  contributing/contributing-translations.rst
-  contributing/qa-testing.rst
-  #contributing/coding-standards
-  #contributing/directory-structure  
+  contributing/contributing_code.rst
+  contributing/contributing_documentation.rst
+  contributing/contributing_translations.rst
+  contributing/qa_testing.rst
+  #contributing/coding_standards
+  #contributing/directory_structure  

source/contributing/coding-standards.rst → source/contributing/coding_standards.rst

@@ -4,4 +4,4 @@ Coding Standards
 
 - **FusionPBX Best practice coding practices**
 
-    Command (example):
+    Command (example):

source/contributing/contributing-code.rst

@@ -1,5 +0,0 @@
-*****************
-Contributing Code
-*****************
-
-Lorem Ipsum

source/contributing/contributing_code.rst

@@ -0,0 +1,65 @@
+*****************
+Contributing Code
+*****************
+
+https://github.com/fusionpbx/open-source
+
+Open Source at FusionPBX
+==============================================
+
+This repository serves as the umbrella project to represent the
+various open source efforts of Mark J. Crane(https://fusionpbx.com).
+Come here to get an overview of the various projects, to learn how to
+contribute to them, and to sign up as a contributor.
+
+Table Of Contents
+-----------------
+
+* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
+* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
+* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
+* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
+
+
+
+Note to External Contributors
+-----------------------------
+
+Hello, External Person!
+
+We at FusionPBX are eager to work with you. 
+
+In particular, in order for us to accept any patches from you, you will have to
+electronically sign a statement that indicates two things:
+
+* You are willingly licensing your contributions under the terms of
+  the open source license of the project that you’re contributing to.
+
+* You are legally able to license your contributions as stated.
+
+The reason we do this is to ensure, to the extent possible, that we don’t “taint”
+the projects we manage with contributions that turn out to be improper. This protects
+everyone who wants to use the projects, including *you*! If you want a longer explanation,
+then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
+
+Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
+merge your contributions with a clear conscience and with only the friction that results
+from the usual technical back-and-forth of a vibrant open source project.
+
+To get started with this process, visit the
+[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
+page.
+
+
+Thanks, FusionPBX!
+
+
+
+List of Projects
+----------------
+
+* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) — The Official FusionPBX Repo.
+* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) — Applications for FusionPBX.
+* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) — Install and Upgrade Scripts for FusionPBX.
+* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) — This site.
+

source/contributing/contributing-documentation.rst → source/contributing/contributing_documentation.rst

@@ -2,4 +2,4 @@
 Contributing Documentation
 **************************
 
-Lorem Ipsum
+Lorem Ipsum

source/contributing/contributing-translations.rst → source/contributing/contributing_translations.rst

@@ -2,4 +2,4 @@
 Contributing Translations
 *************************
 
-Lorem Ipsum
+Lorem Ipsum

source/contributing/qa-testing.rst → source/contributing/qa_testing.rst

@@ -2,4 +2,4 @@
 Quality Assurance Testing
 *************************
 
-Lorem Ipsum
+Lorem Ipsum

source/dialplan.rst

@@ -10,4 +10,4 @@ In the **Dialplan** menu you have access to Destinations, Dialplan Manager, Inbo
   :maxdepth: 2
   :glob:
   
-  Gateway-Inbound-Outbound/Gateway.rst
+  gateway_inbound_outbound/gateway.rst

source/doc-guide.rst → source/doc_guide.rst

@@ -961,4 +961,4 @@ Similarly to the note directive, one can include todo boxes but it requires the
 
 .. _Git Tutorial: https://try.github.io/levels/1/challenges/1
 .. _Git Install: http://git-scm.com/book/en/Getting-Started-Installing-Git
-.. _Atlassian Git site: https://www.atlassian.com/git/tutorials
+.. _Atlassian Git site: https://www.atlassian.com/git/tutorials

source/Extensions-IVR/Extensions.rst → source/extensions_ivr/extensions.rst

@@ -249,4 +249,4 @@ In the ever changing world of voip businesses are moving away from hardware phon
   :maxdepth: 3
   :glob:
 
-  Extensions-IVR/Extensions.rst
+  extensions_ivr/extensions.rst

source/getting-started.rst

@@ -1,21 +0,0 @@
-***************
-Getting Started
-***************
-
-Welcome! Let's install FusionPBX.
-Follow the menu to the left and you will have a working PBX in no time.
-
-.. note::
-
-  There are many ways to install FusionPBX depending on how you want to architect your solution.
-  What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
-  For advanced topics consider attending the training. Details for the training can be found at http://fusionpbx.com.
-
-
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  getting-started/installation-recommended.rst
-  getting-started/post-installation.rst
-  iptables.rst

source/getting_started.rst

@@ -0,0 +1,22 @@
+***************
+Getting Started
+***************
+
+Welcome! 
+Let's install FusionPBX.
+Follow the menu to the left and you will have a working PBX in no time. For PDF and Epub formats of this documentation click the bottom left on **v:latest** and a menu will pop-up.  
+
+.. note::
+
+  There are many ways to install FusionPBX depending on how you want to build your solution.
+  What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
+  For advanced topics consider attending the in person or online training at http://fusionpbx.com.
+
+
+.. toctree::
+  :maxdepth: 3
+  :glob:
+
+  getting_started/installation_recommended.rst
+  getting_started/post_installation.rst
+  iptables.rst

source/getting-started/installation-recommended.rst → source/getting_started/installation_recommended.rst

@@ -57,12 +57,14 @@ New Install
      
     **4.** Web browser Installation part
      :Select Language: **Pick your language. Click next**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797615/3b84a6aa-a292-11e5-92be-9130fe480f9b.jpg
+     .. image:: ../_static/images/install_lang.jpg
+        :scale: 85%
 
 |
 
      :Freeswitch Detect: **Detecting folder paths used** 
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11802026/c5a78c04-a2b9-11e5-9a79-e77ef3298c49.jpg 
+     .. image:: ../_static/images/install_detect_freeswitch.jpg
+        :scale: 85% 
 
      
      **Don't change anything here**
@@ -70,14 +72,16 @@ New Install
 |
 
      :Database Configuration: **Click Execute**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797607/2bfe2fb2-a292-11e5-9d58-e344678f3fdb.jpg 
+     .. image:: ../_static/images/install_database_config.jpg
+        :scale: 85% 
      
      **Don't change anything here** 
      
 |
 
      :Admin Login Configuration: **Click Next**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797659/99b6c424-a292-11e5-81a2-1bfae36ce197.jpg 
+     .. image:: ../_static/images/install_admin_username.jpg
+        :scale: 85% 
      
      This will create the superadmin login that will be used in your web browser.
 
@@ -115,7 +119,8 @@ New Install
      :Install Finished:  **Login with the username and password you choose during the install**
      
      
-      .. image:: https://cloud.githubusercontent.com/assets/13131198/11797604/25935530-a292-11e5-8612-7dba48d65bde.jpg
+      .. image:: ../_static/images/ilogin.jpg
+        :scale: 50%
       
     
     

source/index.rst

@@ -80,14 +80,14 @@ Getting Started
 .. toctree::
     :maxdepth: 2
 
-    getting-started.rst
+    getting_started.rst
     accounts.rst
     dialplan.rst
     phones.rst
     domains.rst
     manual.rst
     contributing.rst
-    doc-guide.rst
+    doc_guide.rst
 
 
 

source/manual.rst

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