about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-05-20 21:21:29 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-05-20 21:21:29 +0000
commit4aa7050dd281caf5f118cf29eeedf2cec3aab079 (patch)
treea717f0a7093f984bd4a6f69eeae66adbe90efb63
parent028417a18fc2921d07ba13a4c3674606945787f5 (diff)
downloadunicorn-4aa7050dd281caf5f118cf29eeedf2cec3aab079.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@198 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r--doc/site/src/docs/index.page4
-rw-r--r--doc/site/src/docs/lighttpd.page9
-rw-r--r--doc/site/src/docs/pound.page3
-rw-r--r--doc/site/src/news.page4
-rw-r--r--doc/site/src/security.page2
-rw-r--r--lib/mongrel.rb6
-rw-r--r--lib/mongrel/cgi.rb2
-rw-r--r--lib/mongrel/handlers.rb2
-rw-r--r--lib/mongrel/rails.rb6
9 files changed, 23 insertions, 15 deletions
diff --git a/doc/site/src/docs/index.page b/doc/site/src/docs/index.page
index b01be0b..314dac0 100644
--- a/doc/site/src/docs/index.page
+++ b/doc/site/src/docs/index.page
@@ -14,7 +14,7 @@ docs that you can refer to based on these.
 h2. Getting Started
 
 Start here to get a good grounding in getting Mongrel up and running.
-These documents are targetted at developers who will be starting off
+These documents are targeted at developers who will be starting off
 using Mongrel and might want to throw in a few little tricks.
 Serious deployments should check out *Deployment Best Practices*.
 
@@ -74,7 +74,7 @@ People writing plugins will want these.
 * "GemPlugin RDoc":/gem_plugin_rdoc/index.html
 
 
-If there's documentation you'd like then feel free to e-mail the list or post
+If there's documentation you'd like then feel free to E-mail the list or post
 to the tracker.
 
 h1. Other People's Documentation
diff --git a/doc/site/src/docs/lighttpd.page b/doc/site/src/docs/lighttpd.page
index 592a512..ffd12d2 100644
--- a/doc/site/src/docs/lighttpd.page
+++ b/doc/site/src/docs/lighttpd.page
@@ -1,9 +1,16 @@
----
+--
 title: Lighttpd
 inMenu: true
 directoryName: Documentation
 ---
 
+*I'm sad to say that I have to recommend people not use lighttpd anymore.*
+The author hasn't updated the mod_proxy plugin and isn't providing too much
+support for the bugs it has.  If you're running lighttpd and you constantly
+see 500 errors that are never recovered, then you should switch to Apache
+or another web server that can handle properly balancing backends.
+
+
 h1.  Using Lighttpd With Mongrel
 
 It is possible host an application with just Mongrel since it is
diff --git a/doc/site/src/docs/pound.page b/doc/site/src/docs/pound.page
index c625562..616e30c 100644
--- a/doc/site/src/docs/pound.page
+++ b/doc/site/src/docs/pound.page
@@ -16,7 +16,7 @@ h2. Requirements
 
 We assume that the following:
 
-* Pound and the monogrel cluster are running on the same machine [1].
+* Pound and the Mongrel cluster are running on the same machine [1].
 * *Pound 2.0.4* is built and installed, including SSL support if desired.
 * The *mongrel* gem is installed.
 * The *mongrel_cluster* gem is installed.
@@ -134,6 +134,7 @@ SSL: <%= @sslyn %>
 
 Visiting @http://127.0.0.1/Test/@ should show @SSL: false@ while visiting @https://127.0.0.1/Test/@
 should return @SSL: true@.
+
 fn1. It is not required that pound run on the same machine as the mongrel servers.  It was just chosen
 for this example.
 
diff --git a/doc/site/src/news.page b/doc/site/src/news.page
index cb2243a..a4082ec 100644
--- a/doc/site/src/news.page
+++ b/doc/site/src/news.page
@@ -226,7 +226,7 @@ h2. Mar-15:   Mongrel 0.3.11 -- Edge Rails Compliant
 
 The main thing with this release is that it works with edge Rails
 and has all the right dependencies.  There was a nasty bug with
-how RubyGems loads autorequired gems when any dependency is loaded.
+how RubyGems loads auto required gems when any dependency is loaded.
 In order to avoid this GemPlugins will now require the init.rb for
 the plugin directly rather than through RubyGems.  There are also
 other little tweaks to clean up how Rails runs.
@@ -310,7 +310,7 @@ Just do:
  $ gem install mongrel_status
 
 If you run mongrel_rails now you'll see a new command "status".
