Merge pull request #73 in FS/freeswitch from ~RTRELEAVEN/freeswitch-fs-6859:fs-6859 to master

* commit 'e4f77140':
  make the gateway parameters to make the gateways samples the same
  make vanilla configuration gateways easier to understand for new users

conf/vanilla/sip_profiles/external-ipv6.xml

@@ -2,7 +2,7 @@
   <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
   <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="external/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
   </gateways>
 
   <aliases>

conf/vanilla/sip_profiles/internal/example.xml → conf/vanilla/sip_profiles/external-ipv6/example.xml

@@ -33,5 +33,9 @@
   <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
   <!--<param name="ping" value="25"/>-->
   <!--<param name="cid-type" value="rpid"/>-->
+  <!--rfc5626 : Abilitazione rfc5626 ///-->
+  <!--<param name="rfc-5626" value="true"/>-->
+  <!--rfc5626 : extra sip params to send in the contact-->
+  <!--<param name="reg-id" value="1"/>-->
   <!--</gateway>-->
 </include>

conf/vanilla/sip_profiles/external/example.xml

@@ -28,11 +28,14 @@
   <!--<param name="caller-id-in-from" value="false"/>-->
   <!--extra sip params to send in the contact-->
   <!--<param name="contact-params" value=""/>-->
+  <!-- Put the extension in the contact -->
+  <!--<param name="extension-in-contact" value="true"/>-->
   <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
   <!--<param name="ping" value="25"/>-->
-  <!--</gateway>-->
+  <!--<param name="cid-type" value="rpid"/>-->
   <!--rfc5626 : Abilitazione rfc5626 ///-->
   <!--<param name="rfc-5626" value="true"/>-->
   <!--rfc5626 : extra sip params to send in the contact-->
   <!--<param name="reg-id" value="1"/>-->
+  <!--</gateway>-->
 </include>

conf/vanilla/sip_profiles/internal.xml

@@ -15,7 +15,6 @@
   </aliases>
   <!-- Outbound Registrations -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="internal/*.xml"/>
   </gateways>
 
   <domains>