From 939c902fb0078262a9dd81b430f952ed3faa920d Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Mon, 26 Nov 2018 15:00:17 +0300
Subject: [PATCH] Added upstream examples

---
 client/package-lock.json                   |  6 +++---
 client/src/__locales/en.json               |  6 +++++-
 client/src/components/Settings/Upstream.js | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index e7080ade..fc6ea4f1 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -6588,7 +6588,7 @@
     },
     "html-webpack-plugin": {
       "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
       "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
@@ -6638,7 +6638,7 @@
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
@@ -15003,7 +15003,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index 7b6fba15..9d6e5ce7 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -49,7 +49,7 @@
     "no_settings": "No settings",
     "general_settings": "General settings",
     "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream. Use tls:\/\/ prefix for DNS over TLS servers.",
+    "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream.",
     "test_upstream_btn": "Test upstreams",
     "apply_btn": "Apply",
     "disabled_filtering_toast": "Disabled filtering",
@@ -86,6 +86,10 @@
     "example_comment": "! Here goes a comment",
     "example_comment_meaning": "just a comment",
     "example_comment_hash": "# Also a comment",
+    "example_upstream_regular": "regular DNS (over UDP)",
+    "example_upstream_dot": "encrypted <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
+    "example_upstream_doh": "encrypted <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
+    "example_upstream_tcp": "regular DNS (over TCP)",
     "all_filters_up_to_date_toast": "All filters are already up-to-date",
     "updated_upstream_dns_toast": "Updated the upstream DNS servers",
     "dns_test_ok_toast": "Specified DNS servers are working correctly",
diff --git a/client/src/components/Settings/Upstream.js b/client/src/components/Settings/Upstream.js
index b12b119f..0085298f 100644
--- a/client/src/components/Settings/Upstream.js
+++ b/client/src/components/Settings/Upstream.js
@@ -57,6 +57,24 @@ class Upstream extends Component {
                                 </button>
                             </div>
                         </form>
+                        <hr/>
+                        <div className="list leading-loose">
+                            <Trans>examples_title</Trans>:
+                            <ol className="leading-loose">
+                                <li>
+                                    <code>1.1.1.1</code> - { t('example_upstream_regular') }
+                                </li>
+                                <li>
+                                    <code>tls://1dot1dot1dot1.cloudflare-dns.com</code> - { t('example_upstream_dot') }
+                                </li>
+                                <li>
+                                    <code>https://cloudflare-dns.com/dns-query</code> - { t('example_upstream_doh') }
+                                </li>
+                                <li>
+                                    <code>tcp://1.1.1.1</code> - { t('example_upstream_tcp') }
+                                </li>
+                            </ol>
+                        </div>
                     </div>
                 </div>
             </Card>