diff options
Diffstat (limited to 'doc')
24 files changed, 44 insertions, 44 deletions
diff --git a/doc/basewiki/sandbox.mdwn b/doc/basewiki/sandbox.mdwn index c93c8f331..c66534fc2 100644 --- a/doc/basewiki/sandbox.mdwn +++ b/doc/basewiki/sandbox.mdwn @@ -29,4 +29,4 @@ Bulleted list * *item* * item -[[WikiLink]] +[[ikiwiki/WikiLink]] diff --git a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn index d6e4e5a9b..17479aacc 100644 --- a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn +++ b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn @@ -11,7 +11,7 @@ reported in [[index/discussion#index11h1]]. > The above examples are ambiguous, only worked due to a bug, and were > never documented to work. So I'm not inclined to re-add support for them. > -> If you look at [[WikiLink]], it is clear that spaces cannot be used in +> If you look at [[ikiwiki/WikiLink]], it is clear that spaces cannot be used in > WikiLinks. It also shows how to use underscores in the link text if you > want multiple words. > diff --git a/doc/bugs/Trailing_slash_breaks_links.mdwn b/doc/bugs/Trailing_slash_breaks_links.mdwn index aa03e2e91..11ef49ca3 100644 --- a/doc/bugs/Trailing_slash_breaks_links.mdwn +++ b/doc/bugs/Trailing_slash_breaks_links.mdwn @@ -1,4 +1,4 @@ -A trailing slash on a [[wikilink]] breaks the link: +A trailing slash on a [[ikiwiki/wikilink]] breaks the link: `\[[todo/Gallery/]]` appears as [[todo/Gallery/]]. diff --git a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists/discussion.mdwn b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists/discussion.mdwn index 439486741..44ff4143f 100644 --- a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists/discussion.mdwn +++ b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists/discussion.mdwn @@ -1,3 +1,3 @@ On <http://phd.martin-krafft.net/wiki/tag/factors/ideology/>, another symptom of this problem can be seen: the page collects pages linking to `tag/factors/ideology`, and `/factors/language` is one of those. However, the link points to `tag/factors/language`, which does *not* link to `tag/factors/ideology`. -I think this is an artefact of the intersection of ikiwiki [[SubPage/LinkingRules]] with the use of a page's basename when its path relative to the wikiroot should be used.
\ No newline at end of file +I think this is an artefact of the intersection of ikiwiki [[ikiwiki/SubPage/LinkingRules]] with the use of a page's basename when its path relative to the wikiroot should be used. diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn index 2bda0cc0f..744f26f4c 100644 --- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn +++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn @@ -1,8 +1,8 @@ In [[ikiwiki/markdown]] syntax, none of the other special characters get processed -inside a code block. However, in ikiwiki, [[wiki_links|wikilink]] and +inside a code block. However, in ikiwiki, [[wiki_links|ikiwiki/wikilink]] and [[preprocessor_directives|ikiwiki/preprocessordirective]] still get processed inside a code block, requiring additional escaping. For example, `[links -don't work](#here)`, but `a [[wikilink]] becomes HTML`. --[[JoshTriplett]] +don't work](#here)`, but `a [[ikiwiki/wikilink]] becomes HTML`. --[[JoshTriplett]] Indented lines provide a good way to escape a block of text containing markdown syntax, but ikiwiki links like \[[this]] are still diff --git a/doc/plugins/camelcase.mdwn b/doc/plugins/camelcase.mdwn index 2a3e2639d..81270f41a 100644 --- a/doc/plugins/camelcase.mdwn +++ b/doc/plugins/camelcase.mdwn @@ -1,8 +1,9 @@ [[template id=plugin name=camelcase author="[[Joey]]"]] -This plugin makes words in CamelCase be treated as a [[WikiLink]]. That is -to say, any two or more words capitalised and mashed together are assumed -to be the name of some other page on the wiki, and so become a link. +This plugin makes words in CamelCase be treated as a [[ikiwiki/WikiLink]]. +That is to say, any two or more words capitalised and mashed together are +assumed to be the name of some other page on the wiki, and so become a +link. If this plugin is enabled, this will be a link: SandBox diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn index 01fdd4852..8efefcbcb 100644 --- a/doc/plugins/html.mdwn +++ b/doc/plugins/html.mdwn @@ -5,7 +5,7 @@ This plugin lets html pages be used as source pages for the wiki. The html pages will still be wrapped in the same html template as any other page, so for best results you should include only the page body in the html file. Also, if the [[htmlscrubber]] plugin is enabled, the html pages will be -sanitised like any other page. You can also use standard [[WikiLink]]s etc -in the html pages. +sanitised like any other page. You can also use standard +[[WikiLinks|ikiwiki/WikiLink]] etc in the html pages. This plugin is included in ikiwiki, but is not enabled by default. diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn index 5d93e90c5..7858fd513 100644 --- a/doc/plugins/img.mdwn +++ b/doc/plugins/img.mdwn @@ -2,9 +2,9 @@ [[tag type/chrome]] This is an image handling plugin. While ikiwiki supports inlining full-size -images by making a [[WikiLink]] that points to the image, using this plugin -you can easily scale down an image for inclusion onto a page, providing a -link to a full-size version. +images by making a [[ikiwiki/WikiLink]] that points to the image, using +this plugin you can easily scale down an image for inclusion onto a page, +providing a link to a full-size version. This plugin uses the [ImageMagick](http://www.imagemagick.org/) tools via [PerlMagick](http://www.imagemagick.org/www/perl-magick.html). @@ -17,7 +17,7 @@ Note that this is a stripped down version of Christian Mock's \[[img image1.jpg size="200x200" alt="clouds"]] The image file will be searched for using the same rules as used to find -the file pointed to by a [[WikiLink]]. +the file pointed to by a [[ikiwiki/WikiLink]]. The `size` parameter is optional, defaulting to full size. Note that the original image's aspect ratio is always preserved, even if this means diff --git a/doc/plugins/img/discussion.mdwn b/doc/plugins/img/discussion.mdwn index c8a536327..02d46e380 100644 --- a/doc/plugins/img/discussion.mdwn +++ b/doc/plugins/img/discussion.mdwn @@ -1,5 +1,5 @@ It would be useful (at least for me) if one could specify -(using a [[WikiLink]]) where the image links to. For example, +(using a [[ikiwiki/WikiLink]]) where the image links to. For example, on <http://www.bddebian.com/~wiki/sidebar/> I'd like to have the logo link to \[[hurd/logo]] / <http://www.bddebian.com/~wiki/hurd/logo/> instead of linking to the PNG image file. --[[tschwinge]] diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn index 073482a4c..f97e267ef 100644 --- a/doc/plugins/meta.mdwn +++ b/doc/plugins/meta.mdwn @@ -19,7 +19,7 @@ You can use any field names you like, but here are some predefined ones: Specifies a link to another page. This can be used as a way to make the wiki treat one page as linking to another without displaying a user-visible - [[WikiLink]]: + [[ikiwiki/WikiLink]]: \[[meta link=otherpage]] diff --git a/doc/plugins/meta/discussion.mdwn b/doc/plugins/meta/discussion.mdwn index 73114a951..8388a1172 100644 --- a/doc/plugins/meta/discussion.mdwn +++ b/doc/plugins/meta/discussion.mdwn @@ -11,8 +11,8 @@ Now I've work-arounded it using apostrophes in another way --[[Paweł|ptecza]] -> As with any other parameter in a [[preprocessordirective]], you can +> As with any other parameter in a [[ikiwiki/preprocessordirective]], you can > triple-quote, and then include quotation marks inside. --[[Joey]] >> Thanks for the hint! Toggle plugin is probably my favourite ikiwiki ->> plugin, but I forget about that :D --[[Paweł|ptecza]]
\ No newline at end of file +>> plugin, but I forget about that :D --[[Paweł|ptecza]] diff --git a/doc/plugins/rst.mdwn b/doc/plugins/rst.mdwn index 6a6606f20..49dd81e70 100644 --- a/doc/plugins/rst.mdwn +++ b/doc/plugins/rst.mdwn @@ -10,7 +10,7 @@ Note that this plugin does not interoperate very well with the rest of ikiwiki. Limitations include: * There are issues with inserting raw html into documents, as ikiwiki - does with [[WikiLinks|WikiLink]] and many + does with [[WikiLinks|ikiwiki/WikiLink]] and many [[PreprocessorDirectives|ikiwiki/PreprocessorDirective]]. So while you may find this useful for importing old files into your wiki, diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index 98990973b..edae03887 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -5,13 +5,14 @@ This plugin allows tagging pages. List tags as follows: \[[tag tech life linux]] -The tags work the same as if you had put a (hidden) [[WikiLink]] on the page -for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages that are -tagged with a given tag, for example. The tags will also show up on blog -entries and at the bottom of the tagged pages, as well as in RSS and Atom -feeds. +The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on +the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all +pages that are tagged with a given tag, for example. The tags will also +show up on blog entries and at the bottom of the tagged pages, as well as +in RSS and Atom feeds. -If you want a visible [[WikiLink]] along with the tag, use taglink instead: +If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink +instead: \[[taglink foo]] \[[taglink tagged_as_foo|foo]] diff --git a/doc/plugins/type/link.mdwn b/doc/plugins/type/link.mdwn index 920cd31f5..c10863fac 100644 --- a/doc/plugins/type/link.mdwn +++ b/doc/plugins/type/link.mdwn @@ -1 +1 @@ -These plugins deal with [[WikiLinks|WikiLink]]. +These plugins deal with [[WikiLinks|ikiwiki/WikiLink]]. diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn index 34467cf8e..a87ab06fd 100644 --- a/doc/plugins/wikitext.mdwn +++ b/doc/plugins/wikitext.mdwn @@ -12,7 +12,7 @@ hyphen characters at the start of a line create a horizontal line. Newlines turn into the appropriate tags. Headers are matching equals signs around the header text -- the more signs, the lesser the header. -Links are standard [[WikiLinks|WikiLink]], although you can also enable +Links are standard [[WikiLinks|ikiwiki/WikiLink]], although you can also enable [[CamelCase]] links. Lists are indented text, by one tab or four spaces. In unordered lists, diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index d145d48f3..3eddec7cf 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -92,8 +92,8 @@ Bulleted list ## Different sorts of links: -* [[WikiLink]] -* [[different_name_for_a_WikiLink|WikiLink]] +* [[Features]] +* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * <http://www.gnu.org/> * [GNU](http://www.gnu.org/) * [Email](mailto:noone@invalid) @@ -122,5 +122,3 @@ span also doesn't work: This sandbox is also a [[ikiwiki/blog]]! [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] - -[[blubb]] diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn index 9915ec587..54ac53979 100644 --- a/doc/smileys.mdwn +++ b/doc/smileys.mdwn @@ -48,7 +48,7 @@ For example: {*} B) {*} To change the supported smileys, just edit the lists on this page. Note that the format is important; each list item should start with the text that is turned into the smiley, escaped so that users can see what -produces it, followed by a [[WikiLink]] to the image to display. +produces it, followed by a [[ikiwiki/WikiLink]] to the image to display. /!\ Bear in mind that the link to the image needs to be written in a way that will work if it's copied to other pages on the wiki. So be sure to include the diff --git a/doc/tags.mdwn b/doc/tags.mdwn index f1a3f9f9b..a210df09c 100644 --- a/doc/tags.mdwn +++ b/doc/tags.mdwn @@ -15,7 +15,7 @@ You can also tag a page with a visible link: \[[taglink mytag]] -This tag will be displayed just like a regular [[WikiLink]]. +This tag will be displayed just like a regular [[ikiwiki/WikiLink]]. One way to use these tags is to create a [[ikiwiki/blog]] of pages that have a particular set of tags. Or just look at the [[BackLinks]] to a tag page to diff --git a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn index b584341c6..842c87e2d 100644 --- a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn +++ b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn @@ -16,7 +16,7 @@ I can also submit a Git patch, if desired. **URL** = http://some.nice/place/ (*etc.*) -**WHITHER** = \[\[**[[wikilink]]**]] | **URL** +**WHITHER** = \[\[**[[ikiwiki/wikilink]]**]] | **URL** **D** = natural number (*meaning seconds*) @@ -49,7 +49,7 @@ the forwarding statement also to the referred-to page. >> (How to qualify a valid target address?) >> What is a *cyclic meta refresh loop*? Two pages in turn forwarding to each other? >> I think it would be possible to implement such a guard when only in-wiki links ->> ([[wikilink]]s) are being used, but how to do so for external links? --[[tschwinge]] +>> ([[ikiwiki/wikilink]]s) are being used, but how to do so for external links? --[[tschwinge]] >>> This seems a lot more securely to do for in-wiki links, since we know >>> that a link generated by a wikilink is safe, and can avoid cycles. diff --git a/doc/todo/__47___should_point_to_top-level_index.mdwn b/doc/todo/__47___should_point_to_top-level_index.mdwn index 88199d5de..60cb763e1 100644 --- a/doc/todo/__47___should_point_to_top-level_index.mdwn +++ b/doc/todo/__47___should_point_to_top-level_index.mdwn @@ -1,3 +1,3 @@ -Since `/` now works in [[WikiLink]]s to anchor links to the root of the site +Since `/` now works in [[ikiwiki/WikiLink]]s to anchor links to the root of the site (for instance, `\[[/index]]`), `/` alone should work as a reference to the top-level index page (for instance, `\[[Home|/]]`). --[[JoshTriplett]] diff --git a/doc/todo/fileupload/soc-proposal/discussion.mdwn b/doc/todo/fileupload/soc-proposal/discussion.mdwn index 299dc4c56..1ce52f0ca 100644 --- a/doc/todo/fileupload/soc-proposal/discussion.mdwn +++ b/doc/todo/fileupload/soc-proposal/discussion.mdwn @@ -1,8 +1,8 @@ -There's nothing in [[fileupload]] that suggests putting the file upload limit in the body of a page. That would indeed be a strange choice. Ikiwiki already uses [[PageSpecs|PageSpec]] in the Preferences page (for specifying locked pages, banned users, and subscriptions), and I had envisioned putting the file upload controls there, and possibly subsuming some of those other controls into them. +There's nothing in [[fileupload]] that suggests putting the file upload limit in the body of a page. That would indeed be a strange choice. Ikiwiki already uses [[PageSpecs|ikiwiki/PageSpec]] in the Preferences page (for specifying locked pages, banned users, and subscriptions), and I had envisioned putting the file upload controls there, and possibly subsuming some of those other controls into them. > Thanks for clarifying; I clearly misunderstood the original text. -- Ben -It's not clear to me that the concept of attaching files to a page fits ikiwiki very well; unlike most wikis, ikiwiki supports subdirectories and [[SubPages|SubPage]], which allows for hierarchical placement of uploaded files, which is a much more flexible concept than simple attachment. Futhermore, the idea of listing all attached files at the bottom of a page seems somewhat inflexible. What if I want to make a podcast, using inline's existing support for that -- I won't want a list of every "attached" file at the bottom of my podcast's page then. +It's not clear to me that the concept of attaching files to a page fits ikiwiki very well; unlike most wikis, ikiwiki supports subdirectories and [[SubPages|ikiwiki/SubPage]], which allows for hierarchical placement of uploaded files, which is a much more flexible concept than simple attachment. Futhermore, the idea of listing all attached files at the bottom of a page seems somewhat inflexible. What if I want to make a podcast, using inline's existing support for that -- I won't want a list of every "attached" file at the bottom of my podcast's page then. > If a file was attached to _some-dir/some-page_, it would be stored in _some-dir/_ and linked from _some-page_. That would seem reasonably hierarchical to me. What do you suggest as an alternative? @@ -43,4 +43,4 @@ the image/video/file/... and a discussion page. Probably named image.mdwn and im > I did an proof of concept implementation of this idea [here](http://ng.l4x.org/brainstorm/gallery/) yesterday night, including the link to the source code. I'd really love to hear comments about this approach. (note1: I'm really not interested in any kind of http interface to that thing, just testing ways of storing the meta - data, note2: I'm no perl programmer)
\ No newline at end of file + data, note2: I'm no perl programmer) diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn index 0f5859b3e..45002f0c6 100644 --- a/doc/todo/format_escape.mdwn +++ b/doc/todo/format_escape.mdwn @@ -218,7 +218,7 @@ Index: doc/plugins/rst.mdwn -* reStructuredText does not allow raw html to be inserted into - documents, but ikiwiki does so in many cases, including -- [[WikiLinks|WikiLink]] and many +- [[WikiLinks|ikiwiki/WikiLink]] and many - [[PreprocessorDirectives|ikiwiki/PreprocessorDirective]]. +* Some bits of ikiwiki may still assume that markdown is used or embed html + in ways that break reStructuredText. (Report bugs if you find any.) diff --git a/doc/todo/linktitle.mdwn b/doc/todo/linktitle.mdwn index 8d6ce3c1f..d5b53e082 100644 --- a/doc/todo/linktitle.mdwn +++ b/doc/todo/linktitle.mdwn @@ -1,6 +1,6 @@ Pages could have a `linktitle` (perhaps via [[plugins/meta]]), and -[[wikilinks|wikilink]] could use that title by default when linking to the -page. That would allow pages to have a simple, easily linkable name +[[wikilinks|ikiwiki/wikilink]] could use that title by default when linking +to the page. That would allow pages to have a simple, easily linkable name (without spaces, for instance), but use the proper title for links. For example, [[ikiwiki/PreprocessorDirective]] could use the `linktitle` "preprocessor directive", and pages for [[users]] could have `linktitle`s diff --git a/doc/todo/mailnotification/discussion.mdwn b/doc/todo/mailnotification/discussion.mdwn index 29421d321..b8af29f05 100644 --- a/doc/todo/mailnotification/discussion.mdwn +++ b/doc/todo/mailnotification/discussion.mdwn @@ -10,5 +10,5 @@ Mail notifications are probably not required. For example I get lots of comments Perhaps a powerful little UNDO feature on RecentChanges is all that is needed. > Um, if you'll look at the [[mailnotification]] page, ikiwiki has -> supported mail notifications for > 1 year, with a powerful [[PageSpec]] +> supported mail notifications for > 1 year, with a powerful [[ikiwiki/PageSpec]] > to allow chosing which pages you want to be notified about. --[[Joey]] |