From cc1206f5d950604a76cc235f7cd235507a7a13ba Mon Sep 17 00:00:00 2001 From: Thomas Klebel Date: Fri, 19 Aug 2016 15:27:58 +0200 Subject: [PATCH 1/2] Fix typo in Intro (#286) * fix typo cleaning contributors * update contributors * exclude 'Garrett Grolemund' too --- contribs.txt | 83 ++++++++++++++++++++++++++++++++++------------------ intro.Rmd | 3 +- 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/contribs.txt b/contribs.txt index 4c6d604..eb65be0 100644 --- a/contribs.txt +++ b/contribs.txt @@ -1,48 +1,73 @@ - 393 hadley - 80 Garrett + 538 hadley + 92 Garrett 77 Hadley Wickham + 37 S'busiso Mkhondwane 10 Radu Grosu - 6 Brandon Greenwell - 6 Bill Behrman + 9 behrman + 9 Brandon Greenwell + 8 Bill Behrman + 7 Rademeyer Vermaak + 7 harrismcgehee + 6 OaCantona 6 jjchern 5 kdpsingh + 4 Mine Cetinkaya-Rundel + 3 Terence Teo + 3 Ian Sealy 3 Ian Lyttle - 3 Jennifer (Jenny) Bryan 3 Yihui Xie - 3 OaCantona - 3 behrman - 2 MJMarshall - 2 sibusiso16 + 3 Jennifer (Jenny) Bryan + 3 Patrick Kennedy + 2 spirgel + 2 Christian G. Warden + 2 Devin Pastoor + 2 Etienne B. Racine 2 Jim Hester 2 Joanne Jang - 2 Devin Pastoor + 2 Jonathan Page 2 Kirill Sevastyanenko - 2 spirgel + 2 MJMarshall + 2 Will Beasley 2 rlzijdeman 2 robinlovelace - 1 harrismcgehee - 1 jennybc - 1 nate-d-olson - 1 shoili - 1 Peter Hurford - 1 Alex - 1 Ben Marwick - 1 Colin Gillespie - 1 Curtis Alexander - 1 Daniel Gromer - 1 Earl Brown - 1 Flemming Villalona - 1 Garrett Grolemund - 1 Ian Sealy - 1 Jakub Nowosad - 1 Julia Stewart Lowndes + 2 sibusiso16 1 Kenny Darrell 1 KyleHumphrey 1 Lawrence Wu + 1 Ahmed ElGabbas + 1 Matthew Sedaghatfar + 1 Flemming Villalona 1 Mustafa Ascha 1 Nelson Areal - 1 Patrick Kennedy - 1 Ahmed ElGabbas + 1 Nick Clark + 1 Eric Watt + 1 Earl Brown + 1 Peter Hurford + 1 Dylan Cashman + 1 Derwin McGeary + 1 David Clark + 1 Steve Mortimer 1 TJ Mahr + 1 Daniel Gromer + 1 Thomas Klebel 1 Tom Prior + 1 robinsones + 1 Curtis Alexander 1 adi pradhan + 1 batpigandme + 1 Colin Gillespie + 1 Christian Mongeau + 1 Ben Marwick + 1 jennybc + 1 Andrew Landgraf + 1 Alex + 1 koalabearski + 1 Gregory Jefferis + 1 Jakub Nowosad + 1 Garrett Grolemund + 1 Jeroen Janssens + 1 nate-d-olson + 1 nickelas + 1 nwaff + 1 Julia Stewart Lowndes + 1 shoili diff --git a/intro.Rmd b/intro.Rmd index e33b234..606c4a1 100644 --- a/intro.Rmd +++ b/intro.Rmd @@ -250,7 +250,8 @@ library(dplyr) contribs <- readr::read_tsv("contribs.txt", col_names = c("n", "name")) contribs <- contribs %>% - filter(!name %in% c("hadley", "Garrett", "Hadley Wichkam")) %>% + filter(!name %in% c("hadley", "Garrett", "Hadley Wickham", + "Garrett Grolemund")) %>% arrange(name) %>% mutate(uname = ifelse(!grepl(" ", name), paste0("@", name), name)) From 8c48a2981ac16a6155c83ae2860dee8cf8771cb6 Mon Sep 17 00:00:00 2001 From: Thomas Klebel Date: Fri, 19 Aug 2016 15:28:26 +0200 Subject: [PATCH 2/2] fix code formatting (#287) --- communicate-plots.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/communicate-plots.Rmd b/communicate-plots.Rmd index 496966f..10742c8 100644 --- a/communicate-plots.Rmd +++ b/communicate-plots.Rmd @@ -535,7 +535,7 @@ I only ever use three of the five options: * To put multiple plots in a single row I set the `out.width` to `50%` for two plots, `33%` for 3 plots, or `25%` to 4 plots, and set - fig.align = "default"`. Depending on what I'm trying to illustrate (e.g. + `fig.align = "default"`. Depending on what I'm trying to illustrate (e.g. show data or show plot variations), I'll also tweak `fig.width`, as discussed below.