**ZRTP IS NOW DEPREICATED** (signalwire#24)

Len-PGH · web-flow · commit 5a2ca4c2a8ff · 2023-03-01T09:54:11.000-06:00
* Update Proxy-Media_13173588.mdx

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* Update Linux-Quick-Install-Guide_1966854.mdx

* Update Global-Variables_13173994.mdx

* **ZRTP IS NOW DEPREICATED**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**

* **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
diff --git a/docs/Channel-Variables-Catalog/zrtp_enabled_17170785.mdx b/docs/Channel-Variables-Catalog/zrtp_enabled_17170785.mdx
@@ -1,7 +1,8 @@
+# **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 # zrtp_enabled 
 
- Created by  Duvid Rottenberg, last modified on 2018.04.24
+ Created by  Duvid Rottenberg, last modified on 2023.02.16
 
 ## zrtp_enabled
 
diff --git a/docs/FreeSWITCH-Explained/1048601.mdx b/docs/FreeSWITCH-Explained/1048601.mdx
@@ -40,7 +40,7 @@ With a desire not to reinvent the wheel, we've designed FreeSWITCH to take advan
    * Such as [Asterisk](http://www.asterisk.org/), [Yate](http://yate.null.ro/), or [sipXecs](http://www.sipfoundry.org).  
    * Supports SIP, SCCP, H.323, LDAP, Zeroconf, etc.  
    * With [FreeTDM](http://wiki.freeswitch.org/wiki/FreeTDM "FreeTDM"), a BSD licensed TDM abstraction library, or hardware analog FXO gateways it can interface with the [PSTN](https://confluence.freeswitch.org/display/FREESWITCH/Glossary#Glossary-pstn) as well.
-* Supports [Secure RTP](http://wiki.freeswitch.org/wiki/Secure%5FRTP "Secure RTP") (SRTP) and [zRTP](http://wiki.freeswitch.org/wiki/ZRTP "ZRTP") (libzrtp).
+* Supports [Secure RTP](http://wiki.freeswitch.org/wiki/Secure%5FRTP "Secure RTP") (SRTP).
 * Please see the complete [Feature list](http://wiki.freeswitch.org/wiki/Features "Features") for more features.
 
 ## Tutorials and Guides  
diff --git a/docs/FreeSWITCH-Explained/Client-and-Developer-Interfaces/1048948.mdx b/docs/FreeSWITCH-Explained/Client-and-Developer-Interfaces/1048948.mdx
@@ -169,7 +169,6 @@ MAX-DIALOG 0
 NOMEDIA false
 LATE-NEG true
 PROXY-MEDIA false
-ZRTP-PASSTHRU true
 AGGRESSIVENAT false
 CALLS-IN 0
 FAILED-CALLS-IN 0
diff --git a/docs/FreeSWITCH-Explained/Configuration/How-Tos/Holding-Bin_1966771.mdx b/docs/FreeSWITCH-Explained/Configuration/How-Tos/Holding-Bin_1966771.mdx
@@ -34,7 +34,7 @@ Click to expand Table of Contents
 * 16 [TLS](#tls)
 * 17 [SRTP](#srtp)  
    * 17.1 [rtp\_sdes\_suites](#rtp_sdes_suites)
-* 18 [zrtp](#zrtp)
+* 18 [zrtp](#zrtp) **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 * 19 [Logging](#logging)
 * 20 [Timeouts](#timeouts)  
    * 20.1 [Short](#short)  
@@ -339,7 +339,7 @@ FS does not implement Diffie-Hellman ephemeral something-or-other only, elliptic
 (15:16:12) bkw\_\_: rtp\_secure\_media\_outbound=true:AES\_CM\_256\_HMAC\_SHA1\_80,AES\_CM\_256\_HMAC\_SHA1\_32  
 (15:16:20) bkw\_\_: use that to set it to offer only those two on outbound
 
-## zrtp
+## zrtp **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 Brian West - The zrtp-hash IS required for us to dynamically enable p2p media, If you wish to force it yourself then you MUST set proxy\_media=true when this behavior is required. Also you can NOT set zrtp\_secure\_media=true and proxy\_media=true, It will never work,
 
diff --git a/docs/FreeSWITCH-Explained/Configuration/Proxy-Media_13173588.mdx b/docs/FreeSWITCH-Explained/Configuration/Proxy-Media_13173588.mdx
@@ -17,7 +17,7 @@ Click here to expand Table of Contents
 * 6 [FAQs](#faqs)  
    * 6.1 [I get "Codec PROXY PASS-THROUGH encoder error" message](#i-get-codec-proxy-pass-through-encoder-error-message)  
    * 6.2 [Proxy media doesn't work](#proxy-media-doesnt-work)  
-   * 6.3 [Proxy media does not work with ZRTP trusted MITM](#proxy-media-does-not-work-with-zrtp-trusted-mitm)
+   * 6.3 [Proxy media does not work with ZRTP trusted MITM](#proxy-media-does-not-work-with-zrtp-trusted-mitm) **ZRTP IS NOW DEPREICATED**
 * 7 [See Also](#see-also)
 
 ### Common misconceptions (READ THIS)
diff --git a/docs/FreeSWITCH-Explained/Dialplan/Default-Dialplan-QRF_9634422.mdx b/docs/FreeSWITCH-Explained/Dialplan/Default-Dialplan-QRF_9634422.mdx
@@ -73,7 +73,7 @@ Click here to expand Table of Contents
    * 1.52 [Echo test](#default-dialplan-qrf)  
    * 1.53 [tone\_stream demo (milliwatt)](#tone_stream-demo-milliwatt)  
    * 1.54 [tone\_stream demo (tetris)](#tone_stream-demo-tetris)  
-   * 1.55 [zrtp\_enrollement](#default-dialplan-qrf)  
+   * 1.55 [zrtp\_enrollement](#default-dialplan-qrf) **ZRTP IS NOW DEPREICATED and will be removed out of the docs**  
    * 1.56 [Listen to music on hold](#default-dialplan-qrf)  
    * 1.57 [refer](#default-dialplan-qrf)  
    * 1.58 [ruri](#default-dialplan-qrf)  
@@ -387,7 +387,7 @@ Uses [tone\_stream](https://wiki.freeswitch.org/wiki/Tone%5Fstream "Tone stream"
 
 Dial: 9198
 
-### zrtp_enrollement
+### zrtp_enrollement **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 ^9787$
 
diff --git a/docs/FreeSWITCH-Explained/Dialplan/Variables-Master-List_16352570.mdx b/docs/FreeSWITCH-Explained/Dialplan/Variables-Master-List_16352570.mdx
@@ -5600,7 +5600,7 @@ string
 
 string
 
-### zrtp_enabled
+### zrtp_enabled **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 string
 
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/CentOS-7-and-RHEL-7_10289546.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/CentOS-7-and-RHEL-7_10289546.mdx
@@ -124,7 +124,7 @@ cd /usr/local/src/freeswitch
 ./configure --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp
+            --enable-core-odbc-support
 make
 make -j install
 make -j cd-sounds-install
@@ -156,7 +156,7 @@ cd /usr/local/src/freeswitch
 ./configure --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp
+            --enable-core-odbc-support
 make -j
 make -j install
 make -j cd-sounds-install
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/CentOS-7-and-RHEL-7-for-FreeSWITCH-Enterprise_27590673.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/CentOS-7-and-RHEL-7-for-FreeSWITCH-Enterprise_27590673.mdx
@@ -117,7 +117,7 @@ cd /usr/local/src/freeswitch
 ./configure --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp
+            --enable-core-odbc-support
 make
 make -j install
 make -j cd-sounds-install
@@ -149,7 +149,7 @@ cd /usr/local/src/freeswitch
 ./configure --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp
+            --enable-core-odbc-support
 make -j
 make -j install
 make -j cd-sounds-install
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Fedora-29_17695908.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Fedora-29_17695908.mdx
@@ -38,7 +38,7 @@ export CFLAGS="-Wno-error=format-truncation -Wno-error=stringop-truncation"
 ./configure -C --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp \
+            --enable-core-odbc-support \
             --enable-core-pgsql-support \
             --enable-static-v8 --disable-parallel-build-v8
 make
@@ -71,7 +71,7 @@ export CFLAGS="-Wno-error=format-truncation -Wno-error=stringop-truncation"
 ./configure -C --enable-portable-binary \
             --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
             --with-gnu-ld --with-python --with-erlang --with-openssl \
-            --enable-core-odbc-support --enable-zrtp \
+            --enable-core-odbc-support \
             --enable-core-pgsql-support \
             --enable-static-v8 --disable-parallel-build-v8
 make -j
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Installation-DEPRECATED_3965540.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Installation-DEPRECATED_3965540.mdx
@@ -417,7 +417,7 @@ There are [optional modules](http://wiki.freeswitch.org/wiki/Modules) that can b
 * [**OpenSSL**](http://en.wikipedia.org/wiki/Openssl) (libssl-dev / openssl-devel) for [SIP SSL & TLS](https://wiki.freeswitch.org/wiki/SIP%5FTLS "SIP TLS") and [Dingaling](https://wiki.freeswitch.org/wiki/Dingaling "Dingaling")
 * [**python-devel**](http://www.python.org) for the [python interface](https://wiki.freeswitch.org/wiki/Mod%5Fpython "Mod python")
 * [**ZLIB and ZLIB-devel**](http://en.wikipedia.org/wiki/Zlib)
-* [**libzrtp**](http://en.wikipedia.org/wiki/ZRTP) ZRTP encryption support, see the FreeSWITCH™ [ZRTP](https://wiki.freeswitch.org/wiki/ZRTP "ZRTP") page
+* [**libzrtp**](http://en.wikipedia.org/wiki/ZRTP) ZRTP encryption support, see the FreeSWITCH™ **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 ### Distribution Information and Installation
 
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Linux-Quick-Install-Guide_1966854.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/Deprecated-Installation-Instructions/Linux-Quick-Install-Guide_1966854.mdx
@@ -67,7 +67,7 @@ There are [optional modules](http://wiki.freeswitch.org/wiki/Modules) that can b
 * [**OpenSSL**](http://en.wikipedia.org/wiki/Openssl) (libssl-dev / openssl-devel) for [SIP SSL & TLS](https://wiki.freeswitch.org/wiki/SIP%5FTLS "SIP TLS") and [Dingaling](https://wiki.freeswitch.org/wiki/Dingaling "Dingaling")
 * [**python-devel**](http://www.python.org/) for the [python interface](https://wiki.freeswitch.org/wiki/Mod%5Fpython "Mod python")
 * [**ZLIB and ZLIB-devel**](http://en.wikipedia.org/wiki/Zlib)
-* [**libzrtp**](http://en.wikipedia.org/wiki/ZRTP) ZRTP encryption support, see the FreeSWITCH™ [ZRTP](https://wiki.freeswitch.org/wiki/ZRTP "ZRTP") page
+* [**libzrtp**](http://en.wikipedia.org/wiki/ZRTP) ZRTP encryption support, see the FreeSWITCH™  **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
   
   
 ---
diff --git a/docs/FreeSWITCH-Explained/Installation/Linux/Vanilla-installation-files_27591294.mdx b/docs/FreeSWITCH-Explained/Installation/Linux/Vanilla-installation-files_27591294.mdx
@@ -57,7 +57,6 @@ An example Asterisk dialplan. See [mod\_dialplan\_asterisk](../../Modules/mod_di
 
 ### 1.3 `./freeswitch.serial` 
 
-From [thread](https://lists.freeswitch.org/pipermail/freeswitch-users/2010-February/054030.html) from the Freeswitch-users mailing list: "_It is a unique number for that instance of FreeSWITCH, it is mostly used for zrtp_" and its location cannot be changed.
 
 ### 1.4 `./freeswitch.xml` 
 
diff --git a/docs/FreeSWITCH-Explained/Installation/Virtualization/SmartOS_3375391.mdx b/docs/FreeSWITCH-Explained/Installation/Virtualization/SmartOS_3375391.mdx
@@ -215,9 +215,8 @@ Check that it is online:
 Caveats
 
 1. FreeSWITCH will refuse to start if the process does not have the `proc_clock_highres` privilege. This means, the zone manifest should be configured to receive this privilege. If you add it to an existing zone, do "`vmadm update`" and then reboot the zone. Also `proc_priocntl` privilege is highly recommended.
-2. ZRTP is not yet supported: `libs/libzrtp` fails to compile.
-3. `Fixed, please test: ` ~~`mod_eventsocket`~~ ~~cannot bind to IPv6 loopback, and "::" in "listen-ip" does not work. You need to specify "127.0.0.1" in it.~~
-4. As of 05-22-18 with Freeswith 1.6 it is necessary to set, in \~/freeswitch/autoload\_configs/event\_socket.conf.xml, &lt;param name="listen-ip" value="127.0.0.1"/> as IPv6 loopback "::" does not work on my setup. I'm using a Smartos zone created with the latest Joyent zone-dataset available at the moment: base-64 18.1.0 2018-04-08 with nothing special adjusted for IPv6.  
+2. `Fixed, please test: ` ~~`mod_eventsocket`~~ ~~cannot bind to IPv6 loopback, and "::" in "listen-ip" does not work. You need to specify "127.0.0.1" in it.~~
+3. As of 05-22-18 with Freeswith 1.6 it is necessary to set, in \~/freeswitch/autoload\_configs/event\_socket.conf.xml, &lt;param name="listen-ip" value="127.0.0.1"/> as IPv6 loopback "::" does not work on my setup. I'm using a Smartos zone created with the latest Joyent zone-dataset available at the moment: base-64 18.1.0 2018-04-08 with nothing special adjusted for IPv6.  
 Without modifying the as-shipped freeswitch value, it would not be possible to run fs\_cli and the freeswitch console, amonst other things.
 
 ## References
diff --git a/docs/FreeSWITCH-Explained/Interoperability/Softphones/index.mdx b/docs/FreeSWITCH-Explained/Interoperability/Softphones/index.mdx
@@ -268,7 +268,6 @@ Formerly known as Pangolin. This is a free softphone that is capable of SIP-TLS
 * **Transfer calls:** unknown
 * **Park calls:** unknown
 * **TLS/SRTP:** works (?)
-* **ZRTP: says its supports, not tried (post here if anyone does)**
 
 To enable TLS, have the certificate loaded into the windows certificate store and check boxes 'check certificate from remote side' and 'Load Windows CA' under tab Certificate. Select TLS for 'Preferred Connection Type' under tab Network. (cafile.pem rename to cafile.crt, double click in explorer and install into root certificate store, trust publishers won't work - it simply does TCP even if you select TLS unless you put in root certificate store) (I could not get TLS to work ever with PhonerLite, handshake starts but does not finish registration. Among 20 trials it did work once ! But without any change in anything did not work a moment later. Please post any details to get it to work here. Thanks.)
 
diff --git a/docs/FreeSWITCH-Explained/Introduction/Variables/Global-Variables_13173994.mdx b/docs/FreeSWITCH-Explained/Introduction/Variables/Global-Variables_13173994.mdx
@@ -19,7 +19,7 @@ Click here to expand Table of Contents
    * 1.5 [nat\_public\_addr](#nat_public_addr)  
    * 1.6 [nat\_private\_addr](#nat_private_addr)  
    * 1.7 [nat\_type](#nat_type)  
-   * 1.8 [zrtp\_enabled](#zrtp_enabled)
+   * 1.8 [zrtp\_enabled](#zrtp_enabled) **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 * 2 [Directories](#directories)  
    * 2.1 [base\_dir](#base_dir)  
    * 2.2 [cache\_dir](#cache_dir)  
@@ -105,7 +105,7 @@ string
 
 If you use auto-nat FreeSWITCH will set this global variable to the type of [auto nat](../../Networking/Auto-Nat_6587487.mdx#about) device it detected this can be either pmp or upnp.
 
-### zrtp_enabled
+### zrtp_enabled **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 string
 
diff --git a/docs/FreeSWITCH-Explained/Meta-Pages/XML-Meta-Page_16352177.mdx b/docs/FreeSWITCH-Explained/Meta-Pages/XML-Meta-Page_16352177.mdx
@@ -273,7 +273,7 @@ It seems like people make a big deal out of SIP profiles and naturally isolate t
 
 [Bypass Media Overview](../Codecs-and-Media/Bypass-Media-Overview/index.mdx#faq) – will ultimately need to be in a separate discussion, probably within its current category
 
-[ZRTP](../Codecs-and-Media/ZRTP_7143709.mdx) – has variables
+[ZRTP](../Codecs-and-Media/ZRTP_7143709.mdx) – has variables **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 [VAD and CNG](../Codecs-and-Media/VAD-and-CNG_7144454.mdx#about) – has variables
 
@@ -348,7 +348,7 @@ This section needs to find a place. But the concept of a channel is important. I
 * [Call Forward Example](../Codecs-and-Media/Bypass-Media-Overview/Call-Forward-Example_6587445.mdx#about) XML example for call forwarding
 * [JitterBuffer](../Codecs-and-Media/JitterBuffer_6587407.mdx#about) discusses XML dialplan for application jitterbuffer and config for opus
 * [Codec Negotiation](../Codecs-and-Media/Codec-Negotiation_2883752.mdx#about) \- discusses XML dialplan for setting codec
-* [ZRTP](../Codecs-and-Media/ZRTP_7143709.mdx) \- light description of ZRTP config in XML - probably needs to be in a security section
+* [ZRTP](../Codecs-and-Media/ZRTP_7143709.mdx) \- light description of ZRTP config in XML - **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 * [VAD and CNG](../Codecs-and-Media/VAD-and-CNG_7144454.mdx#about) \- show XML config for setting VAD/CNG vars
 * [Category:TTS](../Codecs-and-Media/13173267.mdx#--) \- shows XML config for an IVR and for using tts from google
 * [T38 Modem](../Codecs-and-Media/T38-Modem_9634338.mdx#about) \- discusses XML dialplan for fax using t38
diff --git a/docs/FreeSWITCH-Explained/Miscellaneous/Specifications_1048680.mdx b/docs/FreeSWITCH-Explained/Miscellaneous/Specifications_1048680.mdx
@@ -29,7 +29,6 @@
 * Configuration via cURL to your HTTP server ([mod\_xml\_curl](https://wiki.freeswitch.org/wiki/Mod%5Fxml%5Fcurl "Mod xml curl")).
 * XML Config files for easy parsing.
 * Protocol Agnostic
-* ZRTP support for transparent RTP based key exchange and encryption
 * Configurable [RFC 2833](https://tools.ietf.org/html/rfc2833) Payload type  
 TODO [RFC 2833](https://tools.ietf.org/html/rfc2833) is obsoleted by [RFC 4733](https://tools.ietf.org/html/rfc4733).
 * Inband DTMF generation and detection.
diff --git a/docs/FreeSWITCH-Explained/Modules/mod_sofia_1048707.mdx b/docs/FreeSWITCH-Explained/Modules/mod_sofia_1048707.mdx
@@ -85,7 +85,7 @@ inbound-proxy-media|true,false
 inbound-reg-force-matching-username|true,false
 inbound-reg-in-new-thread|true,false
 inbound-use-callid-as-uuid|true,false
-inbound-zrtp-passthru|true,false
+inbound-zrtp-passthru|true,false **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 in-dialog-chat|true,false
 liberal-dtmf|true,false
 local-network-acl|acl
diff --git a/docs/FreeSWITCH-Explained/Security/Certificates_3966216.mdx b/docs/FreeSWITCH-Explained/Security/Certificates_3966216.mdx
@@ -12,7 +12,7 @@ Click here to expand Table of Contents
 * 2 [Free Test Certificates](#free-test-certificates)
 * 3 [Securing SIP](#securing-sip)
 * 4 [SRTP](#srtp)
-* 5 [ZRTP](#srtp)
+* 5 [ZRTP](#srtp) **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 * 6 [WebRTC](#webrtc)
 * 7 [DTLS](#dtls)
 
@@ -32,7 +32,7 @@ Some protocols in Freeswitch use the PKI way of doing things, others just create
 
 ## SRTP
 
-## ZRTP
+## ZRTP **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 ## WebRTC
 
diff --git a/docs/FreeSWITCH-Explained/Security/SIP-TLS_9634135.mdx b/docs/FreeSWITCH-Explained/Security/SIP-TLS_9634135.mdx
@@ -76,13 +76,13 @@ In figure 3 you'll note that not only is the control channel encrypted, but the
 
 #### FreeSWITCH Encryption Capabilities
 
-This page will cover only TLS, SSL and SRTP encryption and does not cover ZRTP as of yet.
+This page will cover only TLS, SSL and SRTP encryption.
 
 ##### TLS, SSL and SRTP Encryption
 
 FreeSWITCH supports SIPS via SSL and/or TLS, along with SRTP encryption capabilities. It is unclear as to whether or not FreeSWITCH will encrypt video streams since this has not been tested in the kjv lab, however I suspect that it will. If you conduct testing encrypting SRTP video, by all means add your results to the Wiki.
 
-##### ZRTP Encryption
+##### ZRTP Encryption **ZRTP IS NOW DEPREICATED and will be removed out of the docs**
 
 ZRTP is an opportunistic encryption capability that can be compiled into FreeSWITCH. See the [ZRTP](https://wiki.freeswitch.org/wiki/ZRTP "ZRTP") page for the how-to and additional information pertaining to ZRTP.
 
@@ -108,7 +108,7 @@ It still needs to be understood that the connection from the phone to FreeSWITCH
 
 ####  Choosing Between Encryption Options 
 
-There are a variety of encryption options for FreeSWITCH as described above. TLSV1 encrypts everything over the TCP connection; this has the downside that jitter or delays due to TCP can occur. UDP is generally preferred for RTP and using TLSV1 has some additional traffic overhead. ZRTP has the advantage that it allows for end-to-end encryption without pre-exchanging keys or certificates but is a bit more complex to set up, especially for some clients. Finally there is SSLV23; this encrypts the SIP control channel over an encrypted TCP connection using SSL certificates, but by default doesn't provide anything for the RTP data. The login information and call metadata is transmitted over the control channel so if this is what you care about protecting this is enough and and adds no overhead to the RTP data. If you want to encrypt the voice data itself (so the voice data cannot be understood) it can be combined with SRTP. SRTP enables encryption of the RTP data with minor overhead to each of the RTP UDP packets. This has the benefit that the call data are encrypted but still is over UDP so there should be virtually no difference with SRTP on as with it off. The encryption key used for SRTP is exchanged over the control channel (which SSLV23 encrypts) so gives you something of the best of both worlds. Generally SSLV23 + SRTP is the most firewall friendly/has the fewest changes for existing installations. SSLv23 + SRTP is also fairly easy to configure on the FreeSWITCH server and most likely the most supported encryption method for most clients and SIP phones so generally should be where someone should start for encrypting call data.
+There are a variety of encryption options for FreeSWITCH as described above. TLSV1 encrypts everything over the TCP connection; this has the downside that jitter or delays due to TCP can occur. UDP is generally preferred for RTP and using TLSV1 has some additional traffic overhead. Finally there is SSLV23; this encrypts the SIP control channel over an encrypted TCP connection using SSL certificates, but by default doesn't provide anything for the RTP data. The login information and call metadata is transmitted over the control channel so if this is what you care about protecting this is enough and and adds no overhead to the RTP data. If you want to encrypt the voice data itself (so the voice data cannot be understood) it can be combined with SRTP. SRTP enables encryption of the RTP data with minor overhead to each of the RTP UDP packets. This has the benefit that the call data are encrypted but still is over UDP so there should be virtually no difference with SRTP on as with it off. The encryption key used for SRTP is exchanged over the control channel (which SSLV23 encrypts) so gives you something of the best of both worlds. Generally SSLV23 + SRTP is the most firewall friendly/has the fewest changes for existing installations. SSLv23 + SRTP is also fairly easy to configure on the FreeSWITCH server and most likely the most supported encryption method for most clients and SIP phones so generally should be where someone should start for encrypting call data.
 
 ####  About IP Phones and Encryption 
 
diff --git a/provisioning/nginx/redirects.map b/provisioning/nginx/redirects.map
