# HG changeset patch
# User devteam
# Date 1444754285 14400
# Node ID 02f427c3614b9f52aa7a0aafc7d3842f4be38a24
# Parent  e556721b9872a54d5ec82ed0ca7bd40aabe131c0
planemo upload commit 33927a87ba2eee9bf0ecdd376a66241b17b3d734

diff -r e556721b9872 -r 02f427c3614b cuff_macros.xml
--- a/cuff_macros.xml	Wed Nov 26 13:58:56 2014 -0500
+++ b/cuff_macros.xml	Tue Oct 13 12:38:05 2015 -0400
@@ -10,8 +10,8 @@
     <stdio>
         <exit_code range="1:" />
         <exit_code range=":-1" />
-        <regex match="Error:" />
-        <regex match="Exception:" />
+        <regex match="Error" />
+        <regex match="Exception" />
     </stdio>
   </xml>
   <xml name="condition_inputs">
@@ -88,4 +88,4 @@
             #end for
   </token>
   <token name="@HAS_MULTIPLE_INPUTS@">getattr(inputs, "__len__", [].__len__)() >= 2</token>
-</macros>
\ No newline at end of file
+</macros>
diff -r e556721b9872 -r 02f427c3614b cuffmerge_wrapper.xml
--- a/cuffmerge_wrapper.xml	Wed Nov 26 13:58:56 2014 -0500
+++ b/cuffmerge_wrapper.xml	Tue Oct 13 12:38:05 2015 -0400
@@ -97,8 +97,8 @@
 
 Cuffmerge is part of Cufflinks_. Please cite: Trapnell C, Williams BA, Pertea G, Mortazavi AM, Kwan G, van Baren MJ, Salzberg SL, Wold B, Pachter L. Transcript assembly and abundance estimation from RNA-Seq reveals thousands of new transcripts and switching among isoforms. Nature Biotechnology doi:10.1038/nbt.1621
 
-.. _Cufflinks: http://cufflinks.cbcb.umd.edu/
-        
+.. _Cufflinks: http://cole-trapnell-lab.github.io/cufflinks/
+
 ------
 
 **Know what you are doing**
@@ -107,7 +107,7 @@
 
 There is no such thing (yet) as an automated gearshift in expression analysis. It is all like stick-shift driving in San Francisco. In other words, running this tool with default parameters will probably not give you meaningful results. A way to deal with this is to **understand** the parameters by carefully reading the `documentation`__ and experimenting. Fortunately, Galaxy makes experimenting easy.
 
-.. __: http://cufflinks.cbcb.umd.edu/manual.html#cuffmerge
+.. __: http://cole-trapnell-lab.github.io/cufflinks/cuffmerge/
 
 ------