Fossil SCM

Update json configuration options and wiki with reality

jan.nijtmans 2015-02-04 15:47 trunk
Commit 5098f747a95a421d587f1ff04ed332e1b184b9a1
Parent c799881474dde5e…
3 files changed +3 -3 +7 -2 +23 -6
~ src/configure.c ~ src/json_config.c ~ www/sync.wiki
M src/configure.c
+3 -3
--- src/configure.c
+++ src/configure.c
@@ -114,15 +114,15 @@
114114
 #endif
115115
116116
 { "project-name", CONFIGSET_PROJ },
117117
 { "short-project-name", CONFIGSET_PROJ },
118118
 { "project-description", CONFIGSET_PROJ },
119
+ { "index-page", CONFIGSET_PROJ },
119120
 { "manifest", CONFIGSET_PROJ },
120121
 { "binary-glob", CONFIGSET_PROJ },
121122
 { "clean-glob", CONFIGSET_PROJ },
122123
 { "ignore-glob", CONFIGSET_PROJ },
123
- { "index-page", CONFIGSET_PROJ },
124124
 { "keep-glob", CONFIGSET_PROJ },
125125
 { "crnl-glob", CONFIGSET_PROJ },
126126
 { "encoding-glob", CONFIGSET_PROJ },
127127
 { "empty-dirs", CONFIGSET_PROJ },
128128
 { "allow-symlinks", CONFIGSET_PROJ },
@@ -1061,11 +1061,11 @@
10611061
 zTrans[j++] = 'n';
10621062
 }else if( c=='\r' ){
10631063
 zTrans[j++] = 'r';
10641064
 }else if( c=='\t' ){
10651065
 zTrans[j++] = 't';
1066
- }else{
1066
+ }else{
10671067
 zTrans[j++] = '0' + ((c>>6)&7);
10681068
 zTrans[j++] = '0' + ((c>>3)&7);
10691069
 zTrans[j++] = '0' + (c&7);
10701070
 }
10711071
 }