-Change to a Rails appliction directory where you have a daemon
+Change to a Rails application directory where you have a daemon
 running and it'll print out the PID.
 
 There will be tons of documentation coming out, and the ability
diff --git a/doc/site/src/security.page b/doc/site/src/security.page
index cb61c85..bc6c2ca 100644
--- a/doc/site/src/security.page
+++ b/doc/site/src/security.page
@@ -25,7 +25,7 @@ the future.
 
 h2. Mongrels HTTP Restrictions
 
-Many of the exploits out there currently for web servers tend to expoit
+Many of the exploits out there currently for web servers tend to exploit
 either ambiguous areas of the HTTP grammar, or the lack of size specifications
 in the protocol.  To protect against this Mongrel uses a fairly strict parser,
 but since many browser authors don't read specifications (and hell, who'd want
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index d3ea2ad..780f9bd 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -104,7 +104,7 @@ module Mongrel
     # This is the part of the path after the SCRIPT_NAME.  URIClassifier will determine this.
     PATH_INFO="PATH_INFO".freeze
 
-    # This is the intial part that your handler is identified as by URIClassifier.
+    # This is the initial part that your handler is identified as by URIClassifier.
     SCRIPT_NAME="SCRIPT_NAME".freeze
 
     # The original URI requested by the client.  Passed to URIClassifier to build PATH_INFO and SCRIPT_NAME.
@@ -419,7 +419,7 @@ module Mongrel
   # You use it by doing the following:
   #
   #   server = HttpServer.new("0.0.0.0", 3000)
-  #   server.register("/stuff", MyNifterHandler.new)
+  #   server.register("/stuff", MyNiftyHandler.new)
   #   server.run.join
   #
   # The last line can be just server.run if you don't want to join the thread used.
@@ -491,7 +491,7 @@ module Mongrel
               params[Const::SCRIPT_NAME] = script_name
               params[Const::REMOTE_ADDR] = params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last
 
-              # TODO: Find a faster/better way to carve out the range, preferrably without copying.
+              # TODO: Find a faster/better way to carve out the range, preferably without copying.
               request = HttpRequest.new(params, data[nparsed ... data.length] || "", client)
 
               # in the case of large file uploads the user could close the socket, so skip those requests
diff --git a/lib/mongrel/cgi.rb b/lib/mongrel/cgi.rb
index 7e93ba3..a9a7539 100644
--- a/lib/mongrel/cgi.rb
+++ b/lib/mongrel/cgi.rb
@@ -10,7 +10,7 @@ module Mongrel
   # The CGIWrapper.handler attribute is normally not set and is available for
   # frameworks that need to get back to the handler.  Rails uses this to give
   # people access to the RailsHandler#files (DirHandler really) so they can
-  # look-up paths and do other things withthe files managed there.
+  # look-up paths and do other things with the files managed there.
   #
   # In Rails you can get the real file for a request with:
   #
diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb
index d71e151..681056f 100644
--- a/lib/mongrel/handlers.rb
+++ b/lib/mongrel/handlers.rb
@@ -206,7 +206,7 @@ module Mongrel
     end
 
     # Process the request to either serve a file or a directory listing
-    # if allowed (based on the listing_allowed paramter to the constructor).
+    # if allowed (based on the listing_allowed parameter to the constructor).
     def process(request, response)
       req_method = request.params[Const::REQUEST_METHOD] || Const::GET
       req_path = can_serve request.params[Const::PATH_INFO]
diff --git a/lib/mongrel/rails.rb b/lib/mongrel/rails.rb
index e490123..d1e8be6 100644
--- a/lib/mongrel/rails.rb
+++ b/lib/mongrel/rails.rb
@@ -19,7 +19,7 @@ module Mongrel
     #
     # * If the requested exact PATH_INFO exists as a file then serve it.
     # * If it exists at PATH_INFO+".html" exists then serve that.
-    # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispath to have Rails go.
+    # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
     #
     # This means that if you are using page caching it will actually work with Mongrel
     # and you should see a decent speed boost (but not as fast as if you use lighttpd).
@@ -42,7 +42,7 @@ module Mongrel
       #
       # * If the requested exact PATH_INFO exists as a file then serve it.
       # * If it exists at PATH_INFO+".html" exists then serve that.
-      # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispath to have Rails go.
+      # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
       def process(request, response)
         return if response.socket.closed?
 
@@ -115,7 +115,7 @@ module Mongrel
       # time you call this function it does all the config
       # needed to get your rails working.  After that
       # it returns the one handler you've configured.
-      # This lets you attach Rails to any URI (and mulitple)
+      # This lets you attach Rails to any URI (and multiple)
       # you want, but still protects you from threads destroying
       # your handler.
       def rails(options={})