diff options
| author | adrianna <adrianna@web> | 2010-04-02 12:26:46 +0000 |
|---|---|---|
| committer | Joey Hess <joey@finch.kitenet.net> | 2010-04-02 12:26:46 +0000 |
| commit | bb99202474de4cb655d50a4f82b77b67e8445e5c (patch) | |
| tree | e286e28673355b400fa3d74dddabfa6a4f270759 /doc/features.mdwn | |
| parent | caa397b768c1fa4fda800ae0e86c10ac07b316a3 (diff) | |
| download | ikiwiki-bb99202474de4cb655d50a4f82b77b67e8445e5c.tar ikiwiki-bb99202474de4cb655d50a4f82b77b67e8445e5c.tar.gz | |
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 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 |