Merge pull request #2886 from KarlKl/patch-1

Silverstripe.com is not this version
This commit is contained in:
Ingo Schommer 2014-03-03 10:30:35 +13:00
commit 3023639354

View File

@ -97,6 +97,7 @@ CMS users still need to remember the specific syntax, but these shortcodes can f
for more advanced editing interfaces (with visual placeholders). See the built-in `[embed]` shortcode as an example
for coupling shortcodes with a form to create and edit placeholders.
## Built-in Shortcodes
SilverStripe comes with several shortcode parsers already.
@ -140,4 +141,4 @@ The parser will recognise this as:
## Related
* [Wordpress implementation](http://codex.wordpress.org/Shortcode_API)
* [Wordpress implementation](http://codex.wordpress.org/Shortcode_API)