Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of git@github.com:wycats/merb-more
  • Loading branch information
Ezra Zygmuntowicz committed May 13, 2008
2 parents 7ee51d3 + 00dd0fc commit a9eb9ce
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion merb-gen/app_generators/merb/merb_generator.rb
Expand Up @@ -18,7 +18,7 @@ def banner
USAGE: #{spec.name} -g path
Set environment variable MERB_ORM=[activerecord|datamapper|sequel]
to pre-enabled an ORM.
to pre-enable an ORM.
EOS
end

Expand Down
30 changes: 20 additions & 10 deletions merb-gen/app_generators/merb/templates/config/init.rb
Expand Up @@ -10,11 +10,11 @@
# ==== Set up load paths
#

# Make the app's "gems" directory a place where gems are loaded from.
# Note that gems directory must have a structure RubyGems uses for
# Add the app's "gems" directory to the gem load path.
# Note that the gems directory must mirror the structure RubyGems uses for
# directories under which gems are kept.
#
# To conveniently set it up use gem install -i <merb_app_root/gems>
# To conveniently set it up, use gem install -i <merb_app_root/gems>
# when installing gems. This will set up the structure under /gems
# automagically.
#
Expand All @@ -24,10 +24,10 @@
# application to be deployment environment independent. To do so,
# install gems into merb_app_root/gems directory like this:
#
# gem install -i ~/dev/merbapp/gems activesupport-post-2.0.2gem activerecord-post-2.0.2.gem
# gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem
#
# Since RubyGems will search merb_app_root/gems for dependencies, order
# in statement above is important: we need to install ActiveSupport which
# in the statement above is important: we need to install ActiveSupport which
# ActiveRecord depends on first.
#
# Remember that bundling of dependencies as gems with your application
Expand All @@ -47,9 +47,9 @@
# ==== Dependencies
# These are some examples of how you might specify dependencies.
# Dependencies load is delayed to one of later Merb app
# boot stages. It may be important when
# later part of your configuration relies on libraries specified
# Dependency loading is delayed to a later Merb app
# boot stage, but it may be important when
# another part of your configuration relies on libraries specified
# here.
#
# dependencies "RedCloth", "merb_helpers"
Expand Down Expand Up @@ -95,10 +95,20 @@
<%= "# " unless default_test_suite?(:test) %>use_test :test_unit
<%= "# " unless default_test_suite?(:spec) %>use_test :rspec


#
# ==== Set up your basic configuration
#

# IMPORTANT:
#
# early on Merb boot init file is not yet loaded.
# Thus setting PORT, PID FILE and ADAPTER using init file does not
# make sense and only can lead to confusion because default settings
# will be used instead.
#
# Please use command line options for them.
# See http://wiki.merbivore.com/pages/merb-core-boot-process
# if you want to know more.
Merb::Config.use do |c|

# Sets up a custom session id key, if you want to piggyback sessions of other applications
Expand All @@ -112,7 +122,7 @@

# ==== Tune your inflector

# To fine tune your inflector use word, singular_word and plural_word
# To fine tune your inflector use the word, singular_word and plural_word
# methods of Language::English::Inflector module metaclass.
#
# Here we define erratum/errata exception case:
Expand Down

0 comments on commit a9eb9ce

Please sign in to comment.