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

diff --git a/examples/apache2/example-dev b/examples/apache2/example-dev
new file mode 100644 (file)
index 0000000..c0aff12
--- /dev/null
+++ b/examples/apache2/example-dev
@@ -0,0 +1,11 @@
+# This is for the example-dev.indexdata.com, running on dart
+
+<VirtualHost *:80>
+    ServerName example-dev.indexdata.com
+    DocumentRoot /home/indexdata/mkws-dev/examples/htdocs/
+    ErrorLog /var/log/apache2/example-dev-error.log
+    CustomLog /var/log/apache2/example-dev.log combined
+
+    RewriteEngine on
+</VirtualHost>
+

diff --git a/tools/htdocs/index.html b/tools/htdocs/index.html
index 67ad015..efb24d5 100644 (file)
--- a/tools/htdocs/index.html
+++ b/tools/htdocs/index.html
@@ -171,23 +171,23 @@
       <ul>
        <li>
           A very simple application at
-          <a href="http://example.indexdata.com/"
-             >http://example.indexdata.com/</a>.
+          <a href="//example.indexdata.com/"
+             >//example.indexdata.com/</a>.
        </li>
        <li>
-          <a href="http://example.indexdata.com/minimal.html"
+          <a href="//example.indexdata.com/minimal.html"
              >The absolutely minimal application</a>
          listed above.
        </li>
        <li>
-          <a href="http://example.indexdata.com/language.html"
+          <a href="//example.indexdata.com/language.html"
              >A more detailed version</a>
          that contains a configuration structure instead of accepting
           the defaults. Includes a custom translation option to present
           the application in Arabic.
        </li>
        <li>
-          <a href="http://example.indexdata.com/mobile.html"
+          <a href="//example.indexdata.com/mobile.html"
              >A version suitable for mobile devices</a>,
          with a responsive design that moves components around
           depending on the screen size.
@@ -198,34 +198,34 @@
       <ul>
        <li>
          An application that
-         <a href="http://example.indexdata.com/lowlevel.html"
+         <a href="//example.indexdata.com/lowlevel.html"
             >uses lower-level MKWS components</a>
          rather than the all-in-one <tt>#mkwsResults</tt> division,
          allowing it to use a rather different layout.
        </li>
        <li>
          An application that specifies how to display brief and full records
-         <a href="http://example.indexdata.com/templates.html"
+         <a href="//example.indexdata.com/templates.html"
             >using Handlebar templates</a>.
          (Read about
          <a href="http://handlebarsjs.com/"
             >the templating language</a>.)
        </li>
        <li>
-         <a href="http://example.indexdata.com/localauth.html"
+         <a href="//example.indexdata.com/localauth.html"
             >An application that uses a local authentication regime</a>,
          and the corresponding
-         <a href="http://example.indexdata.com/apache-config.txt"
+         <a href="//example.indexdata.com/apache-config.txt"
             >Apache2 configuration stanza</a>.
        </li>
        <li>
           The
-          <a href="http://example.indexdata.com/jquery.html"
+          <a href="//example.indexdata.com/jquery.html"
              >jQuery plugin</a>
           version, consisting of a single JavaScript statement.
        </li>
        <li>
-          <a href="http://example.indexdata.com/popup.html"
+          <a href="//example.indexdata.com/popup.html"
              >A version that uses a jQuery popup</a>.
        </li>
       </ul>
@@ -233,12 +233,12 @@
       <h3>Non-standard interfaces</h3>
       <ul>
        <li>
-          <a href="http://example.indexdata.com/dict.html"
+          <a href="//example.indexdata.com/dict.html"
              >An application that uses MKWS to find dictionary
             definitions of words when you highlight them</a>.
        </li>
        <li>
-          <a href="http://example.indexdata.com/auto.html"
+          <a href="//example.indexdata.com/auto.html"
              >An application that runs an automatic search on load</a>.
        </li>
        <li>