remove previous jekyll version source code, replace with bookdown ver…

…sion
hadley · Jan 30, 2019 · a481d05 · a481d05
1 parent a1444be
commit a481d05
Show file tree

Hide file tree

Showing 391 changed files with 12,508 additions and 27,405 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ _site
 cache
 diamonds.csv
 temp.Rmd
-*.html
 *_cache
 *_files
-figures
+figures
diff --git a/bookdown/01-intro.Rmd → 01-intro.Rmd b/bookdown/01-intro.Rmd → 01-intro.Rmd
diff --git a/bookdown/02-structure.Rmd → 02-structure.Rmd b/bookdown/02-structure.Rmd → 02-structure.Rmd
diff --git a/bookdown/03-code.Rmd → 03-code.Rmd b/bookdown/03-code.Rmd → 03-code.Rmd
diff --git a/bookdown/04-metadata.Rmd → 04-metadata.Rmd b/bookdown/04-metadata.Rmd → 04-metadata.Rmd
diff --git a/bookdown/05-man.Rmd → 05-man.Rmd b/bookdown/05-man.Rmd → 05-man.Rmd
diff --git a/bookdown/06-vignettes.Rmd → 06-vignettes.Rmd b/bookdown/06-vignettes.Rmd → 06-vignettes.Rmd
diff --git a/bookdown/07-testing.Rmd → 07-testing.Rmd b/bookdown/07-testing.Rmd → 07-testing.Rmd
diff --git a/bookdown/08-namespace.Rmd → 08-namespace.Rmd b/bookdown/08-namespace.Rmd → 08-namespace.Rmd
diff --git a/bookdown/09-data.Rmd → 09-data.Rmd b/bookdown/09-data.Rmd → 09-data.Rmd
diff --git a/bookdown/10-src.Rmd → 10-src.Rmd b/bookdown/10-src.Rmd → 10-src.Rmd
diff --git a/bookdown/11-inst.Rmd → 11-inst.Rmd b/bookdown/11-inst.Rmd → 11-inst.Rmd
diff --git a/bookdown/12-misc.Rmd → 12-misc.Rmd b/bookdown/12-misc.Rmd → 12-misc.Rmd
diff --git a/bookdown/13-git.Rmd → 13-git.Rmd b/bookdown/13-git.Rmd → 13-git.Rmd
diff --git a/bookdown/14-check.Rmd → 14-check.Rmd b/bookdown/14-check.Rmd → 14-check.Rmd
diff --git a/bookdown/15-release.Rmd → 15-release.Rmd b/bookdown/15-release.Rmd → 15-release.Rmd
@@ -509,6 +509,6 @@ There are a number of places you can include the announcement:
   Messages sent to this list are automatically forwarded to the R-help mailing 
   list.
 
-# Congratulations!
+## Congratulations!
 
 You have released your first package to CRAN and made it to the end of the book! 
diff --git a/DESCRIPTION b/DESCRIPTION
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Makevars b/Makevars
diff --git a/README.md b/README.md
@@ -5,10 +5,9 @@ book.
 
 *Status as of 2018-11: Work on a second edition of this book is planned for 2019 and at the moment this repo is "resting". Issues and PRs are still welcome but may not be addressed until that revision begins. This is especially true for any updates related to changes in devtools and related packages.* 
 
