cleaning up / refactoring some things after the merge from Barrucadu. I probably did something wrong earlier

4 files changed, 10 insertions, 29 deletions

diff --git a/README b/README
index c15cc45..e58962d 100644
--- a/README
+++ b/README
@@ -63,10 +63,17 @@ CONTROL:
 - Press ESC to toggle the command entry.
 - Press enter after typing a command to use it.
 
-NOTE:
+NOTES:
 - My c skills are very rusty, it will take me a while to get back up to speed
 - For more thoughts & ideas see http://bbs.archlinux.org/viewtopic.php?id=67463
-- I push the code most times I save any changes, regardless of whether it actually compiles or not. Thus, the code here should be regarded as highly experimental.
+
+REPO's:
+- http://github.com/Dieterbe/uzbl
+  master -> uzbl stable branch
+  experimental -> bleeding edge stuff that may break. after QA codes gets merged into master
+- various contributors also have their clones on github (http://github.com/dusanx, http://github.com/Barrucadu/uzbl, ...).
+  They may be developing specific features, which get merged into Dieters experimental branch
+
 
 KNOWN BUGS
 - Segfault occurs on shutdown, almost definitely FIFO related (I'm not seeing this bug now, but the warning was here when I forked the code and I haven't touched the FIFO bit)
diff --git a/TODO b/TODO
index 8380d4f..2f5bef8 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 * implement all the ideas from README
-* Support for arguments to commands (argc/argv-like structure?).
 * Support for binding keyboard shortcuts in config file.
 * where to put proxy config? webkit support?
 * do not store the 'http://' part in the history file
@@ -8,5 +7,5 @@
 * history logging broken. logs always starting url because i made uri const
 
 SOMEDAY:
-figure out caching with webkit and in general how we can speed everything
+figure out caching with webkit and in general how we can speed up everything
 figure out how webkit intercepts key input
diff --git a/config b/config
deleted file mode 100644
index fca8d83..0000000
--- a/config
+++ /dev/null
@@ -1,17 +0,0 @@
-# example uzbl config. in a real config, we should obey the xdg spec
-[behavior]
-history_file     = /tmp/uzbl.history
-
-[alias]
-b  = back
-f  = forward
-z+ = zoom in
-z- = zoom out
-r  = refresh
-s  = stop
-
-[bindings_internal]
-
-[bindings_external]
-
-[network]
diff --git a/sampleconfig b/sampleconfig
index 0c4f521..3a4bae1 100644
--- a/sampleconfig
+++ b/sampleconfig
@@ -36,12 +36,4 @@ zoom_out = -
 ./extra/load_url_from_history.sh = u
 ./extra/load_url_from_bookmarks.sh = U
 
-[alias]
-b  = back
-f  = forward
-z+ = zoom in
-z- = zoom out
-r  = refresh
-s  = stop
-
 [network]