# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1302822807 -7200
# Node ID 46c4cc2696fc42e4230eee6f87a59a01eeadf383
# Parent  db6bb81f702faf4e1286609b6c7a70943de1c288
Up doc for new bookmarks support ans small ui ajustment (vbox border)

diff -r db6bb81f702f -r 46c4cc2696fc Makefile
--- a/Makefile	Fri Apr 15 00:22:20 2011 +0200
+++ b/Makefile	Fri Apr 15 01:13:27 2011 +0200
@@ -20,13 +20,15 @@
 		$(DESTDIR)$(PREFIX)/share/pixmaps \
 		$(DESTDIR)$(PREFIX)/share/applications
 	install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin
-	cp -a doc/*.html $(DESTDIR)$(DOCDIR)/$(PACKAGE)
+	cp -d doc/*.html $(DESTDIR)$(DOCDIR)/$(PACKAGE)
 	install -m 0644 data/tazweb-icon.png \
 		$(DESTDIR)$(PREFIX)/share/pixmaps/tazweb.png
 	install -m 0644 data/tazweb.desktop \
 		$(DESTDIR)$(PREFIX)/share/applications
 	install -m 0644 data/bookmarks.html \
 		$(DESTDIR)$(PREFIX)/share/tazweb
+	install -m 0644 data/bookmarks.html \
+		$(DESTDIR)$(PREFIX)/share/tazweb
 
 clean:
 	rm -f $(PACKAGE)
diff -r db6bb81f702f -r 46c4cc2696fc doc/tazweb.en.html
--- a/doc/tazweb.en.html	Fri Apr 15 00:22:20 2011 +0200
+++ b/doc/tazweb.en.html	Fri Apr 15 01:13:27 2011 +0200
@@ -29,14 +29,15 @@
 	TazWeb is radically simple and very light web browser providing a
 	single window with a small toolbar, but without any menubar or tabs. 
 	Navigation is done with a right click anywhere in the browser window 
-	or from the toolbar. Also a fullscreen mode and this documentation file 
-	are accessible from the right-hand side of the toolbar.
+	or from the toolbar. Also a fullscreen mode, bookmarks, home page
+	and this documentation file are accessible from the right-hand side
+	of the toolbar.
 </p>
 <p>
 	SliTaz Web Browser was created for the needs of TazPanel which is
 	the SliTaz administration and packages manager panel and made with 
-	the latest technologies such as xHTML 5 and CSS 3 for the graphical user
-	interface. The content is powered by CGI scripts and the prefered
+	the latest technologies such as xHTML 5 and CSS 3 for the graphical
+	user interface. The content is powered by CGI scripts and the prefered
 	web server is Busybox httpd.
 </p>
 <p>
@@ -45,6 +46,24 @@
 	all latest web standards as well as Javascript.
 </p>
 
+<h3>Bookmarks</h3>
+<p>
+	TazWeb can handle a bookmarks file located in your Freedesktop standard
+	configuration directory, the path is: $HOME/.config/tazweb/bookmarks.html
+</p>
+<p>
+	The file is a simple xHTML 5 document with, by default, a list of links.
+	You can edit this file with you favorite editor and add bookmarks entries
+	or change the look and feel as you want. You will find the default
+	bookmarks.html in: /usr/share/tazweb. You can get an original copy
+	with the following commands in a terminal:
+</p>
+<pre>
+$ mkdir -p $HOME/.config/tazweb
+$ cp /usr/share/tazweb/bookmarks.html $HOME/.config/tazweb
+</pre>
+
+
 <h3>Home page and url in argument</h3>
 
 <p>
@@ -53,7 +72,7 @@
 	URL as a first argument, example: http://www.slitaz.org/. In this way
 	you can for example create your own and custom home page in a pretty
 	xHTML document and start tazweb with a standard desktop file or from
-	the command line: tazweb file://$HOME/file.html
+	the command line: tazweb file://$HOME/.config/tazweb/home.html
 </p>
 <p>
 	If you want a custom home page for your Live system or all system users,
@@ -68,7 +87,8 @@
 	TazWeb browser is perfect to launch web applications via a simple
 	desktop file. Once created with a simple text editor, the desktop
 	file can stand on the desktop with a nice icon or in the standard
-	SliTaz menu. Example of a web application launcher:
+	SliTaz menu. Example of a web application launcher that you could
+	name scn.desktop:
 </p>
 <pre>
 [Desktop Entry]
diff -r db6bb81f702f -r 46c4cc2696fc src/main.c
--- a/src/main.c	Fri Apr 15 00:22:20 2011 +0200
+++ b/src/main.c	Fri Apr 15 01:13:27 2011 +0200
@@ -237,7 +237,7 @@
     if (!g_thread_supported ())
         g_thread_init (NULL);
 
-    GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
+    GtkWidget* vbox = gtk_vbox_new (FALSE, 2);
     gtk_box_pack_start (GTK_BOX (vbox), create_browser (), TRUE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (vbox), create_toolbar (), FALSE, FALSE, 0);