-The site is built using jekyll, with a custom plugin to render `.rmd` files with
-knitr and pandoc. To create the site, you need:
+The site is built using [bookdown](https://github.com/rstudio/bookdown) package.
+ To create the site, you need:
 
-* jekyll gem: `gem install jekyll`
-* bookdown: `install_github("hadley/bookdown")`
+* bookdown: `install_github("rstudio/bookdown")`
 * [pandoc](http://johnmacfarlane.net/pandoc/)
 * [knitr](http://yihui.name/knitr/): `install.packages("knitr")`
diff --git a/_book/check.html b/_book/check.html
diff --git a/_book/congratulations.html b/_book/congratulations.html
diff --git a/_book/data.html b/_book/data.html
diff --git a/_book/description.html b/_book/description.html
diff --git a/bookdown/_book/diagrams/cran-package.png → _book/diagrams/cran-package.png b/bookdown/_book/diagrams/cran-package.png → _book/diagrams/cran-package.png
diff --git a/bookdown/_book/diagrams/installation.png → _book/diagrams/installation.png b/bookdown/_book/diagrams/installation.png → _book/diagrams/installation.png
diff --git a/bookdown/_book/diagrams/loading.png → _book/diagrams/loading.png b/bookdown/_book/diagrams/loading.png → _book/diagrams/loading.png
diff --git a/bookdown/_book/diagrams/package-files.png → _book/diagrams/package-files.png b/bookdown/_book/diagrams/package-files.png → _book/diagrams/package-files.png
diff --git a/...n/_book/diagrams/pull-request-process.png → _book/diagrams/pull-request-process.png b/...n/_book/diagrams/pull-request-process.png → _book/diagrams/pull-request-process.png
diff --git a/_book/git.html b/_book/git.html
diff --git a/bookdown/_book/images/arrows.png → _book/images/arrows.png b/bookdown/_book/images/arrows.png → _book/images/arrows.png
diff --git a/...down/_book/images/build-reload-opts-2.png → _book/images/build-reload-opts-2.png b/...down/_book/images/build-reload-opts-2.png → _book/images/build-reload-opts-2.png
diff --git a/bookdown/_book/images/build-reload.png → _book/images/build-reload.png b/bookdown/_book/images/build-reload.png → _book/images/build-reload.png
diff --git a/bookdown/_book/images/cover.png → _book/images/cover.png b/bookdown/_book/images/cover.png → _book/images/cover.png
diff --git a/bookdown/_book/images/cran-checks.png → _book/images/cran-checks.png b/bookdown/_book/images/cran-checks.png → _book/images/cran-checks.png
diff --git a/bookdown/_book/images/create-1.png → _book/images/create-1.png b/bookdown/_book/images/create-1.png → _book/images/create-1.png
diff --git a/bookdown/_book/images/create-2.png → _book/images/create-2.png b/bookdown/_book/images/create-2.png → _book/images/create-2.png
diff --git a/bookdown/_book/images/create-3.png → _book/images/create-3.png b/bookdown/_book/images/create-3.png → _book/images/create-3.png
diff --git a/bookdown/_book/images/file-finder.png → _book/images/file-finder.png b/bookdown/_book/images/file-finder.png → _book/images/file-finder.png
diff --git a/bookdown/_book/images/git-added.png → _book/images/git-added.png b/bookdown/_book/images/git-added.png → _book/images/git-added.png
diff --git a/bookdown/_book/images/git-branch.png → _book/images/git-branch.png b/bookdown/_book/images/git-branch.png → _book/images/git-branch.png
diff --git a/bookdown/_book/images/git-chunk.png → _book/images/git-chunk.png b/bookdown/_book/images/git-chunk.png → _book/images/git-chunk.png
diff --git a/bookdown/_book/images/git-commit-amend.png → _book/images/git-commit-amend.png b/bookdown/_book/images/git-commit-amend.png → _book/images/git-commit-amend.png
diff --git a/...down/_book/images/git-commit-conflict.png → _book/images/git-commit-conflict.png b/...down/_book/images/git-commit-conflict.png → _book/images/git-commit-conflict.png
diff --git a/bookdown/_book/images/git-commit-window.png → _book/images/git-commit-window.png b/bookdown/_book/images/git-commit-window.png → _book/images/git-commit-window.png
diff --git a/bookdown/_book/images/git-commit.png → _book/images/git-commit.png b/bookdown/_book/images/git-commit.png → _book/images/git-commit.png
diff --git a/bookdown/_book/images/git-config-2.png → _book/images/git-config-2.png b/bookdown/_book/images/git-config-2.png → _book/images/git-config-2.png
diff --git a/bookdown/_book/images/git-deleted.png → _book/images/git-deleted.png b/bookdown/_book/images/git-deleted.png → _book/images/git-deleted.png
diff --git a/bookdown/_book/images/git-diff-window.png → _book/images/git-diff-window.png b/bookdown/_book/images/git-diff-window.png → _book/images/git-diff-window.png
diff --git a/bookdown/_book/images/git-diff.png → _book/images/git-diff.png b/bookdown/_book/images/git-diff.png → _book/images/git-diff.png
diff --git a/bookdown/_book/images/git-dropdown.png → _book/images/git-dropdown.png b/bookdown/_book/images/git-dropdown.png → _book/images/git-dropdown.png
diff --git a/bookdown/_book/images/git-history-window.png → _book/images/git-history-window.png b/bookdown/_book/images/git-history-window.png → _book/images/git-history-window.png
diff --git a/bookdown/_book/images/git-history.png → _book/images/git-history.png b/bookdown/_book/images/git-history.png → _book/images/git-history.png
diff --git a/bookdown/_book/images/git-ignore.png → _book/images/git-ignore.png b/bookdown/_book/images/git-ignore.png → _book/images/git-ignore.png
diff --git a/bookdown/_book/images/git-local-commits.png → _book/images/git-local-commits.png b/bookdown/_book/images/git-local-commits.png → _book/images/git-local-commits.png
diff --git a/...down/_book/images/git-modified-staged.png → _book/images/git-modified-staged.png b/...down/_book/images/git-modified-staged.png → _book/images/git-modified-staged.png
diff --git a/bookdown/_book/images/git-modified.png → _book/images/git-modified.png b/bookdown/_book/images/git-modified.png → _book/images/git-modified.png
diff --git a/bookdown/_book/images/git-no-remote.png → _book/images/git-no-remote.png b/bookdown/_book/images/git-no-remote.png → _book/images/git-no-remote.png
diff --git a/bookdown/_book/images/git-pane.png → _book/images/git-pane.png b/bookdown/_book/images/git-pane.png → _book/images/git-pane.png
diff --git a/bookdown/_book/images/git-proj-config.png → _book/images/git-proj-config.png b/bookdown/_book/images/git-proj-config.png → _book/images/git-proj-config.png
diff --git a/bookdown/_book/images/git-push.png → _book/images/git-push.png b/bookdown/_book/images/git-push.png → _book/images/git-push.png
diff --git a/bookdown/_book/images/git-renamed.png → _book/images/git-renamed.png b/bookdown/_book/images/git-renamed.png → _book/images/git-renamed.png
diff --git a/bookdown/_book/images/git-stage.png → _book/images/git-stage.png b/bookdown/_book/images/git-stage.png → _book/images/git-stage.png
diff --git a/bookdown/_book/images/git-unknown.png → _book/images/git-unknown.png b/bookdown/_book/images/git-unknown.png → _book/images/git-unknown.png
diff --git a/bookdown/_book/images/github-branches.png → _book/images/github-branches.png b/bookdown/_book/images/github-branches.png → _book/images/github-branches.png
diff --git a/...down/_book/images/github-comment-line.png → _book/images/github-comment-line.png b/...down/_book/images/github-comment-line.png → _book/images/github-comment-line.png
diff --git a/bookdown/_book/images/github-fork.png → _book/images/github-fork.png b/bookdown/_book/images/github-fork.png → _book/images/github-fork.png
diff --git a/bookdown/_book/images/keyboard-shortcuts.png → _book/images/keyboard-shortcuts.png b/bookdown/_book/images/keyboard-shortcuts.png → _book/images/keyboard-shortcuts.png
diff --git a/bookdown/_book/images/knit.png → _book/images/knit.png b/bookdown/_book/images/knit.png → _book/images/knit.png
diff --git a/bookdown/_book/images/man-add.png → _book/images/man-add.png b/bookdown/_book/images/man-add.png → _book/images/man-add.png
diff --git a/bookdown/_book/images/new-cpp.png → _book/images/new-cpp.png b/bookdown/_book/images/new-cpp.png → _book/images/new-cpp.png
diff --git a/bookdown/_book/images/pr-changes.png → _book/images/pr-changes.png b/bookdown/_book/images/pr-changes.png → _book/images/pr-changes.png
diff --git a/bookdown/_book/images/pr-commits.png → _book/images/pr-commits.png b/bookdown/_book/images/pr-commits.png → _book/images/pr-commits.png
diff --git a/bookdown/_book/images/pr-conversation.png → _book/images/pr-conversation.png b/bookdown/_book/images/pr-conversation.png → _book/images/pr-conversation.png
diff --git a/bookdown/_book/images/pr-create.png → _book/images/pr-create.png b/bookdown/_book/images/pr-create.png → _book/images/pr-create.png
diff --git a/bookdown/_book/images/pr.png → _book/images/pr.png b/bookdown/_book/images/pr.png → _book/images/pr.png
diff --git a/bookdown/_book/images/project-options-1.png → _book/images/project-options-1.png b/bookdown/_book/images/project-options-1.png → _book/images/project-options-1.png
diff --git a/bookdown/_book/images/project-options-2.png → _book/images/project-options-2.png b/bookdown/_book/images/project-options-2.png → _book/images/project-options-2.png
diff --git a/...wn/_book/images/project-options-build.png → _book/images/project-options-build.png b/...wn/_book/images/project-options-build.png → _book/images/project-options-build.png
diff --git a/bookdown/_book/images/style-options.png → _book/images/style-options.png b/bookdown/_book/images/style-options.png → _book/images/style-options.png
diff --git a/_book/index.html b/_book/index.html
diff --git a/_book/inst.html b/_book/inst.html
diff --git a/_book/intro-why.html b/_book/intro-why.html
diff --git a/...7/css/fontawesome/fontawesome-webfont.ttf → ...7/css/fontawesome/fontawesome-webfont.ttf b/...7/css/fontawesome/fontawesome-webfont.ttf → ...7/css/fontawesome/fontawesome-webfont.ttf
diff --git a/...ibs/gitbook-2.6.7/css/plugin-bookdown.css → ...ibs/gitbook-2.6.7/css/plugin-bookdown.css b/...ibs/gitbook-2.6.7/css/plugin-bookdown.css → ...ibs/gitbook-2.6.7/css/plugin-bookdown.css
diff --git a/...gitbook-2.6.7/css/plugin-fontsettings.css → ...gitbook-2.6.7/css/plugin-fontsettings.css b/...gitbook-2.6.7/css/plugin-fontsettings.css → ...gitbook-2.6.7/css/plugin-fontsettings.css
diff --git a/...bs/gitbook-2.6.7/css/plugin-highlight.css → ...bs/gitbook-2.6.7/css/plugin-highlight.css b/...bs/gitbook-2.6.7/css/plugin-highlight.css → ...bs/gitbook-2.6.7/css/plugin-highlight.css
diff --git a/.../libs/gitbook-2.6.7/css/plugin-search.css → .../libs/gitbook-2.6.7/css/plugin-search.css b/.../libs/gitbook-2.6.7/css/plugin-search.css → .../libs/gitbook-2.6.7/css/plugin-search.css
diff --git a/...k/libs/gitbook-2.6.7/css/plugin-table.css → ...k/libs/gitbook-2.6.7/css/plugin-table.css b/...k/libs/gitbook-2.6.7/css/plugin-table.css → ...k/libs/gitbook-2.6.7/css/plugin-table.css
diff --git a/...wn/_book/libs/gitbook-2.6.7/css/style.css → _book/libs/gitbook-2.6.7/css/style.css b/...wn/_book/libs/gitbook-2.6.7/css/style.css → _book/libs/gitbook-2.6.7/css/style.css
diff --git a/...wn/_book/libs/gitbook-2.6.7/js/app.min.js → _book/libs/gitbook-2.6.7/js/app.min.js b/...wn/_book/libs/gitbook-2.6.7/js/app.min.js → _book/libs/gitbook-2.6.7/js/app.min.js
diff --git a/...libs/gitbook-2.6.7/js/jquery.highlight.js → ...libs/gitbook-2.6.7/js/jquery.highlight.js b/...libs/gitbook-2.6.7/js/jquery.highlight.js → ...libs/gitbook-2.6.7/js/jquery.highlight.js
diff --git a/bookdown/_book/libs/gitbook-2.6.7/js/lunr.js → _book/libs/gitbook-2.6.7/js/lunr.js b/bookdown/_book/libs/gitbook-2.6.7/js/lunr.js → _book/libs/gitbook-2.6.7/js/lunr.js
diff --git a/.../libs/gitbook-2.6.7/js/plugin-bookdown.js → .../libs/gitbook-2.6.7/js/plugin-bookdown.js b/.../libs/gitbook-2.6.7/js/plugin-bookdown.js → .../libs/gitbook-2.6.7/js/plugin-bookdown.js
diff --git a/...s/gitbook-2.6.7/js/plugin-fontsettings.js → ...s/gitbook-2.6.7/js/plugin-fontsettings.js b/...s/gitbook-2.6.7/js/plugin-fontsettings.js → ...s/gitbook-2.6.7/js/plugin-fontsettings.js
diff --git a/...ok/libs/gitbook-2.6.7/js/plugin-search.js → _book/libs/gitbook-2.6.7/js/plugin-search.js b/...ok/libs/gitbook-2.6.7/js/plugin-search.js → _book/libs/gitbook-2.6.7/js/plugin-search.js
diff --git a/...k/libs/gitbook-2.6.7/js/plugin-sharing.js → ...k/libs/gitbook-2.6.7/js/plugin-sharing.js b/...k/libs/gitbook-2.6.7/js/plugin-sharing.js → ...k/libs/gitbook-2.6.7/js/plugin-sharing.js
diff --git a/...own/_book/libs/jquery-2.2.3/jquery.min.js → _book/libs/jquery-2.2.3/jquery.min.js b/...own/_book/libs/jquery-2.2.3/jquery.min.js → _book/libs/jquery-2.2.3/jquery.min.js
diff --git a/_book/man.html b/_book/man.html
diff --git a/_book/misc.html b/_book/misc.html
diff --git a/_book/namespace.html b/_book/namespace.html
diff --git a/_book/package-structure.html b/_book/package-structure.html
diff --git a/_book/r.html b/_book/r.html
diff --git a/_book/release.html b/_book/release.html
diff --git a/bookdown/_book/search_index.json → _book/search_index.json b/bookdown/_book/search_index.json → _book/search_index.json
diff --git a/_book/src.html b/_book/src.html
diff --git a/bookdown/_book/style.css → _book/style.css b/bookdown/_book/style.css → _book/style.css
diff --git a/_book/tests.html b/_book/tests.html
diff --git a/_book/vignettes.html b/_book/vignettes.html
diff --git a/bookdown/_bookdown.yml → _bookdown.yml b/bookdown/_bookdown.yml → _bookdown.yml
diff --git a/_config.yml b/_config.yml
diff --git a/_includes/package-nav.html b/_includes/package-nav.html
diff --git a/_layouts/default.html b/_layouts/default.html
diff --git a/_layouts/post.html b/_layouts/post.html
diff --git a/bookdown/_output.yml → _output.yml b/bookdown/_output.yml → _output.yml
@@ -6,7 +6,7 @@ bookdown::gitbook:
         <li><a href="./">R packages by Hadley Wickham</a></li>
       after: |
         <li><a href="https://github.com/hadley/r-pkgs/" target="blank">PBuilding R package - Hadley Wickham</a></li>
-    edit: https://github.com/hadley/r-pkgs/edit/master/bookdown/%s
+    edit: https://github.com/hadley/r-pkgs/edit/master/%s
     sharing:
       github: yes
       facebook: no

diff --git a/_plugins/knit.r b/_plugins/knit.r
diff --git a/_plugins/rmarkdown.rb b/_plugins/rmarkdown.rb
diff --git a/best-practices.Rmd b/best-practices.Rmd
diff --git a/bookdown/book.bib → book.bib b/bookdown/book.bib → book.bib
diff --git a/book/.gitignore b/book/.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ _site @@
     cache
     diamonds.csv
     temp.Rmd
-    *.html
     *_cache
     *_files
-    figures
+    figures