Merge branch 'master' of github.com:mitsuhiko/flask

docs/deploying/fastcgi.rst

@@ -95,8 +95,6 @@ Set yourapplication.fcgi::
     from yourapplication import app
 
     class ScriptNameStripper(object):
-       to_strip = '/yourapplication.fcgi'
-
        def __init__(self, app):
            self.app = app
 

docs/deploying/mod_wsgi.rst

@@ -91,6 +91,20 @@ execute the application under a different user for security reasons:
         </Directory>
     </VirtualHost>
 
+Note: WSGIDaemonProcess isn't implemented in Windows and Apache will 
+refuse to run with the above configuration. On a Windows system, eliminate those lines:
+
+.. sourcecode:: apache
+
+	<VirtualHost *>
+		ServerName example.com
+		WSGIScriptAlias / C:\yourdir\yourapp.wsgi
+		<Directory C:\yourdir>
+			Order deny,allow
+			Allow from all
+		</Directory>
+	</VirtualHost>
+
 For more information consult the `mod_wsgi wiki`_.
 
 .. _mod_wsgi: http://code.google.com/p/modwsgi/