From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 8 Aug 2014 13:09:06 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~346^2~4
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=7d41c181fb3c3f61395077761703abf882f505b5;hp=997a4265c4d5f86b7b7772af35a5ccb7d7efe4ab;p=mkws-moved-to-github.git

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

diff --git a/doc/mkws-manual.markdown b/doc/mkws-manual.markdown
index 8750d91..2247868 100644
--- a/doc/mkws-manual.markdown
+++ b/doc/mkws-manual.markdown
@@ -431,7 +431,7 @@ this is very simple:
 	  "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig" };
 	</script>
 
-> TODO This should be the default setting
+> TODO This should be the default setting: see **MKWS-251**.
 
 And ensure that access to the MWKS application is from the correct
 Referrer URL or IP-range.
@@ -445,10 +445,11 @@ URL containing that hostname, such as
 `//yourname.sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig`
 
 > TODO It should be possible to change just the hostname without
-> needing to repeat the rest of the URL (protocol, path, query)
+> needing to repeat the rest of the URL (protocol, path, query): see
+> **MKWS-252**.
 
 > TODO When changing the SP authentication URL, the Pazpar2 URL should
-> in general change along with it.
+> in general change along with it: see **MKWS-253**.
 
 ### (Optional): embed credentials for access to the library
 
@@ -459,7 +460,8 @@ by setting the `service_proxy_auth` configuration item to a URL such as
 `//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=mike&password=swordfish`
 
 > TODO It should be possible to add the username and password to the
-> configuration without needing to repeat the rest of the URL.
+> configuration without needing to repeat the rest of the URL: see
+> **MKWS-254**.
 
 ### (Optional): conceal credentials from HTML source
 
diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index cfc4f89..90caf92 100644
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -6,7 +6,8 @@
     <script type="text/javascript">
       var mkws_config = {
 	pazpar2_url:        "//sp-mkws.indexdata.com/service-proxy/",
-	service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig"
+        // For now, we have to provide known-bad credentials to skip user/pw login: see bug MKSP-125
+	service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX"
         // For explicit credential-based authentication, add: &username=orex&password=orexmkc
       };
     </script>