[MKDoc-commit] [mkd-import] found these uncommitted chnages on a live server

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
[mkd-import] found these uncommitted chnages on a live server

Modified Files:
--------------
    mkd-import/examples/ukaf/tmpl:
        agency.html
        language.html
        region.html
        root.html

-------------- next part --------------
Index: root.html
===================================================================
RCS file: /var/spool/cvs/mkd-import/examples/ukaf/tmpl/root.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexamples/ukaf/tmpl/root.html -Lexamples/ukaf/tmpl/root.html -u -r1.1 -r1.2
--- examples/ukaf/tmpl/root.html
+++ examples/ukaf/tmpl/root.html
@@ -8,7 +8,8 @@
   <mkdoc:Editor_Created_ID>1</mkdoc:Editor_Created_ID>
   <mkdoc:Editor_Last_Modified_ID>1</mkdoc:Editor_Last_Modified_ID>
   <mkdoc:Cache_Control>120</mkdoc:Cache_Control>
-  <mkdoc:Lang>fr</mkdoc:Lang>
-  <mkdoc:Keywords>aucun</mkdoc:Keywords>
-  <mkdoc:Description>Agences fournissant un support en Francais</mkdoc:Description>
+  <mkdoc:Lang>en</mkdoc:Lang>
+  <mkdoc:Keywords>agencies</mkdoc:Keywords>
+  <mkdoc:Description>Agencies</mkdoc:Description>
+  <mkdoc:Template>agency</mkdoc:Template>
 </root>
Index: agency.html
===================================================================
RCS file: /var/spool/cvs/mkd-import/examples/ukaf/tmpl/agency.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexamples/ukaf/tmpl/agency.html -Lexamples/ukaf/tmpl/agency.html -u -r1.1 -r1.2
--- examples/ukaf/tmpl/agency.html
+++ examples/ukaf/tmpl/agency.html
@@ -56,8 +56,17 @@
   <mkdoc:Cache_Control>120</mkdoc:Cache_Control>
   <mkdoc:Lang>en</mkdoc:Lang>
   <mkdoc:Keywords>none</mkdoc:Keywords>
-  <mkdoc:Description petal:content="self/record/TargetGroup"></mkdoc:Description>
+  <mkdoc:Description petal:content="string: ${self/record/OrgName} offers these services: ${self/record/ServiceOffered}"></mkdoc:Description>
+  <mkdoc:Template>agency</mkdoc:Template>
   <mkdoc:Body type="flo::editor::Html">
+    <h2>Service Offered</h2>
+    <p petal:content="self/record/ServiceOffered">Service Offered</p>
+    <h2>Target Group</h2>
+    <p petal:content="self/record/TargetGroup">Target Group</p>
+    <h2>Languages</h2>
+    <p petal:content="self/record/Languages">Languages</p>
+    <h2>Area Served</h2>
+    <p petal:content="self/record/AreaServed">Area Served</p>
     <h2>Contact details</h2>
     <dl>
       <dt petal:condition="self/record/PublicPhone">Phone</dt>
@@ -82,7 +91,7 @@
       </dd>
     </dl>
 
-    <h2>Office Hours</h2>
+    <h2>Opening Hours</h2>
     <dl>
       <dt>Monday</dt>
       <dd petal:content="self/record/Monday">stuff</dd>
@@ -97,5 +106,6 @@
       <dt>Weekends</dt>
       <dd petal:content="self/record/Weekends">stuff</dd>
     </dl>
+
   </mkdoc:Body>
 </root>
Index: language.html
===================================================================
RCS file: /var/spool/cvs/mkd-import/examples/ukaf/tmpl/language.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexamples/ukaf/tmpl/language.html -Lexamples/ukaf/tmpl/language.html -u -r1.1 -r1.2
--- examples/ukaf/tmpl/language.html
+++ examples/ukaf/tmpl/language.html
@@ -12,6 +12,7 @@
   <mkdoc:Editor_Last_Modified_ID>1</mkdoc:Editor_Last_Modified_ID>
   <mkdoc:Cache_Control>120</mkdoc:Cache_Control>
   <mkdoc:Lang>en</mkdoc:Lang>
-  <mkdoc:Keywords>aucun</mkdoc:Keywords>
+  <mkdoc:Keywords petal:content="self/record/0/language"></mkdoc:Keywords>
   <mkdoc:Description>Agencies providing services in ${self/record/0/language}.</mkdoc:Description>
+  <mkdoc:Template>agency</mkdoc:Template>
 </root>
Index: region.html
===================================================================
RCS file: /var/spool/cvs/mkd-import/examples/ukaf/tmpl/region.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexamples/ukaf/tmpl/region.html -Lexamples/ukaf/tmpl/region.html -u -r1.1 -r1.2
--- examples/ukaf/tmpl/region.html
+++ examples/ukaf/tmpl/region.html
@@ -16,4 +16,5 @@
   <mkdoc:Lang>en</mkdoc:Lang>
   <mkdoc:Keywords>none</mkdoc:Keywords>
   <mkdoc:Description>Agencies providing services in ${self/record/0/language} in ${self/record/0/region}</mkdoc:Description>
+  <mkdoc:Template>agency</mkdoc:Template>
 </root>