diff docs/pages/02_overview.md @ 398:0f4032dafc1f

docs: Adjustments to documentation.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 23 Oct 2015 23:50:18 -0700
parents dcaa41b39c23
children
line wrap: on
line diff
--- a/docs/pages/02_overview.md	Wed Oct 21 22:48:19 2015 -0700
+++ b/docs/pages/02_overview.md	Fri Oct 23 23:50:18 2015 -0700
@@ -1,7 +1,7 @@
 ---
 title: Overview
 icon: book
-header_img: witch.png
+header_img: melting.png
 ---
 
 Wikked's data is entirely stored in text files on disk. All you ever need, or
@@ -11,6 +11,24 @@
 re-created.
 
 
+## General features
+
+Wikked implements the usual [wiki][] concepts of being able to edit pages, look
+at their history, revert to previous revisions, or easily link to other pages.
+
+Wikked also supports the ability to include a page into another page, to assign
+metadata (like categories) to pages, and to query pages based on that metadata.
+So for example you can display a list of all pages under the category "_Witches
+of Oz_".
+
+Finally, because the wiki sits on top of a standard source controlled
+repository with text files in it, you can edit, pull, push, merge, rebase, and
+more. This may not be shown correctly on the web history page, but you can still
+do that.
+
+[wiki]: https://en.wikipedia.org/wiki/Wiki
+
+
 ## The wiki folder
 
 If you look at your new wiki, you should see a file called `Main page.md`, along
@@ -43,18 +61,6 @@
 > Windows, Mac, Linux).
 
 
-## General features
-
-Wikked implements the usual wiki concepts of being able to edit pages, look at
-their history and revert to previous revisions, and of course easily link to
-other pages.
-
-Wikked also supports the ability to include a page into another page, to assign
-metadata (like categories) to pages, and to query pages based on that metadata.
-So for example you can display a list of all pages under the category "_Witches
-of Oz_".
-
-
 ## Limitations
 
 Wikked was written mainly for a small group of editors in mind. It's especially