--- a/average_fst.xml	Tue Oct 23 14:38:04 2012 -0400
+++ b/average_fst.xml	Mon Nov 05 12:44:17 2012 -0500
@@ -15,14 +15,14 @@
   </command>
 
   <inputs>
-    <param name="input" type="data" format="gd_snp" label="SNP table" />
+    <param name="input" type="data" format="gd_snp" label="SNP dataset" />
     <param name="p1_input" type="data" format="gd_indivs" label="Population 1 individuals" />
     <param name="p2_input" type="data" format="gd_indivs" label="Population 2 individuals" />
 
     <conditional name="data_source">
-      <param name="ds_choice" type="select" format="integer" label="Data source">
-          <option value="0" selected="true">sequence coverage and ..</option>
-          <option value="1">estimated genotype and ..</option>
+      <param name="ds_choice" type="select" format="integer" label="Frequency metric">
+          <option value="0" selected="true">sequence coverage</option>
+          <option value="1">estimated genotype</option>
       </param>
       <when value="0">
         <param name="min_value" type="integer" min="1" value="1" label="Minimum total read count for a population" />
@@ -32,15 +32,15 @@
       </when>
     </conditional>
 
-    <param name="discard_fixed" type="select" label="Apparently fixed SNPs">
-      <option value="0">Retain SNPs that appear fixed in the two populations</option>
-      <option value="1" selected="true">Delete SNPs that appear fixed in the two populations</option>
+    <param name="discard_fixed" type="select" label="For SNPs that appear to be fixed across both populations">
+      <option value="0">retain</option>
+      <option value="1" selected="true">delete</option>
     </param>
 
     <conditional name="use_randomization">
       <param name="ur_choice" type="select" format="integer" label="Use randomization">
-        <option value="0" selected="true">No</option>
-        <option value="1">Yes</option>
+        <option value="0" selected="true">no</option>
+        <option value="1">yes</option>
       </param>
       <when value="0" />
       <when value="1">
@@ -69,19 +69,32 @@
 
   <help>
 
+**Dataset formats**
+
+The input datasets are in gd_snp_ and gd_indivs_ formats.
+The output dataset is in text_ format.  (`Dataset missing?`_)
+
+.. _gd_snp: ./static/formatHelp.html#gd_snp
+.. _gd_indivs: ./static/formatHelp.html#gd_indivs
+.. _text: ./static/formatHelp.html#text
+.. _Dataset missing?: ./static/formatHelp.html
+
+-----
+
 **What it does**
 
 The user specifies a SNP table and two "populations" of individuals, both previously defined using the Galaxy tool to specify individuals from a SNP table. No individual can be in both populations. Other choices are as follows.
 
-Data source. The allele frequencies of a SNP in the two populations can be estimated either by the total number of reads of each allele, or by adding the frequencies inferred from genotypes of individuals in the populations.
+Frequency metric. The allele frequencies of a SNP in the two populations can be estimated either by the total number of reads of each allele, or by adding the frequencies inferred from genotypes of individuals in the populations.
 
-After specifying the data source, the user sets lower bounds on amount of data required at a SNP. For estimating the FST using read counts, the bound is the minimum count of reads of the two alleles in a population. For estimations based on genotype, the bound is the minimum reported genotype quality per individual. SMPs not meeting these lower bounds are ignored.
+After specifying the frequency metric, the user sets lower bounds on amount of data required at a SNP. For estimating the FST using read counts, the bound is the minimum count of reads of the two alleles in a population. For estimations based on genotype, the bound is the minimum reported genotype quality per individual. SNPs not meeting these lower bounds are ignored.
 
 The user specifies whether SNPs where both populations appear to be fixed for the same allele should be retained or discarded.
 
 Finally, the user decides whether to use randomizations. If so, then the user specifies how many randomly generated population pairs (retaining the numbers of individuals of the originals) to generate, as well as the "population" of additional individuals (not in the first two populations) that can be used in the randomization process.
 
 The program prints the following measures of FST for the two populations.
+
 1. The formulation by Sewall Wright (average over FSTs for all SNPs).
 2. The Weir-Cockerham estimator (average over FSTs for all SNPs).
 3. The Reich-Patterson estimator (average over FSTs for all SNPs).
@@ -93,14 +106,27 @@
 
 Sewall Wright (1951) The genetical structure of populations. Ann Eugen 15:323-354.
 
-B. S. Weir and C. Clark Cockerham (1984) Estimating F-statistics for the analysis of population structure. Evolution 38:1358-1370.
+Weir, B.S. and Cockerham, C. Clark (1984) Estimating F-statistics for the analysis of population structure. Evolution 38:1358-1370.
 
 Weir, B.S. 1996. Population substructure. Genetic data analysis II, pp. 161-173. Sinauer Associates, Sundand, MA.
 
 David Reich, Kumarasamy Thangaraj, Nick Patterson, Alkes L. Price, and Lalji Singh (2009) Reconstructing Indian population history. Nature 461:489-494, especially Supplement 2.  
 
-Their effectiveness for computing FSTs when there are many SNPs but few individuals is discussed in the followoing paper.
+Their effectiveness for computing FSTs when there are many SNPs but few individuals is discussed in the following paper.
 
 Eva-Maria Willing, Christine Dreyer, Cock van Oosterhout (2012) Estimates of genetic differentiation measured by FST do not necessarily require large sample sizes when using many SNP markers. PLoS One 7:e42649.
+
+-----
+
+**Example**
+
+- output::
+
+   Using 37847 SNPs, we compute:
+   Average Wright FST is 0.22810.
+   Average Weir-Cockerham FST is 0.30813.
+   Average Reich-Patterson FST is 0.31012.
+   The population-based Reich-Patterson Fst is 0.33625.
+
   </help>
 </tool>