aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Dieter Plaetinck <dieter@plaetinck.be>2010-03-23 11:25:32 +0100
committerGravatar Dieter Plaetinck <dieter@plaetinck.be>2010-03-23 11:25:32 +0100
commitf2d2f51ef5d6792cb85d6373326a05f2f591864d (patch)
tree8e2e46003cc492b4048abb42608e26efdb36b3b8
parentfa98cf0c01dd78c541162e3b176371f9d716a580 (diff)
parent1f187e35d52aa6848aaea9d7867379e3d21d3e40 (diff)
Merge branch 'master' into experimental
-rw-r--r--AUTHORS1
-rw-r--r--Makefile10
-rw-r--r--README16
-rw-r--r--examples/data/dforms/bbs.archlinux.org3
-rw-r--r--examples/data/forms/bbs.archlinux.org5
5 files changed, 17 insertions, 18 deletions
diff --git a/AUTHORS b/AUTHORS
index 19bdf4b..80e69e5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,6 +34,7 @@ In alphabetical order:
David Keijser - various C and python patches.
Devon Jones <devon.jones@gmail.com> - uzbl_tabbed: bring_to_front
Dieter Plaetinck (Dieter@be) <dieter AT plaetinck.be> - several contributions
+ Dmytro Milinevskyy - uzbl-tabbed useability patches
Dusan Popovic (dusanx) - many contributions to early uzbl
Evgeny Grablyk - libsoup settings
Helmut Grohne (helmut) - move void **ptr to union, various fixes
diff --git a/Makefile b/Makefile
index 7a1fa36..5c97e4d 100644
--- a/Makefile
+++ b/Makefile
@@ -111,11 +111,11 @@ install-uzbl-tabbed:
# you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors
install-example-data:
- install -d $(INSTALLDIR)/home/.config/uzbl
- install -d $(INSTALLDIR)/home/.cache/uzbl
- install -d $(INSTALLDIR)/home/.local/share/uzbl
- cp -rp examples/config/* $(INSTALLDIR)/home/.config/uzbl/
- cp -rp examples/data/* $(INSTALLDIR)/home/.local/share/uzbl/
+ install -d $(DESTDIR)/home/.config/uzbl
+ install -d $(DESTDIR)/home/.cache/uzbl
+ install -d $(DESTDIR)/home/.local/share/uzbl
+ cp -rp examples/config/* $(DESTDIR)/home/.config/uzbl/
+ cp -rp examples/data/* $(DESTDIR)/home/.local/share/uzbl/
uninstall:
rm -rf $(INSTALLDIR)/bin/uzbl-*
diff --git a/README b/README
index e26673c..4d81e65 100644
--- a/README
+++ b/README
@@ -523,16 +523,16 @@ The script specific arguments are:
Custom, userdefined scripts (`spawn foo bar`) get first the arguments as
specified in the config and then the above 7 are added at the end.
-### eFormFiller
+### Formfiller.sh
-Example config entries for eFormFiller scripts
+Example config entries for formfiller script
- set eFormFiller = spawn @scripts_dir/eFormFiller.sh
- @cbind za = @eFormFiller add
- @cbind ze = @eFormFiller edit
- @cbind zn = @eFormFiller new
- @cbind zl = @eFormFiller load
- @cbind zo = @eFormFiller once
+ set formfiller = spawn @scripts_dir/formfiller.sh
+ @cbind za = @formfiller add
+ @cbind ze = @formfiller edit
+ @cbind zn = @formfiller new
+ @cbind zl = @formfiller load
+ @cbind zo = @formfiller once
NEW action generates new file with formfields for current domain. Note that it
will overwrite existing file.
diff --git a/examples/data/dforms/bbs.archlinux.org b/examples/data/dforms/bbs.archlinux.org
new file mode 100644
index 0000000..2c49fcb
--- /dev/null
+++ b/examples/data/dforms/bbs.archlinux.org
@@ -0,0 +1,3 @@
+!profile=Arch BBS Login
+req_username(text): yournamehere
+req_password(password): yourpasshere
diff --git a/examples/data/forms/bbs.archlinux.org b/examples/data/forms/bbs.archlinux.org
deleted file mode 100644
index 73c1539..0000000
--- a/examples/data/forms/bbs.archlinux.org
+++ /dev/null
@@ -1,5 +0,0 @@
-form_sent:
-redirect_url:
-req_username: <your username>
-req_password: <password>
-login: