[Picante-commits] r110 - in branches/gsoc: . man

[noreply at r-forge.r-project.org]

Author: skembel
Date: 2008-06-18 08:29:11 +0200 (Wed, 18 Jun 2008)
New Revision: 110

Modified:
   branches/gsoc/DESCRIPTION
   branches/gsoc/man/picante-package.Rd
   branches/gsoc/man/specaccum.psr.Rd
Log:
And merging 0.2-0 changes back into gsoc branch

Modified: branches/gsoc/DESCRIPTION
===================================================================
--- branches/gsoc/DESCRIPTION	2008-06-18 06:01:39 UTC (rev 109)
+++ branches/gsoc/DESCRIPTION	2008-06-18 06:29:11 UTC (rev 110)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Tools for integrating phylogenies and ecology
 Version: 0.2-0
-Date: 2008-6-10
+Date: 2008-6-17
 Author: Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Matthew Helmus <mrhelmus at wisc.edu>, Cam Webb <cwebb at oeb.harvard.edu>
 Maintainer: Steve Kembel <skembel at berkeley.edu>
 Depends: ape, vegan

Modified: branches/gsoc/man/picante-package.Rd
===================================================================
--- branches/gsoc/man/picante-package.Rd	2008-06-18 06:01:39 UTC (rev 109)
+++ branches/gsoc/man/picante-package.Rd	2008-06-18 06:29:11 UTC (rev 110)
@@ -13,7 +13,7 @@
 Package: \tab picante\cr
 Type: \tab Package\cr
 Version: \tab 0.2-0\cr
-Date: \tab 2008-06-10\cr
+Date: \tab 2008-06-17\cr
 License: \tab GPL-2\cr
 }
 }

Modified: branches/gsoc/man/specaccum.psr.Rd
===================================================================
--- branches/gsoc/man/specaccum.psr.Rd	2008-06-18 06:01:39 UTC (rev 109)
+++ branches/gsoc/man/specaccum.psr.Rd	2008-06-18 06:29:11 UTC (rev 110)
@@ -30,8 +30,7 @@
 
 \references{ Gotelli N.J. & Colwell R.K. (2001) Quantifying biodiversity: procedures and pitfalls in the measurement and comparison of species richness. Ecology Letters, 4, 379-391\cr
               \cr Helmus M.R., Bland T.J., Williams C.K. & Ives A.R. (2007) Phylogenetic measures of biodiversity. American Naturalist, 169, E68-E83 }
-\author{ Matthew Helmus \email{mrhelmus at gmail.com} based on the \code{ape} package \code{specaccum} function by Roeland Kindt \email{r.kindt at cgiar.org} and Jari Oksanen. 
- }
+\author{ Matthew Helmus \email{mrhelmus at gmail.com} based on the \code{vegan} package \link[vegan]{specaccum} function by Roeland Kindt and Jari Oksanen. }
 \seealso{ \code{\link{psr}}, \code{\link[vegan]{specaccum}}}
 
 \keyword{univar}