[master] 4805cac Clean up some formatting leading to error messages in rst2man that made it into the man pages

Lasse Karstensen lkarsten at varnish-cache.org
Thu Nov 10 11:16:08 CET 2011


commit 4805cacd6166d8b7f57d61aa016ab61d0556b1ee
Author: Lasse Karstensen <lasse at varnish-software.com>
Date:   Thu Nov 10 11:00:45 2011 +0100

    Clean up some formatting leading to error messages in rst2man that made it into the man pages
    
    Conflicts:
    
    	bin/varnishd/mgt/mgt_param.c

diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index e2eb16b..44f3b9b 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -711,6 +711,7 @@ static const struct parspec input_parspec[] = {
 		"  0x00000002 - Ignore non-esi elements\n"
 		"  0x00000004 - Emit parsing debug records\n"
 		"  0x00000008 - Force-split parser input (debugging)\n"
+		"\n"
 		"Use 0x notation and do the bitor in your head :-)\n",
 		0,
 		"0", "bitmap" },
@@ -843,6 +844,7 @@ static const struct parspec input_parspec[] = {
 		"  0x00040000 - release VCL early.\n"
 		"  0x00080000 - ban-lurker debugging.\n"
 		"  0x80000000 - do edge-detection on digest.\n"
+		"\n"
 		"Use 0x notation and do the bitor in your head :-)\n",
 		0,
 		"0", "bitmap" },
@@ -880,7 +882,7 @@ static const struct parspec input_parspec[] = {
 		"uncompress compressed objects on demand. Varnish will also "
 		"rewrite the Accept-Encoding header of clients indicating "
 		"support for gzip to:\n"
-		"Accept-Encoding: gzip\n\n"
+		"  Accept-Encoding: gzip\n\n"
 		"Clients that do not support gzip will have their "
 		"Accept-Encoding header removed. For more information on how "
 		"gzip is implemented please see the chapter on gzip in the "
@@ -891,6 +893,7 @@ static const struct parspec input_parspec[] = {
 		"Where temporary space for gzip/gunzip is allocated:\n"
 		"  0 - malloc\n"
 		"  2 - thread workspace\n"
+		"\n"
 		"If you have much gzip/gunzip activity, it may be an"
 		" advantage to use workspace for these allocations to reduce"
 		" malloc activity.  Be aware that gzip needs 256+KB and gunzip"
@@ -1186,6 +1189,7 @@ MCF_DumpRst(void)
 	const char *p, *q;
 	int i;
 
+	printf("\n.. The following is the autogenerated output from varnishd -x dumprst\n\n");
 	for (i = 0; i < nparspec; i++) {
 		pp = parspec[i];
 		printf("%s\n", pp->name);



More information about the varnish-commit mailing list