Merge remote-tracking branch 'refs/remotes/origin/master'

source/advanced/upgrade.rst

@@ -213,33 +213,34 @@ Version Upgrade
 ################
 
 |
-
 Version Upgrade can take several steps to perform. Below will show how to upgrade from specific versions.
 
-Release Revisions
-
-* r0001 is 1.0 release - 6 Nov 2009
-* r2523 is 3.0 release - 3 May 2012
-* r2585 is 3.0.4 release - 24 May 2012
-* r2757 is 3.1 release - 18 Aug 2012
-* r2777 is 3.1.1 release - 26 Aug 2012
-* r2827 is 3.1.2 release - 12 Sep 2012
-* r2897 is 3.1.3 release - 26 Sep 2012
-* r2907 is 3.1.4 release - 27 Sep 2012
-* r3694 is 3.2 release - 19 Jan 2013
-* r3978 is 3.3 release - 1 May 2013
-* r4605 is 3.4 release - 28 Sep 2013
-* r6747 is 3.6.1 release - 22 Aug 2014
-* r8481 is 3.8.3 release - 11 May 2014
-* r793d386 is 4.0 release - Aug 2015
-* r4fdb6e9 is 4.1 release - Dec 2015
-
 |
-Version 4.0 to 4.1
+Version 4.0 to 4.2
 ^^^^^^^^^^^^^^^^^^
 
+Many updates in code from 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.
+
+::
+
+ cd /var/www/freeswitch
+ git stash
+ git pull
+ chown -R www-data:www-data *
+ 
+2. Check box Schema (Only check this box then click execute)
+
 |
 
+3. You will notice a big difference in the menu.
+
 |
 
 Version 3.8 to 4.0
@@ -569,6 +570,25 @@ Version 2 to 3.0
 | * Double check the SMTP settings on the System -> Settings page
 | * Save it, even if you haven't changed anything
 
+Release Revisions
+
+* r0001 is 1.0 release - 6 Nov 2009
+* r2523 is 3.0 release - 3 May 2012
+* r2585 is 3.0.4 release - 24 May 2012
+* r2757 is 3.1 release - 18 Aug 2012
+* r2777 is 3.1.1 release - 26 Aug 2012
+* r2827 is 3.1.2 release - 12 Sep 2012
+* r2897 is 3.1.3 release - 26 Sep 2012
+* r2907 is 3.1.4 release - 27 Sep 2012
+* r3694 is 3.2 release - 19 Jan 2013
+* r3978 is 3.3 release - 1 May 2013
+* r4605 is 3.4 release - 28 Sep 2013
+* r6747 is 3.6.1 release - 22 Aug 2014
+* r8481 is 3.8.3 release - 11 May 2014
+* r793d386 is 4.0 release - Aug 2015
+* r4fdb6e9 is 4.1 release - Dec 2015
+* rxxxxxxx is 4.2 release - xxx 2016
+
 |
 
 SQLite

source/applications/ring_groups.rst

@@ -0,0 +1 @@
+

source/applications/time_conditions.rst

@@ -0,0 +1 @@
+

source/getting_started/installation_recommended.rst

@@ -1,10 +1,14 @@
 *****************
-New Install
+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
+
+
     Welcome to the FUSIONPBX getting started guide.  In this section we will show how to install FUSIONPBX.  FUSIONPBX can be used on multiple different operating systems, databases, and web servers.  In this guide we will show on Debian 8 (Jessie), Postgresql and NGINX.  **Please note to have a clean install.  The install script will install everthing but the Operating System**
     
     

source/getting_started/installation_recommended_new.rst

@@ -101,6 +101,17 @@ Install Finished  **Login with the username and password you choose during the i
         :scale: 80%
       
     
+
+|
+Run App defaults
+
+::
+
+  Go to the menu and choose Advanced -> Upgrade select the checkbox for App defaults then execute.
+  
+.. image:: ../_static/images/fusionpbx_upgrade_page.jpg
+        :scale: 85%  
+
 |
 Start Sip Profiles
 
@@ -120,17 +131,7 @@ Start Memcached
     
 .. image:: ../_static/images/fusionpbx_start_memcached.jpg
         :scale: 85%
-
-|
-Run App defaults
-
-::
-
-  Go to the menu and choose Advanced -> Upgrade select the checkbox for App defaults then execute.
-  
-.. image:: ../_static/images/fusionpbx_upgrade_page.jpg
-        :scale: 85%  
-
+        
 |
 **Note**: To display the logo at the top and not in the menu