update marcedit link

Conflicts:

	en/manual.xml

diff --git a/en/manual.xml b/en/manual.xml
index 1477191..7f3766f 100644 (file)
--- a/en/manual.xml
+++ b/en/manual.xml
@@ -28964,16 +28964,13 @@ location: [STAFF, ISO]</programlisting>Will block items with an itype code of
         to place holds on those books, you may need to add item records to the
         *.mrc file before importing.</para>
 
-        <para>The easiest way to import your latest order is to first run your
-        records through <ulink
-        url="http://people.oregonstate.edu/~reeset/marcedit/html/index.php">MARCEdit</ulink>.
-        Download your MARC records, saving them to your desktop or some other
-        location you use/will remember. If you have MARCEdit already installed
-        you should simply have to double click on your MARC records, and they
-        will automatically open in MARCEdit.<important>
-            <para>This tutorial was written with MARCEdit version
-            5.2.3769.41641 on Windows XP, instructions may be different if
-            your version or operating system is different.</para>
+        <para>The easiest way to import your latest order is to first run your records through
+            <ulink url="http://marcedit.reeset.net/">MARCEdit</ulink>. Download your MARC records,
+          saving them to your desktop or some other location you use/will remember. If you have
+          MARCEdit already installed you should simply have to double click on your MARC records,
+          and they will automatically open in MARCEdit.<important>
+            <para>This tutorial was written with MARCEdit version 5.2.3769.41641 on Windows XP,
+              instructions may be different if your version or operating system is different.</para>
           </important></para>
 
         <itemizedlist>
@@ -43011,7 +43008,8 @@ $ zebraidx -c /etc/koha/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init </p
   <appendix id="marcedit">
     <title>MarcEdit</title>
 
-    <para/>
+    <para>Download MarcEdit : <ulink url="http://marcedit.reeset.net/"
+        >http://marcedit.reeset.net/</ulink></para>
 
     <section id="marceditprefix">
       <title>Adding a prefix to call numbers</title>
@@ -43119,9 +43117,10 @@ $ zebraidx -c /etc/koha/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init </p
       <section id="convertexcel">
         <title>Converting from Excel format into .mrk format</title>
 
-        <para>First, we will convert excel format into .mrk format. For this
-        we will use MarcEdit. You can download it from <ulink
-        url="http://people.oregonstate.edu/~reeset/marcedit/html/downloads.html">http://people.oregonstate.edu/~reeset/marcedit/html/downloads.html</ulink>.</para>
+
+        <para>First, we will convert excel format into .mrk format. For this we will use MarcEdit.
+          You can download it from <ulink url="http://marcedit.reeset.net/"
+            >http://marcedit.reeset.net/</ulink></para>
 
         <para>Now open it and select Add-ins--&gt;Delimited Text
         Translator.</para>