From 959ea742916fcfa007aa5da15b311552076637ed Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Sat, 3 Dec 2011 02:32:16 +0100 Subject: [PATCH] Hrm... better use [[!ResourceName]] to avoid conflicts with Markdown. --- src/IDF/templates/idf/faq.html | 10 +++++----- src/IDF/templates/idf/wiki/edit-info.html | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/IDF/templates/idf/faq.html b/src/IDF/templates/idf/faq.html index 73371c0..0e744df 100644 --- a/src/IDF/templates/idf/faq.html +++ b/src/IDF/templates/idf/faq.html @@ -55,14 +55,14 @@ with the corresponding issue number.

{trans 'How can I embed images and other resources in my documentation pages?'}

{blocktrans} -

To embed any previously uploaded resource into your wiki page, you can use the [!ResourceName] syntax.

+

To embed any previously uploaded resource into your wiki page, you can use the [[!ResourceName]] syntax.

The rendering of the resource can then be further fine-tuned:

diff --git a/src/IDF/templates/idf/wiki/edit-info.html b/src/IDF/templates/idf/wiki/edit-info.html index 329a634..926926d 100644 --- a/src/IDF/templates/idf/wiki/edit-info.html +++ b/src/IDF/templates/idf/wiki/edit-info.html @@ -5,6 +5,6 @@

Instructions:

The content of the page can use the Markdown syntax with the Extra extension.

Website addresses are automatically linked and you can link to another page in the documentation using double square brackets like that [[AnotherPage]].

-

If you want to embed uploaded resources, use the [!ResourceName] syntax for that. This is described more in detail in the FAQ.

+

If you want to embed uploaded resources, use the [[!ResourceName]] syntax for that. This is described more in detail in the FAQ.

To directly include a file content from the repository, embrace its path with triple square brackets: [[[my/file.txt]]].

{/blocktrans}