Merge branch 'master' of github.com:infosiftr/docker-library-docs

java/README-content.md

@@ -1 +1 @@
-
+Java is a registered trademark of Oracle and/or its affiliates.

java/README.md

@@ -1,4 +1,4 @@
-
+Java is a registered trademark of Oracle and/or its affiliates.
 
 # Issues and Contributing
 

rails/README-content.md

@@ -8,7 +8,7 @@ Ruby on Rails, often simply referred to as Rails, is an open source web applicat
 
 ## 1. create a `Dockerfile` in your rails app project
 
-    FROM rails
+    FROM rails:onbuild
 
 Put this file in the root of your app, next to the `Gemfile`.
 

rails/README-short.txt

@@ -1 +1 @@
-Ruby On Rails is an open-source web framework that's optimized for programmer happiness and sustainable productivity. It lets you write beautiful code by favoring convention over configuration.
+Ruby on Rails is an open-source application framework written in Ruby. It emphasizes best practices such as convention over configuration, active record pattern, and the model-view-controller pattern.

rails/README.md

@@ -8,7 +8,7 @@ Ruby on Rails, often simply referred to as Rails, is an open source web applicat
 
 ## 1. create a `Dockerfile` in your rails app project
 
-    FROM rails
+    FROM rails:onbuild
 
 Put this file in the root of your app, next to the `Gemfile`.