Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c

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
@@ -59,6 +59,11 @@ css::
         Url which specifies the css document to include in all cgit pages.
         Default value: "/cgit.css".
 
+embedded::
+        Flag which, when set to "1", will make cgit generate a html fragment
+        suitable for embedding in other html pages. Default value: none. See
+        also: "noheader".
+        
 enable-index-links::
         Flag which, when set to "1", will make cgit generate extra links for
         each repo in the repository index (specifically, to the "summary",
@@ -153,6 +158,10 @@ nocache::
         deprecated, and will not be honored starting with cgit-1.0. Default
         value: "0".
 
+noheader::
+        Flag which, when set to "1", will make cgit omit the standard header
+        on all pages. Default value: none. See also: "embedded".
+
 renamelimit::
         Maximum number of files to consider when detecting renames. The value
          "-1" uses the compiletime value in git (for further info, look at