Merged with James's upstream.

Hope I did it right.  If I screwed up, withsqlite is borked.

1 files changed, 6 insertions, 13 deletions

diff --git a/README b/README
index 6e00a78..a5e4bf9 100644
--- a/README
+++ b/README
@@ -36,19 +36,12 @@ to get newer, better shinier functions.  The modules will
 automatically integrate into the existing menu system so you can
 control all of the box's parts from one central location.
 
-The interface has a 'basic' and an 'expert' mode.  In basic mode, much
-of Plinth's configuration and capability are hidden.  Sane defaults
-are chosen whenever possible.  In expert mode, you can get down into
-the details and configure things the average user never thinks about.
-For example, experts can turn off ntp or switch ntp servers.  Basic
-users should never even know those options exist.
-
-One caveat: expert mode is not as powerful as the commandline.  We can
-only do so much when translating free-form configuration files into
-web forms.  And if you manually change your configuration files, the
-interface will overwrite those changes at first opportunity.  This
-interface is not a tool for super admins facing complex scenarios.  It
-is for home users to do a wide variety of basic tasks.
+The interface will eventually have a 'basic' and an 'expert' mode.  In
+basic mode, much of Plinth's configuration and capability are hidden.
+Sane defaults are chosen whenever possible.  In expert mode, you can
+get down into the details and configure things the average user never
+thinks about.  For example, experts can turn off ntp or switch ntp
+servers.  Basic users should never even know those options exist.
 
 See comments in exmachina/exmachina.py for more details about the
 configuration management process seperation scheme.