From 588ab468c8805424ae8f091022611010a8c6f0c7 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Wed, 23 Jan 2008 15:09:00 +0000
Subject: [PATCH] added marks.txt as a template, to be filled with real text

---
 locale/en-US/browsing.txt | 21 +++++++++++++++
 locale/en-US/intro.txt    |  7 ++---
 locale/en-US/marks.txt    | 57 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 locale/en-US/marks.txt

diff --git a/locale/en-US/browsing.txt b/locale/en-US/browsing.txt
index ff52d4ca..a7a9ad83 100644
--- a/locale/en-US/browsing.txt
+++ b/locale/en-US/browsing.txt
@@ -97,3 +97,24 @@ ________________________________________________________________________________
 Go [count] pages back in the browser history.
 The special version [c]:forward![c] goes to the end of the browser history.
 ________________________________________________________________________________
+
+
+|gu|
+||[count]gu||
+________________________________________________________________________________
+Go to [count]th parent directory. +
+
+[m]2gu[m] on _http://www.example.com/dir1/dir2/file.htm_ opens
+_http://www.example.com/dir1/_.
+________________________________________________________________________________
+
+
+|gU|
+||gU||
+________________________________________________________________________________
+Go to the root of the website. +
+
+[m]gU[m] on _http://www.example.com/dir1/dir2/file.htm_ opens
+_http://www.example.com/_.
+When browsing a local directory, it goes to the root directory.
+________________________________________________________________________________
diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt
index e91c17cd..d021113c 100644
--- a/locale/en-US/intro.txt
+++ b/locale/en-US/intro.txt
@@ -46,12 +46,13 @@ it, recommend it and like it :)
 section:Help{nbsp}topics[overview]
 
 - help:Initialization[starting.html]: How vimperator starts up, where it reads the config file...
-- help:Browsing[browsing.html]: Explains most mappings and commands needed for
-  a browsing session.
+- help:Browsing[browsing.html]: Basic mappings and commands needed for
+  a browsing session (how to open a web page or go back in history).
+- help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history.
 - help:Options[options.html]: A description of all options.
 - help:Developer{nbsp}Information[developer.html]: How to write docs or
   plugins.
-- help:Various[various.html]: Other help which didn't fit into a category.
+- help:Various[various.html]: Other help which didn't fit into any other category.
 
 section:Features[features]
 
diff --git a/locale/en-US/marks.txt b/locale/en-US/marks.txt
new file mode 100644
index 00000000..984250c0
--- /dev/null
+++ b/locale/en-US/marks.txt
@@ -0,0 +1,57 @@
+HEADER
+
+|different-marks| |marks| +
+
+Vimperator supports a number of different marks:
+
+- Bookmarks which allow you to mark a web page as one of your favorites for
+  easy access.
+- QuickMarks allow you to define up to 62 (a-zA-Z0-9) web sites (or group of
+  websites) which you really visit most often
+- Local marks to store the position with a webpage
+- History is also a special type of marks, as Vimperator automatically
+  remembers sites which you have visited in the past.
+
+section:Bookmarks[bookmarks]
+
+Bla bla...
+
+|a| |:bma| |:bmark|
+||:bm[ark] [-title=title] [-keyword=kw] [-tags=tag1,tag2] [url]|| +
+||a||
+____________________________________________________________________________
+Add a bookmark. +
+
+The following options are interpreted:
+
+- -title="custom title" (short option: -t)
+- -tags=comma,separated,tag,list (short option: -T)
+- -keyword=keyword (short option: -k)
+
+If you don't add a custom title, either the title of the web page or the URL
+is taken as the title. You can omit the optional [url] argument, so just do
+:bmark to bookmark the currently loaded web page with a default title and
+without any tags.
+____________________________________________________________________________
+
+
+TODO: Add more commands here (A, :bmarks, :delbmarks)
+
+
+section:History[history]
+
+TO BE WRITTEN...
+
+
+section:QuickMarks[quickmarks]
+
+TO BE WRITTEN...
+
+
+
+section:Local{nbsp}Marks[localmarks]
+
+Local marks are used to ...
+We differentiate between  two types ...
+
+TO BE WRITTEN...