From: adrianna Date: Fri, 2 Apr 2010 12:26:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 3.20100403~24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb99202474de4cb655d50a4f82b77b67e8445e5c;p=ikiwiki.git --- diff --git a/doc/features.mdwn b/doc/features.mdwn index 3925d78ef..c119dae97 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 marker syntax to learn. +with that there's no new commit [order essays](http://custom-paper-writing.com/order) 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, it can link to +Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to [[ViewVC]] or the like to browse the history of a wiki page. ### Full text search