aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorGravatar Dieter Plaetinck <dieter@plaetinck.be>2009-07-15 22:12:10 +0200
committerGravatar Dieter Plaetinck <dieter@plaetinck.be>2009-07-15 22:12:10 +0200
commitf8cffd77d5cd734389fb11966c9eb90315e8c8ed (patch)
treeca6db3e2d625eeebd58a5fce09033998c5d55ffe /docs
parent42c87fb308831265bc7571bed23c47015ac9c29e (diff)
parent23edd78c1d0f1f370bdaa837aad2d77fec2625bf (diff)
Merge commit 'holizz/whitespace' into experimental
Diffstat (limited to 'docs')
-rw-r--r--docs/CONTRIBUTING3
-rw-r--r--docs/INSTALL4
-rw-r--r--docs/TODO2
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING
index f5d7ebc..c26e49a 100644
--- a/docs/CONTRIBUTING
+++ b/docs/CONTRIBUTING
@@ -66,6 +66,9 @@ This is a relatively easy, solid and transparent way to handle all requests in o
we know for bigger changes this is not always feasible. Just try to keep the merges about bigger "clean changesets".
* Your code should not introduce any compile warnings or errors. And also,
no regressions but that's harder to check.
+* Please try to keep the code clean - we don't like extraneous whitespace.
+ The sample pre-commit hook can check for this - so go ahead and
+ $ cp .git/hooks/pre-commit.sample .git/hooks/pre-commit
That said, you can always ask us to check on your stuff or ask for advice.
diff --git a/docs/INSTALL b/docs/INSTALL
index be6e85b..9213cc3 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -40,7 +40,7 @@ sample scripts:
* dmenu (with vertical patch)
* zenity
-* bash
+* bash
* python (cookies.py)
* perl (formfiller.pl)
@@ -50,7 +50,7 @@ After installing - using either method - you will find:
* /usr/bin : uzbl [and uzblctrl]
* /usr/share/uzbl/docs/ : documentation files included with uzbl. (readme, checklist, .. )
-* /usr/share/uzbl/examples: sample scripts, config files and a sample data (boomarks, .. )
+* /usr/share/uzbl/examples: sample scripts, config files and a sample data (boomarks, .. )
You will probably want to change the scripts to behave more like you want, so copy the scripts to your home dir. If you save your config as
$XDG\_CONFIG\_HOME/uzbl/config (this expands to ~/.config/uzbl/config on most systems) it will be recognized automatically. You can also pass the path to
diff --git a/docs/TODO b/docs/TODO
index 00166eb..80ccb9c 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -53,7 +53,7 @@ More or less in order of importance/urgency
overriding variables (such as -u)
variable expansion (@var, @{var}, where do they get expanded? can users have their own vars?, should we merge this with the replacement we do for useragent/window title etc?)
how %s works for the js command
-
+
SOMEDAY:
figure out caching with webkit and in general how we can speed up everything