Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52f0b8c72b6a
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60705aa9bee0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 17, 2015

  1. Add note about inferior encodings 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Aug 17, 2015
    Copy the full SHA
    4d1abf6 View commit details

  2. Minor documentation fixes 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Aug 17, 2015
    Copy the full SHA
    60705aa View commit details
Showing with 10 additions and 4 deletions.
  1. +2 −2 CHANGES.txt
  2. +8 −2 docs/manual.txt
4 changes: 2 additions & 2 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
New in Master
New in master
=============

Features
--------

* New option to use custom, and several TEASER_ENDs
* New option to use custom, and several ``TEASER_END`` values

Bugfixes
--------
10 changes: 8 additions & 2 deletions docs/manual.txt
View file
Original file line number Diff line number Diff line change
@@ -221,6 +221,10 @@ and more via plugins — for more details, read the `input format documentation
<#multiple-input-formats>`__.
You can learn reStructuredText syntax with the `reST quickstart <https://getnikola.com/quickstart.html>`__.

Please note that Nikola does not guarantee support for encodings other than
UTF-8. We recommend converting your input files to that encoding. It will
prevent bugs, and Nikola will write UTF-8 output anyway.

You can control what markup compiler is used for each file extension with the ``COMPILERS``
option. The default configuration expects them to be placed in ``posts`` but that can be
changed (see below, the ``POSTS`` and ``PAGES`` options)
@@ -497,14 +501,16 @@ change that text, you can use a custom teaser:

.. TEASER_END: click to read the rest of the article

You can override the default value for `TEASER_END` in `conf.py`:
You can override the default value for ``TEASER_END`` in ``conf.py`` — for
example, the following example will work for ``.. more``, and will be
compatible with both WordPress and Nikola posts:

..code:: python

import re
TEASER_REGEXP = re.compile('<!--\s*(more|TEASER_END)(:(.+))?\s*-->', re.IGNORECASE)

Or you can completely customize the link using the ``READ_MORE_LINK`` option
Or you can completely customize the link using the ``READ_MORE_LINK`` option.

.. code:: python