From a8a98bc6b61bfc3842667bc97f977fd250bf7403 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Sat, 8 Feb 2014 22:10:08 +0000 Subject: [PATCH] Various documentation fixups --- docs/deploying/fastcgi.rst | 25 +++++++++++++------------ docs/signals.rst | 1 + docs/tutorial/dbinit.rst | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/deploying/fastcgi.rst b/docs/deploying/fastcgi.rst index 430a9748..b4f01d57 100644 --- a/docs/deploying/fastcgi.rst +++ b/docs/deploying/fastcgi.rst @@ -54,14 +54,14 @@ can execute it: Configuring Apache ------------------ -The example above is good enough for a basic Apache deployment but your `.fcgi` -file will appear in your application URL e.g. -example.com/yourapplication.fcgi/news/. There are few ways to configure your -application so that yourapplication.fcgi does not appear in the URL. A -preferable way is to use the ScriptAlias and SetHandler configuration directives -to route requests to the FastCGI server. The following example uses -FastCgiServer to start 5 instances of the application which will handle all -incoming requests: +The example above is good enough for a basic Apache deployment but your +`.fcgi` file will appear in your application URL e.g. +example.com/yourapplication.fcgi/news/. There are few ways to configure +your application so that yourapplication.fcgi does not appear in the URL. +A preferable way is to use the ScriptAlias and SetHandler configuration +directives to route requests to the FastCGI server. The following example +uses FastCgiServer to start 5 instances of the application which will +handle all incoming requests:: LoadModule fastcgi_module /usr/lib64/httpd/modules/mod_fastcgi.so @@ -79,10 +79,11 @@ incoming requests: -These processes will be managed by Apache. If you're using an standalone FastCGI -server, you can use the FastCgiExternalServer directive instead. Note that in -the following the path is not real, it's simply used as an identifier to other -directives such as AliasMatch: +These processes will be managed by Apache. If you're using an standalone +FastCGI server, you can use the FastCgiExternalServer directive instead. +Note that in the following the path is not real, it's simply used as an +identifier to other +directives such as AliasMatch:: FastCgiServer /var/www/html/yourapplication -host 127.0.0.1:3000 diff --git a/docs/signals.rst b/docs/signals.rst index 5d574965..c9df1edf 100644 --- a/docs/signals.rst +++ b/docs/signals.rst @@ -322,6 +322,7 @@ The following signals exist in Flask: .. versionadded:: 0.10 .. data:: flask.appcontext_popped + :noindex: This signal is sent when an application context is popped. The sender is the application. This usually falls in line with the diff --git a/docs/tutorial/dbinit.rst b/docs/tutorial/dbinit.rst index 10c77a27..980caca0 100644 --- a/docs/tutorial/dbinit.rst +++ b/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! 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 the association is released and all teardown functions are executed. This means that our database connection is disconnected after the commit.