Merge branch 'master' of github.com:HappyFunCorp/happy_seed

HappyFunCorp · Jul 13, 2016 · c0bf149 · c0bf149
2 parents 14021a1 + 2cbaa64
commit c0bf149
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc b/lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc
@@ -1,4 +1,4 @@
-HappySeed Base Install
+HappySeed Base Install (Now for Rails 5!)
 =================
 
 ### What does this do?

diff --git a/lib/generators/happy_seed/roles/templates/docs/README.03.roles.rdoc b/lib/generators/happy_seed/roles/templates/docs/README.03.roles.rdoc
@@ -20,4 +20,4 @@ na
 
 ### What needs to be done?
 
-Define roles in the enum on the user model and abilities inside of the `abilities.rb` class per the directions in the cancan documentation [here.](https://github.com/ryanb/cancan/wiki/Defining-Abilities)  
+Define roles in the enum on the user model and abilities inside of the `abilities.rb` class per the directions in the cancancan documentation [here.](https://github.com/CanCanCommunity/cancancan)  
diff --git a/website/source/docs/README.00.base.html.markdown b/website/source/docs/README.00.base.html.markdown
@@ -1,4 +1,4 @@
-HappySeed Base Install
+HappySeed Base Install (Now for Rails 5!)
 =================
 
 ### What does this do?

diff --git a/website/source/docs/README.03.roles.html.markdown b/website/source/docs/README.03.roles.html.markdown
@@ -20,4 +20,4 @@ na
 
 ### What needs to be done?
 
-Define roles in the enum on the user model and abilities inside of the `abilities.rb` class per the directions in the cancan documentation [here.](https://github.com/ryanb/cancan/wiki/Defining-Abilities)  
+Define roles in the enum on the user model and abilities inside of the `abilities.rb` class per the directions in the cancancan documentation [here.](https://github.com/CanCanCommunity/cancancan)  
diff --git a/website/source/docs/README.11.angular_view.html.markdown b/website/source/docs/README.11.angular_view.html.markdown
@@ -11,14 +11,12 @@ The view generator adds
 
 ### Why do you want this?
 
-Getting angular to work in rails is a pain, especially when working around the asset pipeline.  Figuring out how to get the controller views to be served correctly is just a hassle, and this gives a model for doing that as well as dealing with forgery.
-
-The philosophy here is that all of the angular html templates are stored out of the assets/templates directory.
+This sets up your angular views for you in a quick and easy way.
 
 ### Environment Variables
 
 na
 
 ### What needs to be done?
 
-na
+When you have set up your project and you want to add a new angular view, just run `rails g happy_seed:angular_view <NAME_OF VIEW>`.
diff --git a/website/source/index.html.haml b/website/source/index.html.haml
@@ -9,7 +9,7 @@
         #logo-container
           #ted{"data-scroll-reveal"=>"enter from the top but wait .5s"}
           %h2#info
-            Seed.
+            Seed. Now for Rails 5!
             %br
             Build MVPs quickly.
           %h1#seed-logo.logo{"data-scroll-reveal"=>"enter bottom but wait 1s over 1s"}
@@ -131,7 +131,7 @@
 
           .info_on_flow.roles_comment.hide_comment
             %h3 Roles install:
-            %p Installs and sets up can-can so you can manage roles quickly and easily. It is set up to work with active-admin out of the box so that you don't need a separate admin.
+            %p Installs and sets up cancancan so you can manage roles quickly and easily. It is set up to work with active-admin out of the box so that you don't need a separate admin.
             %p
               =link_to "Check out the docs >", "/docs/README.03.roles.html"