Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AUTHORS.txt, CHANGES.txt and docs according to #2320 #2321

Merged
merged 1 commit into from Apr 20, 2016
Merged

Update AUTHORS.txt, CHANGES.txt and docs according to #2320 #2321

merged 1 commit into from Apr 20, 2016

Conversation

@SpotlightKid
Copy link
Contributor

@SpotlightKid SpotlightKid commented Apr 19, 2016

And fix minor issues in documentation on shortcodes.

Some previously existing documentation from the main manual is duplicated in other words in extending.txt, but I believe, it makes sense to have it both places with differing depth.

Signed-off-by: Christopher Arndt chris@chrisarndt.de

…2320 and fix minor issues in documentation on shortcodes

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
@Kwpolska Kwpolska merged commit 947b745 into getnikola:master Apr 20, 2016
0 of 2 checks passed
If you put a template in ``shortcodes/`` called ``mycode.tmpl`` then Nikola
will create a shortcode called ``mycode`` you can use. Any options you pass to
the shortcode will be available as variables for that template. Non-keyword
options will be passed in a tuple varaible named ``_args``.

Copy link
Member

@ralsina ralsina Apr 20, 2016

The part about the contents when using shortcodes in the paired form seems to have been missed in the transition here.

Copy link
Member

@ralsina ralsina Apr 20, 2016

Ah, ignore me, it's below :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants