diff options
| author | portix <portix@gmx.net> | 2012-01-16 11:29:14 +0100 |
|---|---|---|
| committer | portix <portix@gmx.net> | 2012-01-16 11:29:14 +0100 |
| commit | 2b96f17a160a525ab926b653fb4685265f42f953 (patch) | |
| tree | 3b49cb2a1c0ec30e13403e52869f139da4c95664 /util | |
| parent | bd40496902ac578c8e45786a35c1377e161ef108 (diff) | |
| parent | a326c1960e4b8e96f601fb70c7e43b578dd981db (diff) | |
| download | dwb-2b96f17a160a525ab926b653fb4685265f42f953.zip | |
Merging head 976
Diffstat (limited to 'util')
| -rw-r--r-- | util/generate_keys.awk | 2 | ||||
| -rw-r--r-- | util/settings.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/util/generate_keys.awk b/util/generate_keys.awk index b1701bb7..3c07d8dc 100644 --- a/util/generate_keys.awk +++ b/util/generate_keys.awk @@ -17,7 +17,7 @@ NF > 0 { END { print "<tr class='dwb_table_row'><th class='dwb_table_headline' colspan='3'>Custom commands</th></tr>" print "<td colspan='3'><div class='desc'>Custom commands can be defined in the following form:" - print "</div><div class='commandLineContainer'><div class='commandline'>[shortcut]:[command];[command];...</div></div>" + print "</div><div class='commandLineContainer'><div class='commandline'>[shortcut]:[command];;[command];...</div></div>" print "</td></tr>" print "<tr class='dwb_table_row'><td colspan='3'><textarea rows='10' id='dwb_custom_keys_area'></textarea><td></tr>" print "<tr class='dwb_table_row'>" diff --git a/util/settings.in b/util/settings.in index 8fe37f94..a464ea74 100644 --- a/util/settings.in +++ b/util/settings.in @@ -116,6 +116,7 @@ cache-model select @webbrowser @documentviewer The cache-model used by webkit custom-encoding text The custom encoding of the view download-external-command text External application used for downloads download-directory text Default download directory +download-no-confirm checkbox Whether to immediately start a download if download-directory is set download-use-external-program checkbox Whether to use an external download helper editor text External editor used for inputs/textareas editable checkbox Whether content can be modified |