<
From version < 28.6 >
edited by Vincent Massol
on 2010/10/25
To version < 28.7 >
edited by Vincent Massol
on 2010/10/25
>
Change comment: Added missing new image syntax for 2.1 + interwiki link example for 2.0

Summary

Details

Page properties
Content
... ... @@ -156,9 +156,9 @@
156 156  
157 157  == Experimental xwiki/2.1 wiki syntax ==
158 158  
159 -The xwiki wiki syntax sees further improvements as xwiki/2.1 is still in an experimental stage. A new feature is an enhanced syntax for links, which is more generic and allows easier extensions with new link types, demonstrated in this release with support for path and [[interwiki links>>http://en.wikipedia.org/wiki/Interwiki_links]].
159 +The xwiki wiki syntax sees further improvements as xwiki/2.1 is still in an experimental stage. A new feature is an enhanced syntax for links and images, which is more generic and allows easier extensions with new link types, demonstrated in this release with support for path and [[interwiki links>>http://en.wikipedia.org/wiki/Interwiki_links]].
160 160  
161 -Basic syntax:
161 +Basic syntax for links:
162 162  
163 163  {{code language="none"}}
164 164  [[label>>referenceType:referenceData]]
... ... @@ -178,13 +178,27 @@
178 178  {{velocity}}[[reset the history>>path:$doc.getURL('reset')||queryString="confirm=1"]]{{/velocity}}
179 179  {{/code}}
180 180  
181 +Basic syntax for images:
182 +
183 +{{code language="none"}}
184 +image:referenceType:referenceData
185 +[[image:referenceType:referenceData||paramN=valueN]]
186 +{{/code}}
187 +
181 181  {{info}}This syntax is not enabled by default, you must edit ##xwiki.cfg## and add it to the ##xwiki.rendering.syntaxes## setting to try it out.{{/info}}
182 182  
183 183  === [[Interwiki links>>http://en.wikipedia.org/wiki/Interwiki_links]] ===
184 184  
185 -Basic syntax:
192 +Basic syntax for XWiki Syntax 2.0:
186 186  
187 187  {{code language="none"}}
195 +[[label>>path@interwikiAlias]]
196 +[[Interwiki links>>Interwiki_links@wikipedia]]
197 +{{/code}}
198 +
199 +Basic syntax for XWiki Syntax 2.1:
200 +
201 +{{code language="none"}}
188 188  [[label>>interwiki:wikiAlias:path/data]]
189 189  [[Interwiki links>>interwiki:wikipedia:Interwiki_links]]
190 190  {{/code}}

Get Connected