Merge branch 'MazeChaZer-feature/duckduckgo.com'

This commit is contained in:
Florian Bruhin 2015-10-27 20:53:42 +01:00
commit 11098b8b82
3 changed files with 3 additions and 3 deletions

View File

@ -158,6 +158,7 @@ Contributors, sorted by the number of commits in descending order:
* rikn00 * rikn00
* Patric Schmitz * Patric Schmitz
* Martin Zimmermann * Martin Zimmermann
* Jonas Schürmann
* Error 800 * Error 800
* Brian Jackson * Brian Jackson
* sbinix * sbinix
@ -165,7 +166,6 @@ Contributors, sorted by the number of commits in descending order:
* jnphilipp * jnphilipp
* Tobias Patzl * Tobias Patzl
* Peter Michely * Peter Michely
* Jonas Schürmann
* Johannes Altmanninger * Johannes Altmanninger
* Samir Benmendil * Samir Benmendil
* Regina Hug * Regina Hug

View File

@ -304,7 +304,7 @@ Default: +pass:[true]+
=== startpage === startpage
The default page(s) to open at the start, separated by commas. The default page(s) to open at the start, separated by commas.
Default: +pass:[https://www.duckduckgo.com]+ Default: +pass:[https://duckduckgo.com]+
[[general-default-page]] [[general-default-page]]
=== default-page === default-page

View File

@ -140,7 +140,7 @@ def data(readonly=False):
"end."), "end."),
('startpage', ('startpage',
SettingValue(typ.List(), 'https://www.duckduckgo.com'), SettingValue(typ.List(), 'https://duckduckgo.com'),
"The default page(s) to open at the start, separated by commas."), "The default page(s) to open at the start, separated by commas."),
('default-page', ('default-page',