diff options
| author |  Premysl 'Anydot' Hruby <dfenze@gmail.com> | 2009-05-03 17:01:55 +0200 |
|---|---|---|
| committer | Premysl 'Anydot' Hruby <dfenze@gmail.com> | 2009-05-03 17:01:55 +0200 |
| commit | 3c514877b58965db015cae4db528b7bce2e9b7af (patch) | |
| tree | 115af5798cbba704d2c7478de6f6bfe397751be0 /examples | |
| parent | f8c04abadc90d0b6f47b44054bafeb5dac367876 (diff) | |
| parent | 77de3b67d918375d49e1315985503aef1b1ebef7 (diff) | |
Merge commit 'dieterb/experimental'
Conflicts:
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/configs/sampleconfig | 17 | ||||
| -rw-r--r-- | examples/configs/sampleconfig-dev | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index 3fddc89..6496dbd 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -22,33 +22,36 @@ status_top = 0 [bindings] # scroll down/up/left/right -j = scroll_vert 20 -k = scroll_vert -20 -h = scroll_horz -20 -l = scroll_horz 20 +j = scroll_vert 20 +k = scroll_vert -20 +h = scroll_horz -20 +l = scroll_horz 20 b = back m = forward s = stop r = reload R = reload_ign_cache -gh = uri http://www.uzbl.org f = follow_link_here F = follow_link_new_tab w = follow_link_new_window + = zoom_in - = zoom_out t = toggle_status -ZZ = exit +gh = uri http://www.uzbl.org +o _ = uri %s +:wiki _ = uri http://wiki.archlinux.org/index.php/Special:Search?search=%s&go=Go +gg _ = uri http://www.google.com/search?q=%s i = insert_mode B = spawn /usr/share/uzbl/examples/scripts/insert_bookmark.sh u = spawn /usr/share/uzbl/examples/scripts/load_url_from_history.sh U = spawn /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh +ZZ = exit [network] proxy_server = #values 0-3 -http_debug = 1 +http_debug = 0 user-agent = uzbl max_conns = max_conns_per_host = diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev index b151e92..967d9e5 100644 --- a/examples/configs/sampleconfig-dev +++ b/examples/configs/sampleconfig-dev @@ -21,7 +21,7 @@ show_status = 1 status_top = 0 [bindings] -## scroll down/up/left/right +# scroll down/up/left/right j = scroll_vert 20 k = scroll_vert -20 h = scroll_horz -20 @@ -31,22 +31,21 @@ m = forward s = stop r = reload R = reload_ign_cache -gh = uri http://www.uzbl.org f = follow_link_here F = follow_link_new_tab w = follow_link_new_window + = zoom_in - = zoom_out t = toggle_status -ZZ = exit +gh = uri http://www.uzbl.org +o _ = uri %s +:wiki _ = uri http://wiki.archlinux.org/index.php/Special:Search?search=%s&go=Go +gg _ = uri http://www.google.com/search?q=%s i = insert_mode B = spawn ./examples/scripts/insert_bookmark.sh u = spawn ./examples/scripts/load_url_from_history.sh U = spawn ./examples/scripts/load_url_from_bookmarks.sh -#parameter command examples (all need space but can be removed from individual commands). underscore is important. -o _ = uri %s -:wiki _ = uri http://wiki.archlinux.org/index.php/Special:Search?search=%s&go=Go -gg _ = uri http://www.google.com/search?q=%s +ZZ = exit [network] # to start a local socks server, do : ssh -fND localhost:8118 localhost |