From: Mike Taylor <mike@indexdata.com>
Date: Mon, 17 Mar 2014 12:35:51 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1318
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=2fd469f776110c2ba03d2a16d603bf32a2b01cdf;hp=6236b6b809b986cfc1dfec99d9376223c718d343;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/tools/htdocs/whitepaper.markdown b/tools/htdocs/whitepaper.markdown
index ecf0669..376da7a 100644
--- a/tools/htdocs/whitepaper.markdown
+++ b/tools/htdocs/whitepaper.markdown
@@ -384,7 +384,7 @@ service_proxy_auth        url     *Note 4*  A URL which, when `use_service_proxy
                                             session to authenticate the user and establish a session that encompasses a defined set
                                             of targets to search in.
 
-service_proxy_auth_domain domain            Can be set to the domain for which `service_proxy_auth` proxies authenticationm, so
+service_proxy_auth_domain domain            Can be set to the domain for which `service_proxy_auth` proxies authentication, so
                                             that cookies are rewritten to appear to be from this domain. In general, this is not
                                             necessary, as this setting defaults to the domain of `pazpar2_url`.