diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-07-24 04:05:11 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-07-24 04:05:11 +0000 |
commit | b8d7ff080ca17139abdcfa0369a33a58d73bd1ce (patch) | |
tree | 3dd9241d2e3e6e98f9027d5a817978ee4994da62 /public/help/gl | |
parent | 74aac50c8f6e39420e0b8635cbef816d0d333cda (diff) | |
download | redmine-b8d7ff080ca17139abdcfa0369a33a58d73bd1ce.tar.gz redmine-b8d7ff080ca17139abdcfa0369a33a58d73bd1ce.zip |
Merged r14446 (#16373).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14447 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public/help/gl')
-rw-r--r-- | public/help/gl/wiki_syntax_detailed_markdown.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/public/help/gl/wiki_syntax_detailed_markdown.html b/public/help/gl/wiki_syntax_detailed_markdown.html index ff8f72604..16bc095f1 100644 --- a/public/help/gl/wiki_syntax_detailed_markdown.html +++ b/public/help/gl/wiki_syntax_detailed_markdown.html @@ -184,7 +184,7 @@ http://www.redmine.org, someone@foo.bar <p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p> - <p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p> + <p>If you want to display a specific text instead of the URL, you can use the standard markdown syntax:</p> <pre> [Redmine web site](http://www.redmine.org) @@ -196,7 +196,7 @@ http://www.redmine.org, someone@foo.bar <h2><a name="5" class="wiki-page"></a>Text formatting</h2> - <p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax. See <a class="external" href="http://en.wikipedia.org/wiki/Textile_%28markup_language%29">http://en.wikipedia.org/wiki/Textile_(markup_language)</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p> + <p>For things such as headlines, bold, tables, lists, Redmine supports Markdown syntax. See <a class="external" href="http://daringfireball.net/projects/markdown/syntax">http://daringfireball.net/projects/markdown/syntax</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p> <h3><a name="6" class="wiki-page"></a>Font style</h3> @@ -219,7 +219,7 @@ http://www.redmine.org, someone@foo.bar <h3><a name="7" class="wiki-page"></a>Inline images</h3> <ul> - <li><strong>![](image_url)</strong> displays an image located at image_url (textile syntax)</li> + <li><strong>![](image_url)</strong> displays an image located at image_url (markdown syntax)</li> <li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong>![](attached_image)</strong></li> </ul> |