From 2f16504e9a2626940127c44492a463e685305f04 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 7 Nov 2010 07:10:06 +0100 Subject: [PATCH 1/3] Bug 5370: Fix references to koha.org and other old websites --- installer/data/mysql/fr-FR/2-Optionel/sample_news.sql | 2 +- installer/data/mysql/it-IT/necessari/sample_news.sql | 4 ++-- installer/data/mysql/pl-PL/optional/sample_news.sql | 2 +- installer/data/mysql/ru-RU/optional/sample_news.sql | 8 ++++---- installer/data/mysql/uk-UA/optional/sample_news.sql | 8 ++++---- .../prog/en/modules/help/patroncards/home.tmpl | 4 ++-- .../intranet-tmpl/prog/en/modules/labels/label-home.tmpl | 2 +- .../intranet-tmpl/prog/en/modules/patroncards/home.tmpl | 2 +- misc/cronjobs/longoverdue.pl | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql index e44609dc81..0f3d9c5c73 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql @@ -1,2 +1,2 @@ SET NAMES utf8; -INSERT INTO `opac_news` VALUES (1,'Bienvenue dans Koha !','Bienvenue dans Koha 3, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),(2,'Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n\r\n','koha','2008-01-14 03:34:45','2099-01-10',2); +INSERT INTO `opac_news` VALUES (1,'Bienvenue dans Koha !','Bienvenue dans Koha 3, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),(2,'Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n\r\n','koha','2008-01-14 03:34:45','2099-01-10',2); diff --git a/installer/data/mysql/it-IT/necessari/sample_news.sql b/installer/data/mysql/it-IT/necessari/sample_news.sql index 5f6263e0fa..30cb64e8e2 100644 --- a/installer/data/mysql/it-IT/necessari/sample_news.sql +++ b/installer/data/mysql/it-IT/necessari/sample_news.sql @@ -17,6 +17,6 @@ SET FOREIGN_KEY_CHECKS=0; INSERT INTO opac_news (idnew, title, new, lang, timestamp, expirationdate, number) VALUES (1, 'Benvenuto in Koha', '

Koha è un gestionale di biblioteca (ILS) completo e Open Source. Sviluppato inzialmente in New Zealand da Katipo Communications Ltd e messo in linea per la prima volta nel gennaio 2000 per il Horowhenua Library Trust, Koha è ora mantenuto da un gruppo di aziende di servizi e dipendenti di biblioteca distribuiti in tutto il mondo.

', 'koha', '2007-10-29 00:00:00', '2099-01-10', 1), -(2, 'Cosa c''è di nuovo ?', '

Ora che hai installato cosa, qual''è il passo successivo ? Qui alcuni suggerimenti:

\r\n\r\n', 'koha', '2007-10-29 00:00:00', '2099-01-10', 2); +(2, 'Cosa c''è di nuovo ?', '

Ora che hai installato cosa, qual''è il passo successivo ? Qui alcuni suggerimenti:

\r\n\r\n', 'koha', '2007-10-29 00:00:00', '2099-01-10', 2); -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/pl-PL/optional/sample_news.sql b/installer/data/mysql/pl-PL/optional/sample_news.sql index 3c32abe098..a055b6a9d5 100644 --- a/installer/data/mysql/pl-PL/optional/sample_news.sql +++ b/installer/data/mysql/pl-PL/optional/sample_news.sql @@ -1,3 +1,3 @@ INSERT INTO `opac_news` VALUES (1,'Witaj w Koha.','Koha to profesjonalny system biblioteczny o otwartym kodzie. Stworzony w Nowej Zelandii przez Katipo Communications Ltd (wdrożony po raz pierwszy w styczniu 2000 r. Horowhenua Library Trust) jest obecnie rozwijany przez grupe programistów i bibliotekarzy z całego świata..','koha','2007-10-29 05:25:58','2099-01-10',1), (2,'Co dalej?','Zainstalowałeś Koha - i co dalej? Poniżej znajdziesz kilka wskazówek: -\r\n\r\n','koha','2007-10-29 05:34:45','2099-01-10',2); +\r\n\r\n','koha','2007-10-29 05:34:45','2099-01-10',2); diff --git a/installer/data/mysql/ru-RU/optional/sample_news.sql b/installer/data/mysql/ru-RU/optional/sample_news.sql index 3aefcdccd4..b6907cfe00 100644 --- a/installer/data/mysql/ru-RU/optional/sample_news.sql +++ b/installer/data/mysql/ru-RU/optional/sample_news.sql @@ -15,15 +15,15 @@ INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirati INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(5,'What\'s Next?','Now that you\'ve installed Koha, what\'s next? Here are some suggestions:\r\n\r\n','en','2007-10-29 05:34:45','2099-01-10',2); +(5,'What\'s Next?','Now that you\'ve installed Koha, what\'s next? Here are some suggestions:\r\n\r\n','en','2007-10-29 05:34:45','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(6,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','uk-UA','2008-05-28 23:07:23','2099-01-10',2); +(6,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','uk-UA','2008-05-28 23:07:23','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(7,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','ru-RU','2008-05-28 23:02:25','2099-01-10',2); +(7,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','ru-RU','2008-05-28 23:02:25','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(8,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','koha','2008-05-28 23:02:25','2099-01-10',2); +(8,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','koha','2008-05-28 23:02:25','2099-01-10',2); diff --git a/installer/data/mysql/uk-UA/optional/sample_news.sql b/installer/data/mysql/uk-UA/optional/sample_news.sql index 5aafe03929..614edaca6d 100644 --- a/installer/data/mysql/uk-UA/optional/sample_news.sql +++ b/installer/data/mysql/uk-UA/optional/sample_news.sql @@ -4,7 +4,7 @@ INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirati (1,'Добро пожаловать в Коха','Добро пожаловать в Коха. Коха является полнофункциональной АБИС с открытыми исходниками. Разработана первоначально в Новой Зеландии компанией Katipo Communications Ltd и впервые выпущена в январе 2000 года для библиотечного консорциума Хороунеа, Коха в настоящее время поддерживается группой поставщиков программного обеспечения и специалистами по библиотечным технологиям со всего земного шара. ','ru-RU','2007-10-29 05:25:58','2099-01-10',1); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(2,'What\'s Next?','Now that you\'ve installed Koha, what\'s next? Here are some suggestions:\r\n\r\n','en','2007-10-29 05:34:45','2099-01-10',2); +(2,'What\'s Next?','Now that you\'ve installed Koha, what\'s next? Here are some suggestions:\r\n\r\n','en','2007-10-29 05:34:45','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES (3,'Welcome to Koha','Welcome to Koha. Koha is a full-featured open-source ILS. Developed initially in New Zealand by Katipo Communications Ltd and first deployed in January of 2000 for Horowhenua Library Trust, Koha is currently maintained by a team of software providers and library technology staff from around the globe.','en','2008-05-28 22:45:42','2099-01-10',1); @@ -13,13 +13,13 @@ INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirati (4,'Ласкаво просимо до Коха','Ласкаво просимо до Коха. Коха є повнофункціональною АБІС з відкритими джерельними кодам. Розроблена спочатку в Новій Зеландії компанією Katipo Communications Ltd і вперше випущена в січні 2000 року для бібліотечного консорціуму Хороунеа. Коха в даний час підтримується групою постачальників програмного забезпечення і фахівцями з бібліотечних технологій зі всієї земної кулі. ','koha','2008-05-28 22:48:29','2099-01-10',1); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(5,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','ru-RU','2008-05-28 23:02:25','2099-01-10',2); +(5,'Что дальше?','Теперь, когда Вы установили Коха, что же дальше? Вот некоторые предложения:\r\n','ru-RU','2008-05-28 23:02:25','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(6,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','koha','2008-05-28 23:07:23','2099-01-10',2); +(6,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','koha','2008-05-28 23:07:23','2099-01-10',2); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES (7,'Ласкаво просимо до Коха','Ласкаво просимо до Коха. Коха є повнофункціональною АБІС з відкритими джерельними кодам. Розроблена спочатку в Новій Зеландії компанією Katipo Communications Ltd і вперше випущена в січні 2000 року для бібліотечного консорціуму Хороунеа. Коха в даний час підтримується групою постачальників програмного забезпечення і фахівцями з бібліотечних технологій зі всієї земної кулі. ','uk-UA','2008-05-28 22:48:29','2099-01-10',1); INSERT INTO `opac_news` (`idnew`, `title`, `new`, `lang`, `timestamp`, `expirationdate`, `number`) VALUES -(8,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','uk-UA','2008-05-28 23:07:23','2099-01-10',2); +(8,'Що далі?','Тепер, коли Ви встановили Коха, що ж далі? Ось деякі пропозиції:\r\n','uk-UA','2008-05-28 23:07:23','2099-01-10',2); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tmpl index 14ba2e702e..f2f5ee0dba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tmpl @@ -12,6 +12,6 @@
  • Export card data as a PDF readable by any standard PDF reader, making patron cards printable directly on a printer

    • At the top of each screen within the Patron Card Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Patron Card Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Patron Card Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Patron Card Creator by clicking the online help link at the upper left-hand corner of every page.

    -

    The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    +

    The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl index 6460e44352..ade714d903 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl @@ -38,7 +38,7 @@

    At the top of each screen within the Label Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Label Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Label Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Label Creator by clicking the online help link at the upper left-hand corner of every page.

    -

    The developers of the Label Creator module hope you will find this an extremely useful tool in the course of your cataloging work. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    +

    The developers of the Label Creator module hope you will find this an extremely useful tool in the course of your cataloging work. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tmpl index fe25e3f20f..686316c8c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tmpl @@ -33,7 +33,7 @@
  • Export card data as a PDF readable by any standard PDF reader, making patron cards printable directly on a printer

    • At the top of each screen within the Patron Card Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Patron Card Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Patron Card Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Patron Card Creator by clicking the online help link at the upper left-hand corner of every page.

    -

    The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    +

    The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.

    diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl index cd0cbd6564..5fb1ec2b66 100755 --- a/misc/cronjobs/longoverdue.pl +++ b/misc/cronjobs/longoverdue.pl @@ -81,7 +81,7 @@ WARNING: Flippant use of this script could set all or most of the items in your patrons for them! WARNING: This script is known to be faulty. It is NOT recommended to use multiple --lost options. - See http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=2881 + See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2883 ENDUSAGE From 9f688ad92b04377bcb37b04448292e43509df80b Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 7 Nov 2010 08:42:49 +0100 Subject: [PATCH 2/3] Bug 5370: Fix all references to koha.org Signed-off-by: Chris Cormack --- C4/XSLT.pm | 2 +- .../marc21/authorities/authority-koha-indexdefs.xml | 2 +- .../marc21/authorities/authority-zebra-indexdefs.xsl | 2 +- .../marc21/authorities/koha-indexdefs-to-zebra.xsl | 2 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 2 +- .../opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl | 2 +- misc/cronjobs/rss/README | 6 +++--- misc/cronjobs/rss/lastAcquired-1.0.conf | 6 +++--- misc/cronjobs/rss/lastAcquired-2.0.conf | 6 +++--- misc/cronjobs/rss/lastAcquired.conf | 6 +++--- misc/cronjobs/rss/longestUnseen.conf | 6 +++--- misc/cronjobs/rss/mostReserved.conf | 6 +++--- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index ddc907759f..78443303b9 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -218,7 +218,7 @@ sub buildKohaItemsNamespace { . ""; } - $xml = "".$xml.""; + $xml = "".$xml.""; return $xml; } diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml index 52bf15d629..8b56ad046a 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml @@ -1,5 +1,5 @@ - + v x diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl index 4cecf9c5b8..c05b711078 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl @@ -1,5 +1,5 @@ - + diff --git a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl index 198b0c3768..57c632108e 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl @@ -4,7 +4,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias" xmlns:z="http://indexdata.com/zebra-2.0" - xmlns:kohaidx="http://www.koha.org/schemas/index-defs"> + xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index f4bc51f9ff..9de39cf24d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -2,7 +2,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl index 55cd3709c9..38c6124d27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl @@ -4,7 +4,7 @@ diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index e31dbe7c44..0682ae0161 100755 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -2,7 +2,7 @@ diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 372d31c679..a8121c1cb1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -2,7 +2,7 @@ diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl index 69e5cf67cf..2ef828ffc1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -4,7 +4,7 @@ diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl index 1290e94e00..66c41c0380 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl @@ -4,7 +4,7 @@ diff --git a/misc/cronjobs/rss/README b/misc/cronjobs/rss/README index adeeda3cfd..896a1d9439 100644 --- a/misc/cronjobs/rss/README +++ b/misc/cronjobs/rss/README @@ -42,14 +42,14 @@ Here's the lastAquired.conf by way of example: channel title=Recent Koha Acquisitions -link=http://www.koha.org +link=http://www.koha-community.org desc=The 15 most recent acquisitions lang=en lastBuild=Fri, 09 May 2003 08:00:00 image title=Koha, the worlds best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org config tmpl=lastAcquired.tmpl output=lastAcquired.xml diff --git a/misc/cronjobs/rss/lastAcquired-1.0.conf b/misc/cronjobs/rss/lastAcquired-1.0.conf index 44036d8d0f..d70cf71f8f 100644 --- a/misc/cronjobs/rss/lastAcquired-1.0.conf +++ b/misc/cronjobs/rss/lastAcquired-1.0.conf @@ -1,12 +1,12 @@ channel title=Recent Acquisitions -link=http://www.koha.org +link=http://www.koha-community.org desc=The library's 15 most recent acquisitions lang=en image title=Koha, the worlds best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org description=Koha, the worlds best Open Source Library System config tmpl=lastAcquired-1.0.tmpl diff --git a/misc/cronjobs/rss/lastAcquired-2.0.conf b/misc/cronjobs/rss/lastAcquired-2.0.conf index 5e6a1b5f49..0a03937f94 100644 --- a/misc/cronjobs/rss/lastAcquired-2.0.conf +++ b/misc/cronjobs/rss/lastAcquired-2.0.conf @@ -1,12 +1,12 @@ channel title=Recent Acquisitions -link=http://www.koha.org +link=http://www.koha-community.org desc=The library's 15 most recent acquisitions lang=en image title=Koha, the worlds best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org description=Koha, the worlds best Open Source Library System width=88 height=31 diff --git a/misc/cronjobs/rss/lastAcquired.conf b/misc/cronjobs/rss/lastAcquired.conf index 4ae696a47d..1147d9469b 100644 --- a/misc/cronjobs/rss/lastAcquired.conf +++ b/misc/cronjobs/rss/lastAcquired.conf @@ -1,13 +1,13 @@ channel title=Recent Koha Acquisitions -link=http://www.koha.org +link=http://www.koha-community.org desc=The 15 most recent acquisitions lang=en lastBuild=Fri, 09 May 2003 08:00:00 image title=Koha, the world's best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org config tmpl=lastAcquired.tmpl output=lastAcquired.xml diff --git a/misc/cronjobs/rss/longestUnseen.conf b/misc/cronjobs/rss/longestUnseen.conf index 91d7186ffe..7c0218cd38 100644 --- a/misc/cronjobs/rss/longestUnseen.conf +++ b/misc/cronjobs/rss/longestUnseen.conf @@ -1,12 +1,12 @@ channel title=Longest Unseen Koha Items -link=http://www.koha.org +link=http://www.koha-community.org desc=The 15 least recently seen items lang=en image title=Koha, the worlds best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org config tmpl=longestUnseen.tmpl output=longestUnseen.xml diff --git a/misc/cronjobs/rss/mostReserved.conf b/misc/cronjobs/rss/mostReserved.conf index 437b660a80..f6c44ad523 100644 --- a/misc/cronjobs/rss/mostReserved.conf +++ b/misc/cronjobs/rss/mostReserved.conf @@ -1,12 +1,12 @@ channel title=Most Reserved Items -link=http://www.koha.org +link=http://www.koha-community.org desc=The 15 most reserved items lang=en image title=Koha, the worlds best Open Source Library System -url=http://www.koha.org/images/foo.jpg -link=http://www.koha.org +url=http://www.koha-community.org/images/foo.jpg +link=http://www.koha-community.org config tmpl=mostReserved.tmpl output=mostReserved.xml From 6df634855cc62a5f31b419ecd1946500bf576065 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 7 Nov 2010 11:59:00 +0100 Subject: [PATCH 3/3] Bug 5370: Fix all the references to koha.org Signed-off-by: Chris Cormack --- Makefile.PL | 1 - install-CPAN.pl | 1 - install_misc/README.fr.install_koha_on_fresh_debian | 4 ++-- install_misc/install_koha_on_fresh_debian | 8 ++++---- installer/data/mysql/backfill_statistics.pl | 2 +- installer/data/mysql/update22to30.pl | 2 +- rewrite-config.PL | 1 - 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 6c964601c4..5021f6cc42 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -16,7 +16,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # Current maintainer MJR http://mjr.towers.org.uk/ -# See http://www.koha.org/wiki/?page=KohaInstaller # use strict; diff --git a/install-CPAN.pl b/install-CPAN.pl index 4c79ecb1c1..7b775fe13f 100644 --- a/install-CPAN.pl +++ b/install-CPAN.pl @@ -23,7 +23,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # Current maintainer MJR http://mjr.towers.org.uk/ -# See http://www.koha.org/wiki/?page=KohaInstaller # Create a fake CPAN location for koha use CPAN; diff --git a/install_misc/README.fr.install_koha_on_fresh_debian b/install_misc/README.fr.install_koha_on_fresh_debian index 7815b68f27..3fb999b03d 100644 --- a/install_misc/README.fr.install_koha_on_fresh_debian +++ b/install_misc/README.fr.install_koha_on_fresh_debian @@ -52,7 +52,7 @@ Le script nécessite les droits root. lancer l'installation: les modificateurs sont: -b: installer koha grace au tarball du site koha.org +b: installer koha grace au tarball du site koha-community.org c: ne pas configurer le systeme de paquet debian ils sont regroupés (sans espace), ainsi @@ -70,7 +70,7 @@ conseillons de conserver ce paramètre et de selectionner [dev] comme type d'installation lorsque cela vous sera demandé. Ce choix vous permet de mettre koha à jour par un simple git pull. -Si vous préférez utiliser le tarball disponible sur le site de koha.org, +Si vous préférez utiliser le tarball disponible sur le site de koha-community.org, utilisez le modificateur b: sh install_koha_on_fresh_debian b diff --git a/install_misc/install_koha_on_fresh_debian b/install_misc/install_koha_on_fresh_debian index f20127bc05..6ff1e14a80 100644 --- a/install_misc/install_koha_on_fresh_debian +++ b/install_misc/install_koha_on_fresh_debian @@ -2,7 +2,7 @@ # Licensed under the GPL # Copyright 2008 Biblibre.com -# Koha library project www.koha.org +# Koha library project www.koha-community.org # # this script follow all the installtion procedure described in INSTALL.Debian # with some additions to use lenny packages. @@ -270,11 +270,11 @@ get_koha_git_clone () { dpkg -l git-core || aptitude -y install git-core git-email - git clone git://git.koha.org/pub/scm/koha.git "$base" + git clone git://git.koha-community.org/koha.git "$base" } get_koha_release () { - wget -O- http://download.koha.org/koha-3.00.00.tar.gz | + wget -O- http://download.koha-community.org/koha-3.00.00.tar.gz | tar xzf - } @@ -292,7 +292,7 @@ get_koha_beta () { local i basename; i=2 while [ $i != 11 ]; do basename=koha-3.00.00-beta$i - wget -O- http://download.koha.org/$basename.tar.gz | + wget -O- http://download.koha-community.org/$basename.tar.gz | tar xzf - && mv $basename "$base" && return 0 diff --git a/installer/data/mysql/backfill_statistics.pl b/installer/data/mysql/backfill_statistics.pl index 2820dea526..361f544788 100755 --- a/installer/data/mysql/backfill_statistics.pl +++ b/installer/data/mysql/backfill_statistics.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Part of the Koha Library Software www.koha.org +# Part of the Koha Library Software www.koha-community.org # Licensed under the GPL. use strict; diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl index c12c5bbcf3..6d5b1ccd74 100755 --- a/installer/data/mysql/update22to30.pl +++ b/installer/data/mysql/update22to30.pl @@ -4,7 +4,7 @@ # Database Updater # This script checks for required updates to the database. -# Part of the Koha Library Software www.koha.org +# Part of the Koha Library Software www.koha-community.org # Licensed under the GPL. # Bugs/ToDo: diff --git a/rewrite-config.PL b/rewrite-config.PL index c1c84c0861..7817f91013 100644 --- a/rewrite-config.PL +++ b/rewrite-config.PL @@ -16,7 +16,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # Current maintainer MJR http://mjr.towers.org.uk/ -# See http://www.koha.org/wiki/?page=KohaInstaller # # 2007/11/12 Added DB_PORT and changed other keywords to reflect multi-dbms support. -fbcit