# HG changeset patch # User David Barts # Date 1561092750 25200 # Node ID 8867b3a5c4faefbcb4fa57eb8268a20accc76c10 # Parent fd8c558a89bb2529468b240abb1ddaea6e3c0d9a Some minor fixes. diff -r fd8c558a89bb -r 8867b3a5c4fa doc/api_reference.rst --- a/doc/api_reference.rst Sun Jun 09 14:16:17 2019 -0700 +++ b/doc/api_reference.rst Thu Jun 20 21:52:30 2019 -0700 @@ -114,7 +114,7 @@ A ``.pspx`` file is a standard Chameleon template, plus a set of optional *header directives* that may be present to override the default behavior of the created page or its associated route. ``#end`` - Marks the last line of the headers. This is not currently necessary, as headers are implicitly ended by the first line which does not start with a leading "#". This directive mainly here to facilitate future support of alternate templating engines. + Marks the last line of the headers. This is not currently necessary, as headers are implicitly ended by the first line which does not start with a leading "#". This directive is mainly here to facilitate future support of alternate templating engines. ``#errors`` This is an error page which handles the specified error codes; any code-behind associated with this page must be based on the ``tincan.ErrorPage`` class. @@ -147,7 +147,7 @@ Templates with No Explicit Code-Behind -------------------------------------- -Code-behind is optional for both normal and error page templates. If code-behind is not provided, TinCan will use the Page or ErrorPage class as appropriate. +Code-behind is optional for both normal and error page templates. If code-behind is not provided, TinCan will use the ``Page`` or ``ErrorPage`` class as appropriate. .. _loading-templates: diff -r fd8c558a89bb -r 8867b3a5c4fa doc/deployment.rst --- a/doc/deployment.rst Sun Jun 09 14:16:17 2019 -0700 +++ b/doc/deployment.rst Thu Jun 20 21:52:30 2019 -0700 @@ -6,7 +6,7 @@ Bottle's Built-In Server ======================== -The ``launch`` command will simply use the WSGI server built into Bottle (built into the Python standard library, actually) to serve the routes defined by the webapp. This is a multithreaded server (see the :ref:`multithreading-problem` section on the issues with multithreading), which is primarily intended for debugging and light-duty use. +The ``launch`` command will simply use the WSGI server built into Bottle (built into the Python standard library, actually) to serve the routes defined by the webapp. This is a multithreaded server (see the :ref:`multithreading-problem`), which is primarily intended for debugging and light-duty use. Static and Dynamic Routes ------------------------- diff -r fd8c558a89bb -r 8867b3a5c4fa doc/essential_characteristics.rst --- a/doc/essential_characteristics.rst Sun Jun 09 14:16:17 2019 -0700 +++ b/doc/essential_characteristics.rst Thu Jun 20 21:52:30 2019 -0700 @@ -8,7 +8,7 @@ Chameleon templating engine that TinCan uses. No Configuration - Just make a tree appropriately-named files, and TinCan will figure it + Just make a tree of appropriately-named files, and TinCan will figure it all out. The file tree defines the routes, much like in a web server. Header Directives Can Get You a Lot diff -r fd8c558a89bb -r 8867b3a5c4fa doc/introduction.rst --- a/doc/introduction.rst Sun Jun 09 14:16:17 2019 -0700 +++ b/doc/introduction.rst Thu Jun 20 21:52:30 2019 -0700 @@ -3,6 +3,6 @@ ************ TinCan is a Python web framework, based on the `Bottle `_ micro-framework and -the `Chameleon `_ templating engine. TinCan is based on the "code-behind" -paradigm popularized by ASP.Net, convention over configuration, and clear +the `Chameleon `_ templating engine. TinCan is based on the "code-behind" +paradigm popularized by ASP.Net, convention over configuration, and separation of presentation and back-end logic.