Skip to content

Commit

Permalink
Minor manual updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Kwpolska committed Dec 24, 2015
1 parent c023f85 commit edfbba3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/manual.txt
Expand Up @@ -813,9 +813,9 @@ To use them from plugins, please see `Extending Nikola <https://getnikola.com/ex
Using a shortcode
~~~~~~~~~~~~~~~~~

In your content files, a shortcode can be called by using the {{% name parameters %}} form. Shortcode parameters are space delimited. Parameters with spaces can be quoted.
In your content files, a shortcode can be called by using the ``{{% name parameters %}}`` form. Shortcode parameters are space delimited. Parameters with spaces can be quoted (or backslash escaped).

The first word is always the name of the shortcode. Parameters follow the name. Depending upon how the shortcode is defined, the parameters may be named, positional or both (although you can’t mixed parameter types in a single call). The format for named parameters models that of HTML with the format name="value".
The first word is always the name of the shortcode. Parameters follow the name. Depending upon how the shortcode is defined, the parameters may be named, positional or both (although you can’t mix parameter types in a single call). The format for named parameters models that of HTML with the format name="value".

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Dec 24, 2015

Author Member

(although you can’t mix parameter types in a single call)

@ralsina, are you sure? Why would that be a problem?

This comment has been minimized.

Copy link
@ralsina

ralsina Dec 24, 2015

Member

Well, yes we can :-) I don't know what I was thinking about.

This comment has been minimized.

Copy link
@ralsina

ralsina Dec 24, 2015

Member

And now I know. I copied that from the hugo docs :-)

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Dec 24, 2015

Author Member

Deleted.


Some shortcodes use or require closing shortcodes. Like HTML, the opening and closing shortcodes match (name only), the closing being prepended with a slash.

Expand Down Expand Up @@ -1162,7 +1162,7 @@ The branch to use for committing the sources can be changed using the
``GITHUB_DEPLOY_BRANCH`` option in your config. For a
user.github.io/organization.github.io, this MUST be set to ``master``,
and the branch containing the sources must be changed to something
else, like ``deploy``, using the ``GITHUB_SOURCE_BRANCH`` option. The
else, like ``src``, using the ``GITHUB_SOURCE_BRANCH`` option. The
remote name to which the changes are pushed is ``origin`` by default,
and can be changed using the ``GITHUB_REMOTE_NAME`` option. You also,
obviously, need to have ``git`` on your PATH, and should be able to
Expand Down

0 comments on commit edfbba3

Please sign in to comment.