Merge branch 'master' into feature/839-facet-margin-2

Author: Kirill Müller

.Rbuildignore

@@ -2,3 +2,4 @@ visual_test
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
+^/\.gitattributes$

.gitattributes

@@ -0,0 +1 @@
+/NEWS merge=union

.travis.yml

@@ -13,10 +13,26 @@ install:
 
 script: ./travis-tool.sh run_tests
 
+after_success:
+  - ./travis-tool.sh install_github hadley/staticdocs
+  - R -e "staticdocs::build_site()"
+
 on_failure:
   - ./travis-tool.sh dump_logs
 
 notifications:
   email:
     on_success: change
     on_failure: change
+
+deploy:
+  edge: true
+
+  provider: s3
+  access_key_id: AKIAJDM6KGIZ6LSGAK4Q
+  secret_access_key:
+    secure: "r3vSpvVNcpvIcjWFyk+GhYG55iuhfmy3mwuQHQS2EqjT3Skd3mOojnZuRIqy60XXElK5/nfa3qt7KH0GCSd4Is28cqPwh+1PtQ0ZVXfeKefAk2whTPDI4P+rgOA+srUxZraLALap9QGmvlzJyXbqBCRdDmXUjtXKi2ONE9PrUk4="
+  bucket: docs.ggplot2.org
+  skip_cleanup: true
+  local-dir: inst/web
+  upload-dir: dev

NEWS

@@ -10,6 +10,9 @@ ggplot2 0.9.3.1.99
 * theme: new theme settings panel.margin.x and panel.margin.y (units) allow
   specifying horizontal and vertical gap between panels in facetted plots (for
   both grid and wrap).  (Kirill Müller. Fixes #839)
+* Add `"none"` to documentation of `theme()` for parameter `legend.position`.
+  (@krlmlr, #829)
+
 
 ggplot2 0.9.3.1
 ----------------------------------------------------------------

R/theme.r

@@ -114,8 +114,8 @@ print.theme <- function(x, ...) str(x)
 #'                    (\code{element_text}; inherits from \code{title}) \cr
 #'   legend.title.align \tab alignment of legend title
 #'                    (number from 0 (left) to 1 (right)) \cr
-#'   legend.position  \tab the position of legends.
-#'                    ("left", "right", "bottom", "top", or two-element
+#'   legend.position  \tab the position of legends
+#'                    ("none", "left", "right", "bottom", "top", or two-element
 #'                      numeric vector) \cr
 #'   legend.direction \tab layout of items in legends
 #'                    ("horizontal" or "vertical") \cr

man/theme.Rd

@@ -81,17 +81,17 @@ last example below.
   legend.title \tab title of legend (\code{element_text};
   inherits from \code{title}) \cr legend.title.align \tab
   alignment of legend title (number from 0 (left) to 1
-  (right)) \cr legend.position \tab the position of
-  legends.  ("left", "right", "bottom", "top", or
-  two-element numeric vector) \cr legend.direction \tab
-  layout of items in legends ("horizontal" or "vertical")
-  \cr legend.justification \tab anchor point for
-  positioning legend inside plot ("center" or two-element
-  numeric vector) \cr legend.box \tab arrangement of
-  multiple legends ("horizontal" or "vertical") \cr
-  legend.box.just \tab justification of each legend within
-  the overall bounding box, when there are multiple legends
-  ("top", "bottom", "left", or "right")\cr
+  (right)) \cr legend.position \tab the position of legends
+  ("none", "left", "right", "bottom", "top", or two-element
+  numeric vector) \cr legend.direction \tab layout of items
+  in legends ("horizontal" or "vertical") \cr
+  legend.justification \tab anchor point for positioning
+  legend inside plot ("center" or two-element numeric
+  vector) \cr legend.box \tab arrangement of multiple
+  legends ("horizontal" or "vertical") \cr legend.box.just
+  \tab justification of each legend within the overall
+  bounding box, when there are multiple legends ("top",
+  "bottom", "left", or "right")\cr
 
   panel.background \tab background of plotting area, drawn
   underneath plot (\code{element_rect}; inherits from

vignettes/development.Rmd

@@ -103,13 +103,14 @@ Pull requests will be evaluated against the following checklist:
 
 ```
 * [ ] Motivate the change in one paragraph, and include it in NEWS.
-      Reference this issue and thank yourself.
+      In parenthesis, reference your github user name and this issue:
+      `(@hadley, #1234)`
 * [ ] Check pull request only includes relevant changes.
 * [ ] Use the [official style](http://adv-r.had.co.nz/Style.html).
 * [ ] Update documentation and re-run roxygen2
 * [ ] Add test, if bug in non-graphical function
+* [ ] Add visual test, if bug in graphical function
 * [ ] Add minimal example, if new graphical feature
-* [ ] Does not change existing behaviour
 ```
 
 These are explained in more detail below. This seems like a lot of work but don't worry if your pull request isn't perfect. It's a learning process and Winston and I will be on hand to help you out. A pull request is a process, and unless you've submitted a few in the past it's unlikely that your pull request will be accepted as is.