@@ -1098,11 +1098,11 @@
10981098
 /*
10991099
 ** COMMAND: test-var-get
11001100
 **
11011101
 ** Usage: %fossil test-var-get VAR ?FILE?
11021102
 **
1103
-** Write the text of the VAR variable into FILE. If FILE is "-"
1103
+** Write the text of the VAR variable into FILE. If FILE is "-"
11041104
 ** or is omitted then output goes to standard output. VAR can be a
11051105
 ** GLOB pattern.
11061106
 **
11071107
 ** If not in an open check-out, use the -R REPO option to specify a
11081108
 ** a repository.
11091109
--- src/configure.c
+++ src/configure.c
@@ -114,15 +114,15 @@
114 #endif
115
116 { "project-name", CONFIGSET_PROJ },
117 { "short-project-name", CONFIGSET_PROJ },
118 { "project-description", CONFIGSET_PROJ },
 
119 { "manifest", CONFIGSET_PROJ },
120 { "binary-glob", CONFIGSET_PROJ },
121 { "clean-glob", CONFIGSET_PROJ },
122 { "ignore-glob", CONFIGSET_PROJ },
123 { "index-page", CONFIGSET_PROJ },
124 { "keep-glob", CONFIGSET_PROJ },
125 { "crnl-glob", CONFIGSET_PROJ },
126 { "encoding-glob", CONFIGSET_PROJ },
127 { "empty-dirs", CONFIGSET_PROJ },
128 { "allow-symlinks", CONFIGSET_PROJ },
@@ -1061,11 +1061,11 @@
1061 zTrans[j++] = 'n';
1062 }else if( c=='\r' ){
1063 zTrans[j++] = 'r';
1064 }else if( c=='\t' ){
1065 zTrans[j++] = 't';
1066 }else{
1067 zTrans[j++] = '0' + ((c>>6)&7);
1068 zTrans[j++] = '0' + ((c>>3)&7);
1069 zTrans[j++] = '0' + (c&7);
1070 }
1071 }
@@ -1098,11 +1098,11 @@
1098 /*
1099 ** COMMAND: test-var-get
1100 **
1101 ** Usage: %fossil test-var-get VAR ?FILE?
1102 **
1103 ** Write the text of the VAR variable into FILE. If FILE is "-"
1104 ** or is omitted then output goes to standard output. VAR can be a
1105 ** GLOB pattern.
1106 **
1107 ** If not in an open check-out, use the -R REPO option to specify a
1108 ** a repository.
1109
--- src/configure.c
+++ src/configure.c
@@ -114,15 +114,15 @@
114 #endif
115
116 { "project-name", CONFIGSET_PROJ },
117 { "short-project-name", CONFIGSET_PROJ },
118 { "project-description", CONFIGSET_PROJ },
119 { "index-page", CONFIGSET_PROJ },
120 { "manifest", CONFIGSET_PROJ },
121 { "binary-glob", CONFIGSET_PROJ },
122 { "clean-glob", CONFIGSET_PROJ },
123 { "ignore-glob", CONFIGSET_PROJ },
 
124 { "keep-glob", CONFIGSET_PROJ },
125 { "crnl-glob", CONFIGSET_PROJ },
126 { "encoding-glob", CONFIGSET_PROJ },
127 { "empty-dirs", CONFIGSET_PROJ },
128 { "allow-symlinks", CONFIGSET_PROJ },
@@ -1061,11 +1061,11 @@
1061 zTrans[j++] = 'n';
1062 }else if( c=='\r' ){
1063 zTrans[j++] = 'r';
1064 }else if( c=='\t' ){
1065 zTrans[j++] = 't';
1066 }else{
1067 zTrans[j++] = '0' + ((c>>6)&7);
1068 zTrans[j++] = '0' + ((c>>3)&7);
1069 zTrans[j++] = '0' + (c&7);
1070 }
1071 }
@@ -1098,11 +1098,11 @@
1098 /*
1099 ** COMMAND: test-var-get
1100 **
1101 ** Usage: %fossil test-var-get VAR ?FILE?
1102 **
1103 ** Write the text of the VAR variable into FILE. If FILE is "-"
1104 ** or is omitted then output goes to standard output. VAR can be a
1105 ** GLOB pattern.
1106 **
1107 ** If not in an open check-out, use the -R REPO option to specify a
1108 ** a repository.
1109
M src/json_config.c
+7 -2
--- src/json_config.c
+++ src/json_config.c
@@ -60,24 +60,29 @@
6060
 { "footer", CONFIGSET_SKIN },
6161
 { "logo-mimetype", CONFIGSET_SKIN },
6262
 { "logo-image", CONFIGSET_SKIN },
6363
 { "background-mimetype", CONFIGSET_SKIN },
6464
 { "background-image", CONFIGSET_SKIN },
65
-{ "index-page", CONFIGSET_SKIN },
6665
 { "timeline-block-markup", CONFIGSET_SKIN },
6766
 { "timeline-max-comment", CONFIGSET_SKIN },
6867
 { "timeline-plaintext", CONFIGSET_SKIN },
68
+{ "adunit", CONFIGSET_SKIN },
69
+{ "adunit-omit-if-admin", CONFIGSET_SKIN },
70
+{ "adunit-omit-if-user", CONFIGSET_SKIN },
71
+{ "white-foreground", CONFIGSET_SKIN },
6972
7073
 { "project-name", CONFIGSET_PROJ },
74
+{ "short-project-name", CONFIGSET_PROJ },
7175
 { "project-description", CONFIGSET_PROJ },
76
+{ "index-page", CONFIGSET_PROJ },
7277
 { "manifest", CONFIGSET_PROJ },
7378
 { "binary-glob", CONFIGSET_PROJ },
7479
 { "clean-glob", CONFIGSET_PROJ },
75
-{ "encoding-glob", CONFIGSET_PROJ },
7680
 { "ignore-glob", CONFIGSET_PROJ },
7781
 { "keep-glob", CONFIGSET_PROJ },
7882
 { "crnl-glob", CONFIGSET_PROJ },
83
+{ "encoding-glob", CONFIGSET_PROJ },
7984
 { "empty-dirs", CONFIGSET_PROJ },
8085
 { "allow-symlinks", CONFIGSET_PROJ },
8186
8287
 { "ticket-table", CONFIGSET_TKT },
8388
 { "ticket-common", CONFIGSET_TKT },
8489
--- src/json_config.c
+++ src/json_config.c
@@ -60,24 +60,29 @@
60 { "footer", CONFIGSET_SKIN },
61 { "logo-mimetype", CONFIGSET_SKIN },
62 { "logo-image", CONFIGSET_SKIN },
63 { "background-mimetype", CONFIGSET_SKIN },
64 { "background-image", CONFIGSET_SKIN },
65 { "index-page", CONFIGSET_SKIN },
66 { "timeline-block-markup", CONFIGSET_SKIN },
67 { "timeline-max-comment", CONFIGSET_SKIN },
68 { "timeline-plaintext", CONFIGSET_SKIN },
 
 
 
 
69
70 { "project-name", CONFIGSET_PROJ },
 
71 { "project-description", CONFIGSET_PROJ },
 
72 { "manifest", CONFIGSET_PROJ },
73 { "binary-glob", CONFIGSET_PROJ },
74 { "clean-glob", CONFIGSET_PROJ },
75 { "encoding-glob", CONFIGSET_PROJ },
76 { "ignore-glob", CONFIGSET_PROJ },
77 { "keep-glob", CONFIGSET_PROJ },
78 { "crnl-glob", CONFIGSET_PROJ },
 
79 { "empty-dirs", CONFIGSET_PROJ },
80 { "allow-symlinks", CONFIGSET_PROJ },
81
82 { "ticket-table", CONFIGSET_TKT },
83 { "ticket-common", CONFIGSET_TKT },
84
--- src/json_config.c
+++ src/json_config.c
@@ -60,24 +60,29 @@
60 { "footer", CONFIGSET_SKIN },
61 { "logo-mimetype", CONFIGSET_SKIN },
62 { "logo-image", CONFIGSET_SKIN },
63 { "background-mimetype", CONFIGSET_SKIN },
64 { "background-image", CONFIGSET_SKIN },
 
65 { "timeline-block-markup", CONFIGSET_SKIN },
66 { "timeline-max-comment", CONFIGSET_SKIN },
67 { "timeline-plaintext", CONFIGSET_SKIN },
68 { "adunit", CONFIGSET_SKIN },
69 { "adunit-omit-if-admin", CONFIGSET_SKIN },
70 { "adunit-omit-if-user", CONFIGSET_SKIN },
71 { "white-foreground", CONFIGSET_SKIN },
72
73 { "project-name", CONFIGSET_PROJ },
74 { "short-project-name", CONFIGSET_PROJ },
75 { "project-description", CONFIGSET_PROJ },
76 { "index-page", CONFIGSET_PROJ },
77 { "manifest", CONFIGSET_PROJ },
78 { "binary-glob", CONFIGSET_PROJ },
79 { "clean-glob", CONFIGSET_PROJ },
 
80 { "ignore-glob", CONFIGSET_PROJ },
81 { "keep-glob", CONFIGSET_PROJ },
82 { "crnl-glob", CONFIGSET_PROJ },
83 { "encoding-glob", CONFIGSET_PROJ },
84 { "empty-dirs", CONFIGSET_PROJ },
85 { "allow-symlinks", CONFIGSET_PROJ },
86
87 { "ticket-table", CONFIGSET_TKT },
88 { "ticket-common", CONFIGSET_TKT },
89
M www/sync.wiki
+23 -6
--- www/sync.wiki
+++ www/sync.wiki
@@ -384,11 +384,11 @@
384384
385385
 <blockquote>
386386
 <b>reqconfig</b> <i>configuration-name</i>
387387
 </blockquote>
388388
389
-<p>As of this writing ([2010-11-12]), the configuration-name must be one of the
389
+<p>As of [/timeline?r=trunk&c=2015-01-24+00%3A17%3A55&n=20|2015-01-24], the configuration-name must be one of the
390390
 following values:
391391
392392
 <center><table border=0>
393393
 <tr><td valign="top">
394394
 <ul>
@@ -395,25 +395,42 @@
395395
 <li> css
396396
 <li> header
397397
 <li> footer
398398
 <li> logo-mimetype
399399
 <li> logo-image
400
-<li> project-name
401
-<li> project-description
402
-<li> manifest
400
+<li> background-mimetype
401
+<li> background-image
403402
 <li> index-page
404
-<ul></td><td valign="top"><ul>
405403
 <li> timeline-block-markup
406404
 <li> timeline-max-comment
407405
 <li> timeline-plaintext
406
+<ul></td><td valign="top"><ul>
407
+<li> adunit
408
+<li> adunit-omit-if-admin
409
+<li> adunit-omit-if-user
410
+<li> white-foreground
411
+<li> project-name
412
+<li> short-project-name
413
+<li> project-description
414
+<li> index-page
415
+<li> manifest
416
+<li> binary-glob
417
+<li> clean-glob
418
+<ul></td><td valign="top"><ul>
419
+<li> ignore-glob
420
+<li> keep-glob
421
+<li> crnl-glob
422
+<li> encoding-glob
423
+<li> empty-dirs
424
+<li> allow-symlinks
408425
 <li> ticket-table
409426
 <li> ticket-common
410427
 <li> ticket-change
411428
 <li> ticket-newpage
412429
 <li> ticket-viewpage
413
-<li> ticket-editpage
414430
 <ul></td><td valign="top"><ul>
431
+<li> ticket-editpage
415432
 <li> ticket-reportlist
416433
 <li> ticket-report-template
417434
 <li> ticket-key-template
418435
 <li> ticket-title-expr
419436
 <li> ticket-closed-expr
420437
--- www/sync.wiki
+++ www/sync.wiki
@@ -384,11 +384,11 @@
384
385 <blockquote>
386 <b>reqconfig</b> <i>configuration-name</i>
387 </blockquote>
388
389 <p>As of this writing ([2010-11-12]), the configuration-name must be one of the
390 following values:
391
392 <center><table border=0>
393 <tr><td valign="top">
394 <ul>
@@ -395,25 +395,42 @@
395 <li> css
396 <li> header
397 <li> footer
398 <li> logo-mimetype
399 <li> logo-image
400 <li> project-name
401 <li> project-description
402 <li> manifest
403 <li> index-page
404 <ul></td><td valign="top"><ul>
405 <li> timeline-block-markup
406 <li> timeline-max-comment
407 <li> timeline-plaintext
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
408 <li> ticket-table
409 <li> ticket-common
410 <li> ticket-change
411 <li> ticket-newpage
412 <li> ticket-viewpage
413 <li> ticket-editpage
414 <ul></td><td valign="top"><ul>
 
415 <li> ticket-reportlist
416 <li> ticket-report-template
417 <li> ticket-key-template
418 <li> ticket-title-expr
419 <li> ticket-closed-expr
420
--- www/sync.wiki
+++ www/sync.wiki
@@ -384,11 +384,11 @@
384
385 <blockquote>
386 <b>reqconfig</b> <i>configuration-name</i>
387 </blockquote>
388
389 <p>As of [/timeline?r=trunk&c=2015-01-24+00%3A17%3A55&n=20|2015-01-24], the configuration-name must be one of the
390 following values:
391
392 <center><table border=0>
393 <tr><td valign="top">
394 <ul>
@@ -395,25 +395,42 @@
395 <li> css
396 <li> header
397 <li> footer
398 <li> logo-mimetype
399 <li> logo-image
400 <li> background-mimetype
401 <li> background-image
 
402 <li> index-page
 
403 <li> timeline-block-markup
404 <li> timeline-max-comment
405 <li> timeline-plaintext
406 <ul></td><td valign="top"><ul>
407 <li> adunit
408 <li> adunit-omit-if-admin
409 <li> adunit-omit-if-user
410 <li> white-foreground
411 <li> project-name
412 <li> short-project-name
413 <li> project-description
414 <li> index-page
415 <li> manifest
416 <li> binary-glob
417 <li> clean-glob
418 <ul></td><td valign="top"><ul>
419 <li> ignore-glob
420 <li> keep-glob
421 <li> crnl-glob
422 <li> encoding-glob
423 <li> empty-dirs
424 <li> allow-symlinks
425 <li> ticket-table
426 <li> ticket-common
427 <li> ticket-change
428 <li> ticket-newpage
429 <li> ticket-viewpage
 
430 <ul></td><td valign="top"><ul>
431 <li> ticket-editpage
432 <li> ticket-reportlist
433 <li> ticket-report-template
434 <li> ticket-key-template
435 <li> ticket-title-expr
436 <li> ticket-closed-expr
437

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button