From cc813bdf0cffdf8fa58fb516548cca9c6fbcef19 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 8 Jan 2015 18:12:39 -0800 Subject: Document the nosort parameter. Signed-off-by: Robin H. Johnson --- data/pages/wiki/syntax.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 86ad815e4..09a077aa0 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -481,10 +481,13 @@ echo ''; | author | show item authors names | | date | show item dates | | description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped | +| nosort | do not sort the items in the feed | | //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). | The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. +By default, SimplePie if all of the items in the feed contain dates, SimplePie will sort the items in the feed so that the newest are displayed first. You can reverse this with the ''reverse'' parameter, or disable it entirely with ''nosort''. + **Example:** {{rss>http://slashdot.org/index.rss 5 author date 1h }} -- cgit v1.2.3 From 5c7812a8e4b376643062b85088143c265e5ffb4b Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 9 Jan 2015 09:01:12 -0800 Subject: Clean up RSS sort wording per https://github.com/splitbrain/dokuwiki/pull/999#discussion_r22706527. Signed-off-by: Robin H. Johnson --- data/pages/wiki/syntax.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 09a077aa0..7b453efa2 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -486,7 +486,7 @@ echo ''; The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. -By default, SimplePie if all of the items in the feed contain dates, SimplePie will sort the items in the feed so that the newest are displayed first. You can reverse this with the ''reverse'' parameter, or disable it entirely with ''nosort''. +By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''. **Example:** -- cgit v1.2.3 From 153dee4f7146278cd96d2240e3b1749ec3f2488a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 19 Apr 2015 18:15:29 +0100 Subject: increased copyright year in wiki:dokuwiki --- data/pages/wiki/dokuwiki.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index 0e08fdcd3..29843e5c6 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -57,7 +57,7 @@ All documentation and additional information besides the [[syntax|syntax descrip ===== Copyright ===== -2004-2013 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community +2004-2015 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). -- cgit v1.2.3 From 848e5d3474b85be02ae6b28429211e4386e3b956 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 30 Jun 2015 23:00:03 +0200 Subject: spaces were not stored due to automatically tools --- data/pages/wiki/syntax.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 7b453efa2..d56e5a24c 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -261,17 +261,19 @@ There are three exceptions which do not come from that pattern file: multiplicat Some times you want to mark some text to show it's a reply or comment. You can use the following syntax: - I think we should do it - - > No we shouldn't - - >> Well, I say we should - - > Really? - - >> Yes! - - >>> Then lets do it! + +I think we should do it + +> No we shouldn't + +>> Well, I say we should + +> Really? + +>> Yes! + +>>> Then lets do it! + I think we should do it -- cgit v1.2.3 From aff13b5a791d8a0b0812d4c013e85b42df37863a Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 30 Jun 2015 23:00:39 +0200 Subject: emphasis syntax has similar syntax, prevent conflicts --- data/pages/wiki/syntax.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index d56e5a24c..8e10b1906 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -319,7 +319,7 @@ As you can see, it's the cell separator before a cell which decides about the fo ^ Heading 4 | no colspan this time | | ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | -You can have rowspans (vertically connected cells) by adding '':::'' into the cells below the one to which they should connect. +You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect. ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ | Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 | -- cgit v1.2.3 From 19cd38771326eea15b458a160845dfa200c5f9e6 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 30 Jun 2015 23:17:27 +0200 Subject: Add description of ?linkonly below the embedded media list at syntax page --- data/pages/wiki/syntax.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 8e10b1906..613c04ace 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -170,6 +170,12 @@ DokuWiki can embed the following media formats directly. If you specify a filename that is not a supported media format, then it will be displayed as a link instead. +By adding ''?linkonly'' you provide a link to the media without displaying it inline + + {{wiki:dokuwiki-128.png?linkonly}} + +{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image. + ==== Fallback Formats ==== Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility. -- cgit v1.2.3 From cf6939cdfbd42d9ba56562c606587915b84a20c6 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 13 Jul 2015 23:36:24 +0200 Subject: Better suggestion for changing warning for nosmblink in browsers Improves syntax page due to feedback at #1233 --- data/pages/wiki/syntax.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 613c04ace..750f7e4f5 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -83,9 +83,14 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha Notes: * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). - * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'': - - LANG.nosmblinks = ''; + * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): + ==== Image Links ==== -- cgit v1.2.3 From d1427af7333593a01c5f917583f9dd03757dabd1 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 13 Jul 2015 23:42:58 +0200 Subject: no syntax highlighting, it attracts too much readers attention --- data/pages/wiki/syntax.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 750f7e4f5..bdfda9c46 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -83,7 +83,7 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha Notes: * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). - * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): + * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]):