diff -r 1f6263d403a0 -r 658ad3bc0c8a tex/vym.tex
--- a/tex/vym.tex	Tue Sep 05 10:03:29 2006 +0000
+++ b/tex/vym.tex	Sat Mar 31 09:28:27 2007 +0000
@@ -147,8 +147,8 @@
 
 \section{Concept of \vym}
 %TODO may add a general introduction here...
-\subsection{Windows: mapeditor and noteeditor}
-\vym uses two windows: an editor for the map itself and another one for
+\subsection{Windows: Mapeditor, Noteeditor, and more}
+\vym uses mainly two windows: an editor for the map itself and another one for
 notes, which are part of the map. Let's call them {\em mapeditor} and
 {\em noteeditor}: 
 \begin{center}
@@ -160,6 +160,10 @@
 information e.g. the content of a email easily in a {\em branch}: Just
 type or copy\&paste it into the {\em noteeditor}. Working with notes is
 explained in \ref{noteeditor}
+ 
+Another window which can be toggled on or off is the {\em history
+window}. It can be used to see the latest actions performed on a map and
+also to undo and redo actions. Details are in \ref{historywindow}.
 
 \subsection{Menus and Context menus}
 On top of each window you find the menubar. The options you find there
@@ -577,9 +581,9 @@
 \end{center}
 
 \subsection{Import and export notes}
-The note is always saved automatically within the \vym file itself.
+The note is always saved automatically within the \vym map itself.
 Nevertheless sometimes it is nice to import a note from an external file
-or write it. Use "File\ra~Import" and "File\ra~Export" to do so. 
+or write it. Use "Map\ra~Import" and "Map\ra~Export" to do so. 
 
 \subsection{Edit and print note}
 Editing works like in any simple texteditor, including undo and redo
@@ -630,17 +634,6 @@
 an email. Normally \vym will generate a new paragraph for each new line.
 This usually is not what you want, so you can choose from the menu
 
-\subsection{Advanced actions}
-\subsubsection*{Edit \ra Convert subsubsections:}
-This turns subsubsections in selected text (or all text, if nothing is
-selected) into linebreaks. This is especially useful for snippets of
-source code.
-
-\subsubsection*{Edit \ra Join Lines:}
-Tries to format text, so that empty lines are used to delimit
-paragraphs. This is done for selected text (or all text, if nothing is
-selected). Especially useful for text like emails, meeting minutes etc.
-
 \section{Hello world}
 This section is about how \vym can interact with other applications.
 Many applications meanwhile can read and write their data using XML, the
@@ -658,7 +651,7 @@
 use \vym to maintain the bookmark mess? To create a new map containing
 your current KDE bookmarks just choose
 \begin{itemize}
-	\item File \ra Import\ra KDE Bookmarks
+	\item Map \ra Import\ra KDE Bookmarks
 \end{itemize}
 
 \subsubsection*{Mind Manager}
@@ -669,7 +662,7 @@
 \href{http://mindjet.de}{http://mindjet.de}} into \vym maps. Notes and
 pictures are not converted at the moment. You can import files with
 \begin{itemize}
-	\item File \ra Import\ra Mind Manager
+	\item Map \ra Import\ra Mind Manager
 \end{itemize}
 
 
@@ -701,7 +694,7 @@
 currently limited, but it possible to export presentations which can be
 opened in Open Office Impress. By selecting
 \begin{itemize}
-	\item File \ra Export\ra Open Office
+	\item Map  \ra Export\ra Open Office
 \end{itemize}
 you get a file dialogue where you can choose the output file and the
 file type:
@@ -740,7 +733,7 @@
 as experimental, there are no options (yet). 
 By selecting
 \begin{itemize}
-	\item File \ra Export\ra \LaTeX 
+	\item Map  \ra Export\ra \LaTeX 
 \end{itemize}
 you will be asked in a file dialog for the name of the output file. This
 file should be included in a \LaTeX document using command  
@@ -753,7 +746,7 @@
 running konquerors via DCOP of the changed file. \vym does not create a
 backup!
 \begin{itemize}
-	\item File \ra Export \ra KDE Bookmarks
+	\item Map \ra Export \ra KDE Bookmarks
 \end{itemize}
 
 
@@ -808,6 +801,9 @@
 
 \section{Advanced Editing}
 
+\subsection{Changing the history: Undo and Redo}
+%FIXME
+
 \subsection{How to deal with Bookmarks} \label{bookmarks}
 \subsubsection*{Open new tabs instead of new windows}
 If you use konqueror as browser, \vym will remember the konqueror which
@@ -939,6 +935,7 @@
 choose between {\em Import Add} and {\em Import Replace}: The imported
 data will be added after the selection resp. replace the selection.
 
+\label{historywindow}
 
 \section{\vym on Mac OS X}
 \subsection{Overview}
@@ -973,7 +970,22 @@
 
 \begin{appendix}
 
-\section{Starting \vym}
+\section{\vym initialization process and configuration}
+\subsection{Configuration file}
+On startup \vym will look for a configuration for user specific settings
+like window positions, toolbars etc. If this file does not already
+exist, it will be created. The file is located in the users home
+directory. The exact position depends on the platform:
+\begin{center}
+\begin{tabular}{cl}
+	{\bf Platform}	& {\bf Configuration file} \\ \hline
+	Linux		& {\tt $\sim$/.config/InSilmaril/vym.conf  } \\
+	Mac OS X	& {\tt /Users/NAME/Library/Preferences/com.insilmaril.vym.plist  } \\
+\end{tabular}
+\end{center}
+The file can be edited manually, or on Mac~OS~X with Property List
+Editor (installed with xtools).
+
 \subsection{Path to ressources}
 \vym will try to find its ressources (images, stylesheets, filters,
 etc.) in the following places: