<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -95,10 +95,20 @@ end
 &lt;%= &quot;# &quot; unless default_test_suite?(:test) %&gt;use_test :test_unit
 &lt;%= &quot;# &quot; unless default_test_suite?(:spec) %&gt;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</diff>
      <filename>merb-gen/app_generators/merb/templates/config/init.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5790d79ee3ba63de69bdf242ea66a877ded703f6</id>
    </parent>
  </parents>
  <author>
    <name>Michael S. Klishin</name>
    <email>michael@novemberain.com</email>
  </author>
  <url>http://github.com/wycats/merb-more/commit/71dbc1474f9c05a824b22a44cd97ff30abfa0a36</url>
  <id>71dbc1474f9c05a824b22a44cd97ff30abfa0a36</id>
  <committed-date>2008-05-12T07:21:04-07:00</committed-date>
  <authored-date>2008-05-12T07:20:39-07:00</authored-date>
  <message>Add note on which options must only be set using command line (see details).

As #229 and #297 in -core state, people try to set every possible option
in init file. On server start and pid file drop, though, init file(s) are
not yet loaded. So, setting pid file or port in init file makes no sense.
Defaults are being used and it causes confusion in future.

Given all this, add a note in generated init file.</message>
  <tree>8e150227965bddbbe80b2bce62e0e77f31f0bc61</tree>
  <committer>
    <name>Michael S. Klishin</name>
    <email>michael@novemberain.com</email>
  </committer>
</commit>
