Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental

diff --git a/AUTHORS b/AUTHORS
index d7269b8..d66525c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,7 @@ Contributors:
     (dequis) - Uzbl.run, birectional socket, javascript commands
     Brendan Taylor (bct) - various bugfixes
     Chris van Dijk (quigybo) - work on uzbl_tabbed.py
+    Moritz Lenz - small doc fix
 
 Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
 Which is  copyrighted:

diff --git a/docs/FAQ b/docs/FAQ
index 6126248..1ecce41 100644 (file)
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -35,7 +35,7 @@ be handled outside of uzbl by a separate/different program.  Here are some solut
 
  * Many window managers can (and should) handle this by default.  Xmonads tabbed layout, Wmii's stacked layout and so on.
  * Uzbl supports acting as a GtkPlug to plug into GtkSockets (Xembed) so you can embed uzbl instances in other Gtk applications.
-   This allows several implementatinos, a popular one is [uzbl_tabbed.py](http://www.uzbl.org/wiki/uzbl_tabbed) (TODO: include with sample scripts)
+   This allows several implementatinos, a popular one is [uzbl_tabbed.py](http://www.uzbl.org/wiki/uzbl_tabbed)
  * If you want highest customizablity, you need the 3rd option:
    You can also write a custom script.  The only thing you need to do is focus/maximize the instance you want,
    keep the others out of sight and use tools like dmenu and wmctrl to switch instances.

diff --git a/docs/INSTALL b/docs/INSTALL
index 43e139c..be6e85b 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -13,7 +13,7 @@ From source
 You can pull the code from git or get a tagged tarball.
 
        $ git clone git://github.com/Dieterbe/uzbl.git
-       [ $ git checkout master/experimental ] # optional. see below
+       [ $ git checkout origin/experimental ] # optional. see below
        $ cd uzbl
        $ make
        $ sudo make install

diff --git a/docs/TODO b/docs/TODO
index 7f2d514..9d0a428 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -12,7 +12,7 @@ More or less in order of importance/urgency
 * scrolling: make page up and page down configurable.
 * show % of location in statusbar/title if page doesn't fit entirely on view.
 * conditionals in format strings: eg if(SELECTED_URI) { "-> SELECTED_URI" } or another smart way to achieve the same.
-* make default window size configurable, and optional
+* make default window size configurable, and optional if this is not too much work
 * on uzbl.org commits overview: add date+time and repository
 * how to handle different content types? (text-plain, image/png, application/pdf,... maybe a map of content-type to uzbl/command
   xdg already has a spec for this i think
@@ -40,7 +40,7 @@ More or less in order of importance/urgency
 * check for real command name, not just the first letter.
 * let users attach handlers to the most common events/signals in uzbl.
   great use case: automatically calling formfiller for certain sites
-* write little script to open new urls with the urxvt url thing +document.
+* default session path in uzbl_tabbed is not ok
 * document:
   stylesheet overridding
   formfiller
@@ -62,4 +62,3 @@ figure out how webkit intercepts key input
 make "disable insert mode" (esc key) configurable
 keywords don't work for external commands. is this a problem?
 * pass a bit less arguments by default, use the socket to query for them instead, or export the stuff through environment variables, or export them as xorg window properties
-* write a config "generator" that iterates over the Uzbl uzbl and generates the commands needed to become in that state.
\ No newline at end of file