Merge pull request #100 from kbroman/master

Release R/qtl2 version 0.18

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: qtl2
-Version: 0.17-16
-Date: 2019-02-02
+Version: 0.18
+Date: 2019-02-08
 Title: Quantitative Trait Locus Mapping in Experimental Crosses
 Description: R/qtl2 provides a set of tools to perform quantitative
     trait locus (QTL) analysis in experimental crosses. It is a

NEWS.md

@@ -1,4 +1,4 @@
-## qtl2 0.17-16 (2019-02-02)
+## qtl2 0.18 (2019-02-08)
 
 ### New features
 

README.md

@@ -78,7 +78,8 @@ To cite R/qtl2 in publications, use:
 > Yandell BS, Churchill GA (2018)
 > R/qtl2: software for mapping quantitative trait loci with
 > high-dimensional data and multi-parent populations.
-> bioRxiv doi:[10.1101/414748](https://doi.org/10.1101/414748)
+> [Genetics](http://genetics.org) 211:495-502
+> [doi:10.1534/genetics.118.301595](https://doi.org/10.1534/genetics.118.301595)
 
 ---
 

inst/CITATION

@@ -7,18 +7,21 @@ citEntry(entry="article",
                              person("Petr", "Simecek"),
                              person(c("Nicholas", "A."), "Furlotte"),
                              person("Pjotr", "Prins"),
-                             person("Saunak", "Sen"),
+                             person("Śaunak", "Sen"),
                              person(c("Brian", "S."), "Yandell"),
                              person(c("Gary", "A."), "Churchill")),
-         journal = "bioRxiv",
-         doi = "10.1101/414748",
+         journal = "Genetics",
+         doi = "10.1534/genetics.118.301595",
          year = 2018,
-         url = "https://www.biorxiv.org/content/early/2018/09/12/414748",
-         eprint = "https://www.biorxiv.org/content/biorxiv/early/2018/09/12/414748.full.pdf",
+         volume=211,
+         pages="495-502",
+         url = "https://doi.org/10.1534/genetics.118.301595",
+         eprint = "http://http://www.genetics.org/content/genetics/211/2/495.full.pdf",
          key = "Broman2018",
 
          textVersion =
-             paste("Broman KW, Gatti DM, Simecek P, Furlotte NA, Prins P, Sen S, Yandell BS, Churchill GA",
+             paste("Broman KW, Gatti DM, Simecek P, Furlotte NA, Prins P, Sen Ś, Yandell BS, Churchill GA",
                    "(2018) R/qtl2: software for mapping quantitative trait loci",
-                   "with high-dimensional data and multi-parent populations. bioRxiv doi:10.1101/414748")
+                   "with high-dimensional data and multi-parent populations. Genetics 211:495-502",
+                   "doi:10.1534/genetics.118.301595")
          )