author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) (unidiff) | |
tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /cgitrc.5.txt | |
parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
-rw-r--r-- | cgitrc.5.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 683f3b5..a207fe0 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -61,2 +61,7 @@ css:: | |||
61 | 61 | ||
62 | embedded:: | ||
63 | Flag which, when set to "1", will make cgit generate a html fragment | ||
64 | suitable for embedding in other html pages. Default value: none. See | ||
65 | also: "noheader". | ||
66 | |||
62 | enable-index-links:: | 67 | enable-index-links:: |
@@ -155,2 +160,6 @@ nocache:: | |||
155 | 160 | ||
161 | noheader:: | ||
162 | Flag which, when set to "1", will make cgit omit the standard header | ||
163 | on all pages. Default value: none. See also: "embedded". | ||
164 | |||
156 | renamelimit:: | 165 | renamelimit:: |