From 150ca90517aca473f487198918ea226866b41a22 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 8 Jun 2015 18:54:07 +0200 Subject: [PATCH] Regenerate docs --- README.asciidoc | 1 + doc/help/settings.asciidoc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index 4ff63f5a7..547d940e7 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -138,6 +138,7 @@ Contributors, sorted by the number of commits in descending order: * Raphael Pierzina * Joel Torstensson * Claude +* Lamar Pavel * Martin Tournoij * Artur Shaik * Antoni Boucher diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index af2453378..97bd781d0 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -38,7 +38,7 @@ |<>|Whether to display javascript statusbar messages. |<>|Whether the zoom factor on a frame applies only to the text or to all content. |<>|Whether to expand each subframe to its contents. -|<>|User stylesheet to use (absolute filename or CSS string). Will expand environment variables. +|<>|User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables. |<>|Set the CSS media type. |<>|Whether to enable smooth scrolling for webpages. |<>|Whether to remove finished downloads automatically. @@ -530,7 +530,7 @@ Default: +pass:[false]+ [[ui-user-stylesheet]] === user-stylesheet -User stylesheet to use (absolute filename or CSS string). Will expand environment variables. +User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables. Default: +pass:[::-webkit-scrollbar { width: 0px; height: 0px; }]+