More about pull requests
More on development
More encouragement
Avoid merge conflicts in NEWS file

by using the `union` merge strategy.

See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
Merge pull request #913 from krlmlr/gitattributes-NEWS

Avoid merge conflicts in NEWS file
Re-roxygenise
Tweaking checklist
add "none" to documentation of theme() for parameter legend.position

Fixes #829
update Rd file
update NEWS
First attempt at staticdocs auto-deploy
Merge pull request #918 from krlmlr/legend-position-doc-2

add "none" to documentation of theme() for parameter legend.position
add test
when testing if an identifier refers to a calculated aesthetic, check the whole identifier, not a substring

also, define the regex that is used for matching only once, in a hidden global variable

fixes #834

Conflicts:
	R/layer.r

Resolved by combining.
Merge branch 'master' into fix/834-calculated-dots-2
remove unnecessary namespace prefix from the tests
Merge pull request #917 from krlmlr/fix/834-calculated-dots-2

when testing if an identifier refers to a calculated aesthetic, check the whole identifier, not a substring
Add mgcv to suggests
Only run staticdocs if deploying
Themes vignette from Dennis Murphy