some documentation on commands

[mw] / README

diff --git a/README b/README
index 54086211121d15b69db98d44d7c649a9426a1bad..a7224e53aa2e2c8f86f49b4a0247c9b718b5d8c5 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 mw - VCS-like nonsense for MediaWiki websites
-Copyright (C) 2010  Ian Weller <ian@ianweller.org>
+Copyright (C) 2011  Ian Weller <ian@ianweller.org> and others
 
 == Basic workflow ==
 We don't have a nice installation process yet, so set the following alias:
@@ -10,9 +10,22 @@ mw init http://example.com/w/api.php
 mw login  # if you need/want to
 mw pull 'Main Page'
 $EDITOR Main_Page.wiki
-mw fetch  # check for newer revisions; this command doesn't exist yet
-mw update  # apply newer revisions; this command doesn't exist yet
 mw commit
+mw status
+
+== Status command ==
+
+Will show whether a file has been locally modified ('M') or is clean ('C').
+
+== Pull command ==
+
+The pull command has the following features:
+
+* Can pull a new page/file, or update one.
+* Can be provided a page name or file name.
+* If the wiki has updates, it will pull those unless they conflict 
+  with local changes. The user must then resolve/merge conflicts.
+
 
 == License ==
 This program is free software; you can redistribute it and/or modify