(no commit message)

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef41089dd3cc5dc1c93f957adff6bc340..c119dae974c15e20c05d4d79df35e736e3c03cc5 100644 (file)
--- 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
 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
 
 
 ### [[RecentChanges]], editing pages in a web browser
 


@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
 
 ### [[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
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search