aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-09-29 18:47:53 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-09-29 18:47:53 +0000
commit4f0620e7037a4db97d7b67846f64676999840d78 (patch)
tree31de2682151dd28e810e97be3cf6bef9957ee664 /doc
parent3629e2dc993803d9cc821abec55ca95446eed558 (diff)
downloadikiwiki-4f0620e7037a4db97d7b67846f64676999840d78.tar
ikiwiki-4f0620e7037a4db97d7b67846f64676999840d78.tar.gz
clean up bad wiki links, add news item
Diffstat (limited to 'doc')
-rw-r--r--doc/TourBusStop.mdwn3
-rw-r--r--doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn4
-rw-r--r--doc/rcs/git.mdwn4
-rw-r--r--doc/sandbox.mdwn3
-rw-r--r--doc/todo/Support__47__Switch_to_MultiMarkdown.mdwn4
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 5edccc63b..2a19d6eba 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -6,7 +6,8 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
* Rather than inventing yet another simplistic, linear version control system, ikiwiki uses a standard version control system such as [[Subversion|rcs/svn]] or [[rcs/Git]]. You can edit a wiki by committing to your repository, as well as through a traditional web interface. This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software. You can also take full advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[rcs/Git]].
-* You can turn any set of pages into a [[blog]] or similar news feed, complete with RSS and Atom support. You can run your weblog on ikiwiki (and [[many people do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
+* You can turn any set of pages into a [[blog]] or similar news feed,
+* complete with RSS and Atom support. You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages. You can then serve these pages as static content. ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive. Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server. So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
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 de9f6e5db..6d8a3b61d 100644
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -1,6 +1,6 @@
In [[markdown]] syntax, none of the other special characters get processed
-inside a code block. However, in ikiwiki, [[wiki links|wikilink]] and
-[[preprocessor directives|preprocessordirective]] still get processed
+inside a code block. However, in ikiwiki, [[wiki_links|wikilink]] and
+[[preprocessor_directives|preprocessordirective]] still get processed
inside a code block, requiring additional escaping. For example, `[links
don't work](#here)`, but `a [[wikilink]] becomes HTML`. --[[JoshTriplett]]
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 6bcb8abe9..0ee4e32f3 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -10,7 +10,7 @@ commits edited pages, and uses the Git history to generate the [[RecentChanges]]
Links:
-* [[Editing_wiki_pages_manually with git|GitManual]]
+* [[Editing_wiki_pages_manually_with_git|GitManual]]
* [HOWTO: ikiwiki + git][howto]
-[howto]: http://fob.po8.org/node/346 \ No newline at end of file
+[howto]: http://fob.po8.org/node/346
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 0d3740bbd..8c5343aa0 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -76,7 +76,6 @@ Bulleted list
* [[WikiLink]]
* [[different_name_for_a_WikiLink|WikiLink]]
-* [[different name for a WikiLink (with spaces this time)|WikiLink]]
* <http://www.gnu.org/>
* [GNU](http://www.gnu.org/)
* [Email](mailto:noone@invalid)
@@ -106,4 +105,4 @@ aaaaaaaaaaaaaaaa
This sandbox is also a [[blog]]!
-[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]] \ No newline at end of file
+[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]]
diff --git a/doc/todo/Support__47__Switch_to_MultiMarkdown.mdwn b/doc/todo/Support__47__Switch_to_MultiMarkdown.mdwn
index 35352cf01..732de0bdf 100644
--- a/doc/todo/Support__47__Switch_to_MultiMarkdown.mdwn
+++ b/doc/todo/Support__47__Switch_to_MultiMarkdown.mdwn
@@ -25,8 +25,8 @@ MultiMarkdown would solve the BibTex request and the multiple output formats wou
[MultiMarkdown Homepage](http://fletcher.freeshell.org/wiki/MultiMarkdown)
-> I don't think MultiMarkdown solves [[the BibTeX request|todo/BibTeX]], but it might solve the request for LaTeX output. --[[JoshTriplett]]
+> I don't think MultiMarkdown solves [[the_BibTeX_request|todo/BibTeX]], but it might solve the request for LaTeX output. --[[JoshTriplett]]
> Unless there's a way to disable a zillion of the features, please **no**. Do _not_ switch to it. One thing that I like about markdown as opposed to most other ASCII markup languages, is that it has at least a bit of moderation on the syntax (although it could be even simpler). There's not a yet another reserved character lurking behind every corner. Not so in multimarkdown anymore. Footnotes, bibliography and internal references I could use, and they do not add any complex syntax: it's all inside the already reserved sequences of bracketed stuff. (If you can even say that ASCII markup languages have reserved sequences, as they randomly decide to interpret stuff, never actually failing on illegal input, like a proper language to write any serious documentation in, would do.) But tables, math, and so on, no thanks! Too much syntax! Syntax overload! Bzzzt! I don't want mischievous syntaxes lurking behind every corner, out to get me. --[[tuomov]]
-> ikiwiki already supports MultiMarkdown, since it has the same API as MarkDown. So if you install it as Markdown.pm (or as /usr/bin/markdown), it should Just Work. It would also be easy to support some other extension such as mmdwn to use multimarkdown installed as MuliMarkdown.pm, if someone wanted to do that for some reason -- just copy the mdwn plugin and lightly modify. --[[Joey]] \ No newline at end of file
+> ikiwiki already supports MultiMarkdown, since it has the same API as MarkDown. So if you install it as Markdown.pm (or as /usr/bin/markdown), it should Just Work. It would also be easy to support some other extension such as mmdwn to use multimarkdown installed as MuliMarkdown.pm, if someone wanted to do that for some reason -- just copy the mdwn plugin and lightly modify. --[[Joey]]