Merge branch 'trunk' of github.com:RGLab/flowWorkspace into trunk

README.md

@@ -19,15 +19,15 @@ bicLite(flowWorkspace) # may be older
 # Then, install the latest version from github using devtools package 
 install.packages("devtools") 
 library(devtools) #load it
-install_github("flowWorkspace","RGLab",branch="master")
+install_github("flowWorkspace/RGLab", ref="trunk")
 
 ```
 
 ### Import flowJo workspace
 
 ```r
 library(flowWorkspace)
-dataDir <- system.file("extdata",package="flowWorkspaceData")
+dataDir <- system.file("extdata", package="flowWorkspaceData")
 wsfile <- list.files(dataDir, pattern="manual.xml",full=TRUE)
 ws <- openWorkspace(wsfile);
 gs <- parseWorkspace(ws, path = dataDir, name = 4, subset = "CytoTrol_CytoTrol_1.fcs")
@@ -48,4 +48,4 @@ plotGate(gh)
 ### More examples:
 * [Importing flowJo Workspaces into R](http://bioconductor.org/packages/3.0/bioc/vignettes/flowWorkspace/inst/doc/flowWorkspace.pdf)
 * [How to plot gated data](http://bioconductor.org/packages/3.0/bioc/vignettes/flowWorkspace/inst/doc/plotGate.html)
-* [How to merge GatingSets](http://bioconductor.org/packages/3.0/bioc/vignettes/flowWorkspace/inst/doc/HowToMergeGatingSet.html)
+* [How to merge GatingSets](http://bioconductor.org/packages/3.0/bioc/vignettes/flowWorkspace/inst/doc/HowToMergeGatingSet.html)