From 0578b114c17bdc8353372cfe05dfb8fd13a29e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verine=20QUEUNE?= <severine.queune@bulac.fr>
Date: Fri, 30 Oct 2020 18:12:56 +0100
Subject: [PATCH] Bug 25700: (follow-up 2) 2 minor corrections for KohaCon

This patch corrects :
- the wrong link for KohaCon11
- a typo on 'workshops' for KohaCon19
- replace 'hackfest' for 'workshops' for KohaCon20

Signed-off-by: David Nind <david@davidnind.com>
---
 docs/history.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index e512e624de..840607d511 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -586,7 +586,7 @@ Epoch	Date	Description	Tags
 1317772800	October  5 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_5_October_2011
 1318640424	October 15 2011	Greg Barniskis becomes the 165th developer to have a patch pushed	developer
 1319232373	October 21 2011	Koha 3.06.00 released	releases
-1320019200	October 31 - November 6 2011	KohaCon11 in Thane, India - http://wiki.koha-community.org/wiki/KohaCon11_Thane,_India
+1320019200	October 31 - November 6 2011	KohaCon11 in Thane, India - https://koha-community.org/category/kohacon-2011/
 1320864858	November  9 2011	Koha 3.04.06 released	releases
 1321833600	November 21 2011	Plea for help from Horowhenua Library Trust (Koha TM in NZ)
 1322529619	November 29 2011	Koha 3.06.01 released	releases
@@ -1074,7 +1074,7 @@ Epoch	Date	Description	Tags
 1556537618	April 29 2019	Koha 18.11.05 released	releases
 1556634207	April 30 2019	Koha 17.11.18 released	releases
 1556801347	May  2 2019	Koha 18.05.12 released	releases
-1558310400	May 20-26 2019	KohaCon19 and wokshop in Dublin, Ireland - https://koha-community.org/kohacon/kohacon19/
+1558310400	May 20-26 2019	KohaCon19 and workshops in Dublin, Ireland - https://koha-community.org/kohacon/kohacon19/
 1558623387	May 23 2019	Henry Bolshaw becomes the 403rd developer to have a patch pushed	developer
 1559230147	May 30 2019	Koha 19.05.00 released	releases
 1559285796	May 31 2019	Koha 18.11.06 released	releases
@@ -1143,4 +1143,4 @@ Epoch	Date	Description	Tags
 1597785404	August 18 2020	Koha 19.11.09 released	releases
 1598360638	August 25 2020	Koha 19.05.14 released	releases
 1598907821	August 31 2020	Koha 20.05.03 released	releases
-1603065600	October 19-25 2020	KohaCon20 and hackfest in Wellington, New Zealand - https://koha-community.org/kohacon/kohacon20/
+1603065600	October 19-25 2020	KohaCon20 and workshops in Wellington, New Zealand - https://koha-community.org/kohacon/kohacon20/
-- 
2.11.0