diff options
| author | Simon McVittie <smcv@debian.org> | 2010-04-02 18:28:34 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2010-04-02 18:28:34 +0100 |
| commit | 05b6e8ceee2bec4442727e2475abf8a8861d5e0a (patch) | |
| tree | 8508f2ab5e2bb00e9ffc412e4c068855c1b57b3e /doc/features.mdwn | |
| parent | 0c1a1185c1957c161adda779d719d7ddca2d5021 (diff) | |
| download | ikiwiki-05b6e8ceee2bec4442727e2475abf8a8861d5e0a.tar ikiwiki-05b6e8ceee2bec4442727e2475abf8a8861d5e0a.tar.gz | |
Despam, again. Someone ban adrianna please?
Diffstat (limited to 'doc/features.mdwn')
| -rw-r--r-- | doc/features.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn index c119dae97..3925d78ef 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -125,7 +125,7 @@ yours when you commit. In the rare cases where automatic merging fails due to the same part of a page being concurrently edited, regular commit conflict markers are shown in the file to resolve the conflict, so if you're already familiar -with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn. +with that there's no new commit marker syntax to learn. ### [[RecentChanges]], editing pages in a web browser @@ -158,7 +158,7 @@ since page edit controls can be changed via plugins. ### [[PageHistory]] -Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to +Well, sorta. Rather than implementing YA history browser, it can link to [[ViewVC]] or the like to browse the history of a wiki page. ### Full text search |