Browse Source

Update upgrade.rst

Len 9 years ago
parent
commit
86049c37b1
1 changed files with 2 additions and 11 deletions
  1. 2 11
      source/advanced/upgrade.rst

+ 2 - 11
source/advanced/upgrade.rst

@@ -225,14 +225,10 @@ Version 4.0 to 4.2
 1. Update code from the GUI. Advanced > Upgrade page (Only check this box then click execute)
 1. Update code from the GUI. Advanced > Upgrade page (Only check this box then click execute)
 
 
 
 
-  .. note::
+ .. note::
  
  
-<<<<<<< HEAD
   If you get a red bar error at the top when trying to upgrade
   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.
   you will need SSH access to the install and run these commands.
-=======
-  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.
->>>>>>> origin/master
 
 
 
 
 ::
 ::
@@ -648,18 +644,13 @@ Configure
 ^^^^^^^^^^
 ^^^^^^^^^^
 
 
 To enable PostgresSQL as a native client in FreeSWITCH you must enable it during the build when running configure.
 To enable PostgresSQL as a native client in FreeSWITCH you must enable it during the build when running configure.
-
- ::
- 
- ** ./configure --enable-core-pgsql-support **
+** ./configure --enable-core-pgsql-support **
 
 
 switch.conf.xml
 switch.conf.xml
 ^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^
 
 
 Under the Settings area insert the following line
 Under the Settings area insert the following line
 
 
- ::
- 
  <param name="core-db-dsn" value="pgsql;hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" />
  <param name="core-db-dsn" value="pgsql;hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" />
 
 
 Additional Information
 Additional Information