From 8b0b6ed6a77278f54eed2cebe43ca4b5825e2b3a Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 26 Aug 2014 11:36:12 -0600 Subject: [PATCH 1/3] specify tag for rails --- rails/README-content.md | 2 +- rails/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rails/README-content.md b/rails/README-content.md index 004c216b1..cdd654330 100644 --- a/rails/README-content.md +++ b/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`. diff --git a/rails/README.md b/rails/README.md index be317eb01..4f2fa50c2 100644 --- a/rails/README.md +++ b/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`. From df6b9c27e225c2625671a4b762ee8c9e45d0ed10 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 26 Aug 2014 13:46:03 -0600 Subject: [PATCH 2/3] Change rails short desc as per FredLifton --- rails/README-short.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rails/README-short.txt b/rails/README-short.txt index 9c4022c10..00ba995ff 100644 --- a/rails/README-short.txt +++ b/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. From 47926a0fe0d11e3cb72888804fa64380410a2fe6 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 27 Aug 2014 09:54:56 -0600 Subject: [PATCH 3/3] Java/Oracle legal stuff --- java/README-content.md | 2 +- java/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/README-content.md b/java/README-content.md index 8b1378917..f0f2caeb2 100644 --- a/java/README-content.md +++ b/java/README-content.md @@ -1 +1 @@ - +Java is a registered trademark of Oracle and/or its affiliates. diff --git a/java/README.md b/java/README.md index faac31673..7271e6e63 100644 --- a/java/README.md +++ b/java/README.md @@ -1,4 +1,4 @@ - +Java is a registered trademark of Oracle and/or its affiliates. # Issues and Contributing