about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--doc/site/src/default.template54
-rw-r--r--doc/site/src/dogs.page43
-rw-r--r--doc/site/src/faq.page54
-rw-r--r--doc/site/src/index.page3
-rw-r--r--doc/site/src/news.page21
5 files changed, 150 insertions, 25 deletions
diff --git a/doc/site/src/default.template b/doc/site/src/default.template
index 4fe26ec..fbcd8f2 100644
--- a/doc/site/src/default.template
+++ b/doc/site/src/default.template
@@ -46,6 +46,17 @@
         <h4>NEWS</h4>
 
         <dl>
+          <dt>Feb-13-2006</dt>
+
+          <dd>
+            <h5><a href="{relocatable: news.html}">Mongrel 0.3.2 Released</a></h5>
+
+            <p>Lots of little fixes and enhancements on the 0.3.1 release.  Still need to test
+              this release on win32.
+              <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a>
+              <a href="{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
+          </dd>
+
           <dt>Feb-12-2006</dt>
 
           <dd>
@@ -53,18 +64,17 @@
 
             <p><a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">
                 Download</a> the 0.3.1 release featuring better Rails support and a
-                major bug fix.<a href="{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
+                major bug fix.
+              <a href="{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
           </dd>
-        </dl>
 
-        <dl>
           <dt>Feb-12-2006</dt>
 
           <dd>
             <h5><a href="{relocatable: news.html}">Site now up!</a></h5>
 
-            <p>The new website is up and now running. <a href=
-            "{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
+            <p>The new website is up and now running.
+              <a href="{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
           </dd>
         </dl>
       </div>
@@ -80,44 +90,40 @@
       </div>
 
       <dl id="ads">
-        <dt><a href="http://rubyforge.org/forum/?group_id=1306"><img src="images/side_p1.gif" alt=
-        "Sad Dog" /><br /></a></dt>
+        <dt><a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads"><img src="images/3colls_p3.jpg" /></a><br /></a></dt>
+        <dd>
+          <p><b>Downloads:</b> Grab new gear.</p>
+        </dd>
 
+        <dt><a href="{relocatable: documentation.html}" title="Documentation"><img src="images/3colls_p2.jpg" /></a><br /></a></dt>
         <dd>
-          <p>Mongrel making you sad? Why not say something?</p>
+          <p><b>Documentation:</b>  RTFM.</p>
         </dd>
 
         <dt><a href="http://rubyforge.org/tracker/?atid=5145&group_id=1306&func=browse"><img src="images/side_p2.gif" alt="Bugs" /><br /></a></dt>
-
         <dd>
-          <p>Found a bug? Well then report it already?!</p>
+          <p><b>Tracker:</b> Found a bug? Well then report it already?!</p>
         </dd>
 
-        <dt><a href="http://rubyforge.org/projects/mongrel/"><img src="images/side_p3.gif" alt=
-        "Tools" /><br /></a></dt>
-
+        <dt><a href="http://rubyforge.org/forum/?group_id=1306"><img src="images/side_p1.gif" alt=
+        "Sad Dog" /><br /></a></dt>
         <dd>
-          <p>Hit the project page for all sorts of other
-          goodies.</p>
+          <p><b>Forums:</b> Mongrel making you sad? Why not say something?</p>
         </dd>
 
         <dt>
 <a href="http://rubyforge.org/project/memberlist.php?group_id=1306" title="Contact"><img src="images/3colls_p1.jpg" /></a><br /></a></dt>
-
         <dd>
-          <p>Contact project people.</p>
+          <p><b>People:</b> Contact project people.</p>
         </dd>
 
-        <dt><a href="{relocatable: documentation.html}" title="Documentation"><img src="images/3colls_p2.jpg" /></a><br /></a></dt>
-
+        <dt><a href="http://rubyforge.org/projects/mongrel/"><img src="images/side_p3.gif" alt=
+        "Tools" /><br /></a></dt>
         <dd>
-          <p>Documentation galore.</p>
+          <p><b>Other:</b> Hit the project page for all sorts of other
+          goodies.</p>
         </dd>
 
-        <dt><a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads"><img src="images/3colls_p3.jpg" /></a><br /></a></dt>
-        <dd>
-          <p>Grab new gear.</p>
-        </dd>
       </dl>
     </div>
 
diff --git a/doc/site/src/dogs.page b/doc/site/src/dogs.page
new file mode 100644
index 0000000..92fd81e
--- /dev/null
+++ b/doc/site/src/dogs.page
@@ -0,0 +1,43 @@
+---
+title: Mongrels
+inMenu: true
+directoryName: Mongrels
+---
+
+h1. Dogs Who Love Their People
+
+I asked people to send links to their favorite pictures of their dogs.  If you
+want your dog listed here as another Mongrel Supporter then just shoot me an
+e-mail: zedshaw AT zedshaw.com.
+
+
+h2. Kelly Felkins' tur-bone
+
+Kelly actually has an entire site devoted to his dog tur-bone.  Now that's love.
+
+* "tur-bone running":http://thedailybone.us/index.php?showimage=11
+* "tur-bone's main site":http://thedailybone.us/
+
+"My dog is lighting fast and 30 lbs small. Lean yet powerful.  (And he's a great guy too.)
+His name is T-Bone and you can see pictures of him at, where else, 'the daily bone'."
+
+
+h2. Paul Vudmaska's lucky
+
+Paul said his dog Lucky "is mean as hell :-)".
+
+* "Lucky likes you":http://flickr.com/photos/i-i/40837043/
+
+
+h2. Ed C.'s Honey
+
+Ready for the work day.
+
+* "Honey wearing a tie":http://static.flickr.com/16/21296961_6512bbdc3c_o.jpg
+
+h2. Ezra Zygmuntowicz's Louie
+
+I hear he likes hands too.
+
+* "Louie during x-mas":http://brainspl.at/xmas/xmas-Images/21.jpg
+
diff --git a/doc/site/src/faq.page b/doc/site/src/faq.page
index 796cb01..44b1939 100644
--- a/doc/site/src/faq.page
+++ b/doc/site/src/faq.page
@@ -35,5 +35,59 @@ As for the internals of Mongrel there are a few key technologies being used:
 
 Other than this there's not much more to it.
 
