Merge remote branch 'kc/new/bug_5370' into kcmaster

diff --git a/etc/zebradb/explain-authorities.xml b/etc/zebradb/explain-authorities.xml
index 6455fc0..e8425d8 100644 (file)
--- a/etc/zebradb/explain-authorities.xml
+++ b/etc/zebradb/explain-authorities.xml
@@ -46,7 +46,7 @@
    
     <history>
       Created for Koha 3
-      http://koha.org
+      http://koha-community.org
     </history>
 
     <implementation  identifier="zebra" version="1.4">

diff --git a/etc/zebradb/explain-biblios.xml b/etc/zebradb/explain-biblios.xml
index 10b9fa5..ff286fd 100644 (file)
--- a/etc/zebradb/explain-biblios.xml
+++ b/etc/zebradb/explain-biblios.xml
@@ -46,7 +46,7 @@
    
     <history>
       Created for Koha 3
-      http://koha.org
+      http://koha-community.org
     </history>
 
     <implementation  identifier="zebra" version="1.4">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
index b6c7b3e..a584de5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
@@ -48,7 +48,7 @@
 
 <p><strong>Is there a repository for reports?</strong></p>
 
-<p>There is a page on the Koha Wiki: <a href="http://wiki.koha.org/doku.php?id=sql_library" target="_new">http://wiki.koha.org/doku.php?id=sql_library</a> with reports written by Koha libraries around the world.</p>
+<p>There is a page on the Koha Wiki: <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="_new">http://wiki.koha-community.org/wiki/SQL_Reports_Library</a> with reports written by Koha libraries around the world.</p>
 
 <p>NEKLS also has a great page (<a href="http://www.nexpresslibrary.org/training/reports-training/" target="_new">http://www.nexpresslibrary.org/training/reports-training/</a>) with a list of reports they have written.</p>
 

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index 66f2a66..dfb4884 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -41,7 +41,7 @@
         <!-- /TMPL_LOOP -->
         </ul></li></ul>
         <!-- TMPL_ELSE -->
-            <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div>
+            <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha-community.org/wiki/Opac_browse_feature">Koha Wiki</a> for more information on what it does and how to configure it.</div>
         <!-- /TMPL_IF -->
 </div></div>
 </div>

diff --git a/misc/release_notes/README.txt b/misc/release_notes/README.txt
index 1a3f66f..b7c8813 100644 (file)
--- a/misc/release_notes/README.txt
+++ b/misc/release_notes/README.txt
@@ -31,7 +31,7 @@ Sign, MD5 the release, upload:
  $ gpg --clearsign koha-3.00.00-alpha.tar.gz.MD5
  $ cat koha-3.00.00-alpha.tar.gz.MD5.asc
  $ gpg --detach-sign koha-3.00.00-alpha.tar.gz
- $ scp * download.koha.org
+ $ scp * download.koha-community.org
 
 Tag the Release:
 From a clone of the RM repo, run: