From 5b8438bee3ff9b5be6f089af4ca702f0d0b38160 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 18 Nov 2009 19:26:23 +0100 Subject: [PATCH] Update user documentation to incorporate changes in recent versions --- docs/user/midori.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index fbb93022..3e30f092 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.1.6 +.. |(version)| replace:: 0.2.2 ''''''' Midori @@ -9,7 +9,7 @@ ----------------------------------------- :Authors: Christian Dywan -:Date: $Date: 2009-04-14 18:00:35 +0100 (Tue, 14 Apr 2009) $ +:Date: $Date: 2009-11-18 18:20:11 +0100 (Wed, 18 Nov 2009) $ :Version: |(version)| Copyright © 2008-2009 @@ -132,6 +132,8 @@ The following arguments are supported if you call Midori from a command line. +-------+--------------------+------------------------------------------------+ | -r | --run | Run the specified filename as javascript | +-------+--------------------+------------------------------------------------+ +| -s | --snapshot + Take a snapshot of the specified URI | ++-------+--------------------+------------------------------------------------+ | -V | --version | Show version information and exit. | +-------+--------------------+------------------------------------------------+ @@ -159,8 +161,12 @@ The files stored in the primary configuration folder are the following: +----------------+------------------------------------------------------------+ | history.db | History, sqlite3 | +----------------+------------------------------------------------------------+ +| logins | Usernames and passwords, plain text | ++----------------+------------------------------------------------------------+ | running | A file created to track whether Midori quit cleanly | +----------------+------------------------------------------------------------+ +| search | Search engines, text key file | ++----------------+------------------------------------------------------------+ | session.xbel | The current or last session, ie. open tabs, | +----------------+------------------------------------------------------------+ | tabtrash.xbel | The 10 last closed tabs | @@ -173,10 +179,6 @@ replace the 'bookmarks.xbel' as long as it is valid XBEL/ XML. Currently while Midori is running it will happily overwrite files as needed and never read back any changes. -Incidentally Midori will recognize readonly files and not write modifications -to readonly files back to disk. This can be useful for kiosk systems where -particular changes shouldn't be saved. - Keyboard shortcuts ------------------ @@ -190,9 +192,8 @@ The navigationbar The navigationbar is the primary toolbar containing notably back and forward -buttons, the location entry and a search entry. Except for the location entry -any item can be removed and others can be added by right-clicking the toolbar -and using the Add and Remove menu items. +buttons, the location entry and a search entry. The "Toolbar Editor" extension +can be used to add or remove items. The sidepanel