From e614126c489d24f1b7b76082a0c465b37b28cc2c Mon Sep 17 00:00:00 2001
From: Alexander Konovalov <alexk@mcs.st-andrews.ac.uk>
Date: Thu, 16 Feb 2017 23:53:15 +0000
Subject: [PATCH] Version 2.2.1

---
 PackageInfo.g  | 12 ++++++------
 doc/manual.xml | 13 ++++++++++---
 makedoc.g      |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/PackageInfo.g b/PackageInfo.g
index c867cfc..d6ceb3f 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -9,11 +9,11 @@ SetPackageInfo( rec(
 
 PackageName := "SCSCP",
 Subtitle := "Symbolic Computation Software Composability Protocol in GAP",
-Version := "2.2.0",
-Date := "06/02/2017",
+Version := "2.2.1",
+Date := "16/02/2017",
 ##  <#GAPDoc Label="PKGVERSIONDATA">
-##  <!ENTITY VERSION "2.2.0">
-##  <!ENTITY RELEASEDATE "6 February 2017">
+##  <!ENTITY VERSION "2.2.1">
+##  <!ENTITY RELEASEDATE "16 February 2017">
 ##  <!ENTITY RELEASEYEAR "2017">
 ##  <#/GAPDoc>
 
@@ -54,7 +54,7 @@ Persons := [
     FirstNames    := "Steve",
     IsAuthor      := true,
     IsMaintainer  := true,
-    Email         := "sal@dcs.st-and.ac.uk",
+    Email         := "sal@cs.st-and.ac.uk",
     WWWHome       := "http://www.cs.st-and.ac.uk/~sal/",
     PostalAddress := Concatenation( [
                      "School of Computer Science\n",
@@ -85,7 +85,7 @@ PackageDoc := rec(
 Dependencies := rec(
   GAP := ">=4.8.2",
   NeededOtherPackages := [ ["GAPDoc", ">= 1.5"], 
-                           ["openmath", ">= 11.4.0"],
+                           ["openmath", ">= 11.4.1"],
                            ["IO", ">= 4.4"] ],
   SuggestedOtherPackages := [],
   ExternalConditions := []
diff --git a/doc/manual.xml b/doc/manual.xml
index 2660328..c3192c2 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -21,7 +21,7 @@
   <Version>Version &VERSION;</Version>
 
   <Author>Alexander Konovalov
-          <Email>alexk at mcs dot st-andrews dot ac dot uk</Email>
+          <Email>alexander dot konovalov at st-andrews dot ac dot uk</Email>
 	      <Homepage>http://www.cs.st-andrews.ac.uk/&tilde;alexk/</Homepage>
           <Address>
             School of Computer Science<Br/>
@@ -80,8 +80,14 @@ for the computational algebra system &GAP;.
 </Copyright>
   
 <Acknowledgements>
-The project 026133 "SCIEnce - Symbolic Computation Infrastructure for Europe" 
-(<URL>http://www.symbolic-computing.org/</URL>) is supported by the EU FP6 Programme.
+The development of the &SCSCP; package has been supported by:
+<List>
+  <Item>EU FP6 Programme project 026133
+  <Q>SCIEnce - Symbolic Computation Infrastructure for Europe</Q>
+  (see <URL>http://www.symbolic-computing.org/</URL>).</Item>
+  <Item>OpenDreamKit Horizon 2020 European Research Infrastructures project #676541
+  (see <URL>http://opendreamkit.org/</URL>).</Item>
+</List>
 </Acknowledgements>
 
 <Colophon>
@@ -96,6 +102,7 @@ Versions history:
 <Item>Version 1.2 - March 2010.</Item>
 <Item>Version 2.0 - October 2011.</Item>
 <Item>Version 2.1 - March 2012.</Item>
+<Item>Version 2.2 - February 2017.</Item>
 </List> 
 </Colophon>
 
diff --git a/makedoc.g b/makedoc.g
index 67a7939..242284a 100644
--- a/makedoc.g
+++ b/makedoc.g
@@ -26,7 +26,7 @@ for i in [ 1 .. Length(tst) ] do
     ch := tst[i];
     AppendTo(output, "# ", pkgname, ", chapter ",i,"\n");
     for a in ch do
-      AppendTo(output, "# ",a[2], a[1]);
+      AppendTo(output, "\n# ",a[2], a[1]);
     od;
     Print("extracted ", Length(ch), " examples \n");
   else