Pārlūkot izejas kodu

one set of edits

Dirk Eddelbuettel 11 gadi atpakaļ
vecāks
revīzija
91b34f719f
4 mainītis faili ar 77 papildinājumiem un 32 dzēšanām
  1. 1 1
      r-base/README-short.txt
  2. 42 22
      r-base/README.md
  3. 33 8
      r-base/content.md
  4. 1 1
      r-base/license.md

+ 1 - 1
r-base/README-short.txt

@@ -1 +1 @@
-R is a free software environment for statistical computing and graphics. 
+R is a system for statistical computation and graphics. 

+ 42 - 22
r-base/README.md

@@ -2,43 +2,63 @@
 
 - [`3.1.1` (*3.1/Dockerfile*)](https://github.com/docker-library/gcc/blob/ba6f069df8e6c838d0465b09215e96f8d5d65269/4.6/Dockerfile)
 
-For more information about this image and its history, please see the [relevant
-manifest file
-(`library/r-base`)](https://github.com/docker-library/official-images/blob/master/library/r-base)
-in the [`docker-library/official-images` GitHub
-repo](https://github.com/docker-library/official-images).
+For more information about this image and its history, please see the
+[relevant manifest file (`library/r-base`)](https://github.com/docker-library/official-images/blob/master/library/r-base)
+in the
+[`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images).
+<!-- DE: Do we have such a manifest file ? -->
 
-# What is R?
-
-R is a free software programming language and software environment for statistical computing and graphics. The R language is widely used among statisticians and data miners for developing statistical software and data analysis. Polls and surveys of data miners are showing R's popularity has increased substantially in recent years.
-
-R is an implementation of the S programming language combined with lexical scoping semantics inspired by Scheme. S was created by John Chambers while at Bell Labs. R was created by Ross Ihaka and Robert Gentleman at the University of Auckland, New Zealand, and is currently developed by the R Development Core Team, of which Chambers is a member. R is named partly after the first names of the first two R authors and partly as a play on the name of S.
 
-R is a GNU project. The source code for the R software environment is written primarily in C, Fortran, and R. R is freely available under the GNU General Public License, and pre-compiled binary versions are provided for various operating systems. R uses a command line interface; however, several graphical user interfaces are available for use with R.
+# What is R?
 
+R is a system for statistical computation and graphics. It consists of a
+language plus a run-time environment with graphics, a debugger, access to
+certain system functions, and the ability to run programs stored in script
+files.
+
+The R language is widely used among statisticians and data miners for
+developing statistical software and data analysis. Polls and surveys of data
+miners are showing R's popularity has increased substantially in recent
+years.
+
+R is an implementation of the S programming language combined with lexical
+scoping semantics inspired by Scheme. S was created by John Chambers while at
+Bell Labs. R was created by Ross Ihaka and Robert Gentleman at the University
+of Auckland, New Zealand, and is currently developed by the R Development
+Core Team, of which Chambers is a member. R is named partly after the first
+names of the first two R authors and partly as a play on the name of S.
+
+R is a GNU project. The source code for the R software environment is written
+primarily in C, Fortran, and R. R is freely available under the GNU General
+Public License, and pre-compiled binary versions are provided for various
+operating systems. R uses a command line interface; however, several
+graphical user interfaces are available for use with R. 
+
+> [R FAQ](http://cran.r-project.org/doc/FAQ/R-FAQ.html#What-is-R_003f)
 > [wikipedia.org/wiki/R_(programming_language)](http://en.wikipedia.org/wiki/R_(programming_language))
 
 ![logo](https://raw.githubusercontent.com/docker-library/docs/master/r-base/logo.png)
 
 # How to use this image
 
-<!-- -->
-
+R can be used interactively, as well as in scripts via Rscript
+front-end. Both modes are supported by the container.
+<!-- DE: More examples here ? -->
 
 
 # License
 
-View [license information](https://github.com/rocker-org/rocker/blob/master/LICENSE)
+View [GPL 2 license information](https://github.com/rocker-org/rocker/blob/master/LICENSE)
 for the software contained in this image.
 
 # User Feedback
 
 ## Issues
 
-If you have any problems with or questions about this image, please contact us
- through a [GitHub issue](https://github.com/rocker-org/rocker/issues).
+If you have any problems with or questions about this image, please contact
+us through a [GitHub issue](https://github.com/rocker-org/rocker/issues).
 
-You can also reach many of the official image maintainers on Twitter: [@cboettig](http://twitter.com/cboettig) and [@eddelbuettel](http://twitter.com/eddelbuettel).
+You can also reach us by email via email at `[email protected]`.
 
 
 ## Contributing
@@ -47,8 +67,8 @@ You are invited to contribute new features, fixes, or updates, large or small;
 we are always thrilled to receive pull requests, and do our best to process them
 as fast as we can.
 
-Before you start to code, we recommend discussing your plans 
-through a [GitHub issue](https://github.com/rocker-org/rocker/issues), especially for more ambitious
-contributions. This gives other contributors a chance to point you in the right
-direction, give you feedback on your design, and help you find out if someone
-else is working on the same thing.
+Before you start to code, we recommend discussing your plans through a
+[GitHub issue](https://github.com/rocker-org/rocker/issues), especially for
+more ambitious contributions. This gives other contributors a chance to point
+you in the right direction, give you feedback on your design, and help you
+find out if someone else is working on the same thing.

+ 33 - 8
r-base/content.md

@@ -1,11 +1,31 @@
 # What is R?
 
-R is a free software programming language and software environment for statistical computing and graphics. The R language is widely used among statisticians and data miners for developing statistical software and data analysis. Polls and surveys of data miners are showing R's popularity has increased substantially in recent years.
-
-R is an implementation of the S programming language combined with lexical scoping semantics inspired by Scheme. S was created by John Chambers while at Bell Labs. R was created by Ross Ihaka and Robert Gentleman at the University of Auckland, New Zealand, and is currently developed by the R Development Core Team, of which Chambers is a member. R is named partly after the first names of the first two R authors and partly as a play on the name of S.
-
-R is a GNU project. The source code for the R software environment is written primarily in C, Fortran, and R. R is freely available under the GNU General Public License, and pre-compiled binary versions are provided for various operating systems. R uses a command line interface; however, several graphical user interfaces are available for use with R.
+# What is R?
 
+R is a system for statistical computation and graphics. It consists of a
+language plus a run-time environment with graphics, a debugger, access to
+certain system functions, and the ability to run programs stored in script
+files.
+
+The R language is widely used among statisticians and data miners for
+developing statistical software and data analysis. Polls and surveys of data
+miners are showing R's popularity has increased substantially in recent
+years.
+
+R is an implementation of the S programming language combined with lexical
+scoping semantics inspired by Scheme. S was created by John Chambers while at
+Bell Labs. R was created by Ross Ihaka and Robert Gentleman at the University
+of Auckland, New Zealand, and is currently developed by the R Development
+Core Team, of which Chambers is a member. R is named partly after the first
+names of the first two R authors and partly as a play on the name of S.
+
+R is a GNU project. The source code for the R software environment is written
+primarily in C, Fortran, and R. R is freely available under the GNU General
+Public License, and pre-compiled binary versions are provided for various
+operating systems. R uses a command line interface; however, several
+graphical user interfaces are available for use with R. 
+
+> [R FAQ](http://cran.r-project.org/doc/FAQ/R-FAQ.html#What-is-R_003f)
 > [wikipedia.org/wiki/R_(programming_language)](http://en.wikipedia.org/wiki/R_(programming_language))
 
 %%LOGO%%
@@ -14,18 +34,23 @@ R is a GNU project. The source code for the R software environment is written pr
 
 ## Start an R instance
 
-The most straightforward way to use this image is to use a gcc container as both
+The most straightforward way to use this image is to use a container as both
 the build and runtime environment. In your `Dockerfile`, writing something along
 the lines of the following will compile and run your project:
 
     FROM r-base:latest
-    COPY . /usr/src/myscripts
-    WORKDIR /usr/src/myscripts
+    COPY . /usr/local/src/myscripts
+    WORKDIR /usr/local/src/myscripts
     CMD ["Rscript -e myscript.R"]
 
 Then, build and run the Docker image:
 
     docker build -t my-r-app .
+<!-- is building really a number one use case? I think most user just want to launch -->    
     docker run -it --rm --name my-running-app my-r-app
 
+Lauch R directory for interactive work:
+
+    docker run -ti --rm rocker/r-base /usr/bin/R
+
 

+ 1 - 1
r-base/license.md

@@ -1,2 +1,2 @@
-View [license information](https://github.com/rocker-org/rocker/blob/master/LICENSE)
+View [the GPL 2 license information](https://github.com/rocker-org/rocker/blob/master/LICENSE)
 for the software contained in this image.