From 404c21816e5b320c73ce552632c591d2e00b4a6f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 6 Feb 2018 14:27:36 +0100
Subject: [PATCH] Use a more permanent URLm even if it's a redirect

---
 README.md                                  |  2 +-
 dnscrypt-proxy/example-dnscrypt-proxy.toml | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6e9b561a..4b0d64d0 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A flexible DNS proxy, with support for modern encrypted DNS protocols such as [D
 
 ## [dnscrypt-proxy 2.0.0rc3 is available for download!](https://github.com/jedisct1/dnscrypt-proxy/releases/latest)
 
-## [Documentation](https://github.com/jedisct1/dnscrypt-proxy/wiki/)
+## [Documentation](https://dnscrypt.info/doc)
 
 ## Features
 
diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
index bd753ebc..3a7c741a 100644
--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
@@ -7,6 +7,8 @@
 
 ## This is an example configuration file.
 ## You should adjust it to your needs, and save it as "dnscrypt-proxy.toml"
+##
+## Online documentation is available here: https://dnscrypt.info/doc
 
 
 
@@ -71,11 +73,7 @@ force_tcp = false
 timeout = 2500
 
 
-## Load-balancing strategy
-## 'p2' = power of two choices (default)
-## 'ph' = power of half the choices
-## 'fastest' = only use the fastest server
-## 'random' = uniform distribution across all available resolvers
+## Load-balancing strategy: 'p2' (default), 'ph', 'fastest' or 'random'
 
 # lb_strategy = 'p2'
 
@@ -305,7 +303,9 @@ cache_neg_ttl = 60
 
 ## Remote lists of available servers
 ## Multiple sources can be used simultaneously, but every source
-## requires a dedicated cache file
+## requires a dedicated cache file.
+##
+## Refer to the documentation for URLs of public sources.
 ##
 ## A prefix can be prepended to server names in order to
 ## avoid collisions if different sources share the same for
@@ -314,9 +314,6 @@ cache_neg_ttl = 60
 ##
 ## A cache file can be specified without a URL in order to maintain lists
 ## locally.
-##
-## The default format is "v2".
-## format='v1' loads CSV files from dnscrypt-proxy 1.x instead.
 
 [sources]
 
@@ -325,7 +322,6 @@ cache_neg_ttl = 60
   [sources.'public-resolvers']
   url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
   cache_file = 'public-resolvers.md'
-  format = 'v2'
   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
   refresh_delay = 72
   prefix = ''