+h3. Q: Is it multi-threaded or can it handle concurrent requests?
+
+Mongrel is uses a pool of thread workers to do it's processing.  This means that
+it is able to handle concurrent access and should be thread safe.  This also
+means that you have to be more careful about how you use Mongrel.  You can't
+just write your application assuming that there are no threads involved.
+
+Camping and Og+Nitro are supposed to be thread safe and work with Mongrel directly.
+This hasn't been heavily tested so people should let me know if they get weird
+explosions under heavy load.
+
+Ruby on Rails is not thread safe so there is a synchronized block around the calls
+to Dispatcher.dispatch.  This means that everything is threaded right before and
+right after Rails runs.  While Rails is running there is only one controller
+in operation at a time.
+
+
+h2. Deployment
+
+h3. Q: What's the best way to deploy my application with Mongrel?
+
+Right now Mongrel is still in heavy development, so I wouldn't recommend
+running anything production level with it.  For the future I'm envisioning
+three main ways people will use Mongrel with their application:
+
+# Developing their application by running Mongrel the same way they run WEBrick.
+# Putting Mongrel behind a web server that supports proxying (like mod_proxy in lighttpd and apache)
+   so that the web server handles the static content and Mongrel handles the dynamic.
+# Using a load balancer to run a cluster of Mongrel and web servers directly rather
+   than through proxying.
+
+Since Mongrel uses plain HTTP there's no reason you can't use it directly for small
+installs or development and testing.  For production deployments it'll be easier
+to deal with than SCGI or FastCGI since there's already a huge amount of machinery
+available for running HTTP based clusters.
+
+
+h2. Web Site
+
+h3. Q: How did you make this site?
+
+The site was actually incredibly easy to create.  I simply went to "OSWD":http://openwebdesign.org/
+and found a design that fit what I wanted for the site.  I then went to "Flickr":http://flickr.com/
+and found pictures of various animals that were licensed under the
+"Creative Commons":http://openwebdesign.org/ license.  Once I chopped the images up, worked them
+into the design structure, and wrote an initial set of content I was done.
+
+The tool I use to generate the site is called "webgen":http://webgen.rubyforge.org/ which
+is a static site generator written in Ruby.  I write all of the content using redcloth
+mark-up and leave the generation to webgen.  Finally I hooked into the Mongrel Rakefile
+so that it's auto-generated and deployed to the site for me.
+
+Refer to the "attributions":/attributions.html page for information on the resources used.
+
 
 
diff --git a/doc/site/src/index.page b/doc/site/src/index.page
index 210f673..404a0d1 100644
--- a/doc/site/src/index.page
+++ b/doc/site/src/index.page
@@ -25,7 +25,8 @@ Which runs Mongrel in the background.  You can stop it with:
 
  $ mongrel_rails stop
 
-And you're all set.
+And you're all set.  There's quite a few options you can set for the
+start command.  Use the *mongrel_rails start -h* to see them all.
 
 
 h3. Win32 Folks
diff --git a/doc/site/src/news.page b/doc/site/src/news.page
index 03bed1b..db2fdc3 100644
--- a/doc/site/src/news.page
+++ b/doc/site/src/news.page
@@ -7,6 +7,27 @@ ordering: 2
 
 h1. Latest News
 
+h2.  Feb-13: Mongrel 0.3.2 Released
+
+Lots of little things people asked for in 0.3.1 release.  Changes are:
+
+* FAQ questions answered on threading and deployment scenarios.
+* Added some additional text to make the side icons a little clearer.
+* Created a "dogs":/dogs.html page with some people's favorite pets.
+* Write out a better message for *mongrel_rails start* giving the environment and other stuff.
+* Default to using ENV['RAILS_ENV'] or "default" as environment.
+* Removed the restriction on the environments so people can have custom ones.
+* Added options for:
+** _-n_ Number of processor threads.
+** _-t_ Timeout for each processor before it kills a request.
+** _-m_ Specify additional MIME type mappings in YAML format.
+** _-c_ Change to directory before starting (both for start and stop commands)
+** _-r_ Use a different document root from "public"
+* Use "rb" as open mode on all platforms (for windows binary files)
+* Fixed bug in DirHandler which prevented people from altering MIME mapping.
+
+"Download 0.3.2":http://rubyforge.org/frs/?group_id=1306
+
 h2. Feb-12: Mongrel 0.3.1 Released
 
 This release improves the support for Ruby On Rails, creates a new