Browse Source

Various documentation fixups

pull/929/merge
Armin Ronacher 11 years ago
parent
commit
a8a98bc6b6
  1. 25
      docs/deploying/fastcgi.rst
  2. 1
      docs/signals.rst
  3. 2
      docs/tutorial/dbinit.rst

25
docs/deploying/fastcgi.rst

@ -54,14 +54,14 @@ can execute it:
Configuring Apache Configuring Apache
------------------ ------------------
The example above is good enough for a basic Apache deployment but your `.fcgi` The example above is good enough for a basic Apache deployment but your
file will appear in your application URL e.g. `.fcgi` file will appear in your application URL e.g.
example.com/yourapplication.fcgi/news/. There are few ways to configure your example.com/yourapplication.fcgi/news/. There are few ways to configure
application so that yourapplication.fcgi does not appear in the URL. A your application so that yourapplication.fcgi does not appear in the URL.
preferable way is to use the ScriptAlias and SetHandler configuration directives A preferable way is to use the ScriptAlias and SetHandler configuration
to route requests to the FastCGI server. The following example uses directives to route requests to the FastCGI server. The following example
FastCgiServer to start 5 instances of the application which will handle all uses FastCgiServer to start 5 instances of the application which will
incoming requests: handle all incoming requests::
LoadModule fastcgi_module /usr/lib64/httpd/modules/mod_fastcgi.so LoadModule fastcgi_module /usr/lib64/httpd/modules/mod_fastcgi.so
@ -79,10 +79,11 @@ incoming requests:
</Location> </Location>
</VirtualHost> </VirtualHost>
These processes will be managed by Apache. If you're using an standalone FastCGI These processes will be managed by Apache. If you're using an standalone
server, you can use the FastCgiExternalServer directive instead. Note that in FastCGI server, you can use the FastCgiExternalServer directive instead.
the following the path is not real, it's simply used as an identifier to other Note that in the following the path is not real, it's simply used as an
directives such as AliasMatch: identifier to other
directives such as AliasMatch::
FastCgiServer /var/www/html/yourapplication -host 127.0.0.1:3000 FastCgiServer /var/www/html/yourapplication -host 127.0.0.1:3000

1
docs/signals.rst

@ -322,6 +322,7 @@ The following signals exist in Flask:
.. versionadded:: 0.10 .. versionadded:: 0.10
.. data:: flask.appcontext_popped .. data:: flask.appcontext_popped
:noindex:
This signal is sent when an application context is popped. The sender This signal is sent when an application context is popped. The sender
is the application. This usually falls in line with the is the application. This usually falls in line with the

2
docs/tutorial/dbinit.rst

@ -38,7 +38,7 @@ hand. Without an application context the :data:`~flask.g` object does not
know yet to which application it becomes as there could be more than one! know yet to which application it becomes as there could be more than one!
The ``with app.app_context()`` statement establishes the application The ``with app.app_context()`` statement establishes the application
context for us. In the body of the with statement the :flask:`~flask.g` context for us. In the body of the with statement the :data:`~flask.g`
object will be associated with ``app``. At the end of the with statement object will be associated with ``app``. At the end of the with statement
the association is released and all teardown functions are executed. This the association is released and all teardown functions are executed. This
means that our database connection is disconnected after the commit. means that our database connection is disconnected after the commit.

Loading…
Cancel
Save