Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Helio Chissini de Castro 2019-10-12 17:24:06 +02:00
commit f4b64b8700
17 changed files with 215 additions and 113 deletions

View file

@ -991,7 +991,7 @@ By default, pages subsequent to ``.../foo.html`` are created as
``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used to
change this. It takes a sequence of triples, where each triple consists of::
(minimum_page, page_url, page_save_as,)
(minimum_page, page_url, page_save_as,)
For ``page_url`` and ``page_save_as``, you may use a number of variables.
``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and
@ -1005,7 +1005,7 @@ subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
as follows::
PAGINATION_PATTERNS = (
(1, '{url}', '{save_as}`,
(1, '{url}', '{save_as}',
(2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
)