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

diff --git a/doc/library-configuration.txt b/doc/library-configuration.txt
index 18c0cd4..a0f0c13 100644 (file)
--- a/doc/library-configuration.txt
+++ b/doc/library-configuration.txt
@@ -51,7 +51,7 @@ resources by means of credentials stored in MKAdmin: precautions must
 be taken so that such library accounts do not allow unauthorised
 access.
 
-Setting up such a library is a two-stage process.
+Setting up such a library is a two or three-stage process.
 
 Stage A (on MKAdmin)
 
@@ -64,6 +64,12 @@ Create the library:
 
 Stage B (on the application's web-server):
 
+### simple SP URLs
+
+Stage C (optional)
+
+### Fix description
+
 Authentication onto the library can be achieved by a single HTTP GET
 to the relevant Service Proxy, passing in the credentials and thereby
 initiating an HTTP session. This can most simply be done just by

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 1b71a49..655766e 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -3,7 +3,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Orex</title>
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
-    <script type="text/javascript">var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };</script>
+    <script type="text/javascript">
+      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };
+    </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>