Merge branch 'lh/embedded'

diff --git a/cgit.c b/cgit.c
index 36777b5de4ba10c7823152384e12c611020fcd8c..66dd1402c23185154f67f55e41506e16a3152682 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -233,7 +233,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.cache_root_ttl = 5;
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
-       ctx->cfg.logo = "/git-logo.png";
+       ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
        ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;

diff --git a/cgit.css b/cgit.css
index adfc8ae0e32386e929f8d9c11d8477442d058ec1..e3b32e75c0d8a4c14aed2dbc8ee80c75bd1d9209 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -155,7 +155,7 @@ table.list td.logsubject {
 table.list td.logmsg {
        font-family: monospace;
        white-space: pre;
-       padding: 1em 0em 2em 0em;
+       padding: 1em 0.5em 2em 0.5em;
 }
 
 table.list td a {

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4d656fee5323fb35f0846ec086d7dfbd016d21c3..3c35b02ad5b6eb8983e3144a8796db6591e2b50a 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -14,6 +14,13 @@ repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank
 lines, and lines starting with '#', are ignored.
 
 
+LOCATION
+--------
+The default location of cgitrc, defined at compile time, is /etc/cgitrc. At
+runtime, cgit will consult the environment variable CGIT_CONFIG and, if
+defined, use its value instead.
+
+
 GLOBAL SETTINGS
 ---------------
 about-filter::
@@ -132,7 +139,7 @@ local-time::
 
 logo::
        Url which specifies the source of an image which will be used as a logo
-       on all cgit pages.
+       on all cgit pages. Default value: "/cgit.png".
 
 logo-link::
        Url loaded when clicking on the cgit logo image. If unspecified the