diff macros.xml @ 4:80ce9ca55697 draft

planemo upload commit d27827cf38d30b9c98923f73bc9cae4ffe41361b
author galaxyp
date Fri, 07 Dec 2018 13:43:06 -0500
parents 47bfbd6597d0
children
line wrap: on
line diff
--- a/macros.xml	Thu Dec 06 08:50:19 2018 -0500
+++ b/macros.xml	Fri Dec 07 13:43:06 2018 -0500
@@ -9,9 +9,9 @@
     <xml name="ONTOLOGY_ARGS">
         <conditional name="ontology_args">
             <param name="ontology" type="select" label="Ontology">
-                <option value="go">GO Gene Ontology (column named 'go')</option>
-                <option value="ec">EC Enzyme Commission (column named 'ec')</option>
-                <option value="cog">COG (column named 'cog')</option>
+                <option value="go">Gene Ontology (GO terms)</option>
+                <option value="ec">Enzyme Commission (EC) numbers</option>
+                <option value="cog">Clusters of Orthologous Groups (COG categories)</option>
             </param>
             <when value="go">
                 <param argument="--slim_down" type="boolean" label="Use slim GO"/>
@@ -27,22 +27,22 @@
     <xml name="FUNC_FILE">
         <param argument="--func_file" type="data" format="tabular" label="Functional file"
             help="Tabular file with a peptide sequence column and a functional assignment column for GO-term, EC number, or COG."/>
-        <param argument="--pep_colname_func" type="text" label="Peptide column name" 
+        <param argument="--pep_colname_func" type="text" label="Peptide column name"
             help="The column name within the function file that corresponds to the peptide sequences">
             <validator type="empty_field"/>
         </param>
-        <param argument="--func_colname" type="text" label="Functional column name" 
+        <param argument="--func_colname" type="text" label="Functional column name"
             help="The column name within the function file with the functional terms">
             <validator type="empty_field"/>
         </param>
     </xml>
     <xml name="TAX_FILE">
         <param argument="--tax_file" type="data" format="tabular" label="Taxonomy assignments file"/>
-        <param argument="--pep_colname_tax" type="text" label="Peptide column name" 
+        <param argument="--pep_colname_tax" type="text" label="Peptide column name"
             help="The column name within the taxonomy file that corresponds to the peptide sequences">
             <validator type="empty_field"/>
         </param>
-        <param argument="--tax_colname" type="text" label="Taxonomy column name"> 
+        <param argument="--tax_colname" type="text" label="Taxonomy column name">
             <help>
                 Name of taxonomy column in taxonomy assignments file. The column must
                 be either NCBI taxids (strongly preferred) or taxonomy
@@ -53,7 +53,7 @@
         </param>
     </xml>
     <token name="@MAKE_SAMPS_TSV@"><![CDATA[
-        ### make samps config file 
+        ### make samps config file
         #if $samps_args.samps_src == 'history':
             cat '$samps_args.samps_file' > samp_file.tab &&
         #else:
@@ -81,7 +81,7 @@
     <xml name="data_dir">
         <conditional name="db_dir">
             <param argument="db_loc" type="select" label="Taxonomy and Functional Databases">
-                <option value="auto">automatcally load databases</option>
+                <option value="auto">automatically load databases</option>
                 <!-- bioconda recipe would need to install the databases
                 <option value="pkg">use default metaquantome databases (not current)</option>
                 -->