Fossil SCM

Fix double "However" in comment. Some more end-of-line spacing. Nothing functional.

jan.nijtmans 2017-09-26 14:46 trunk
Commit ce1bc4fb09fbeed6476632d4ce36b735cce2a0b415478da3bc3f9fac4573f0b7
+3 -3
--- src/db.c
+++ src/db.c
@@ -2763,11 +2763,11 @@
27632763
};
27642764
#endif /* INTERFACE */
27652765
27662766
/*
27672767
** SETTING: access-log boolean default=off
2768
-**
2768
+**
27692769
** When the access-log setting is enabled, all login attempts (successful
27702770
** and unsuccessful) on the web interface are recorded in the "access" table
27712771
** of the repository.
27722772
*/
27732773
/*
@@ -2934,11 +2934,11 @@
29342934
*/
29352935
/*
29362936
** SETTING: gmerge-command width=40
29372937
** The value is a graphical merge conflict resolver command operating
29382938
** on four files. Examples:
2939
-**
2939
+**
29402940
** kdiff3 "%baseline" "%original" "%merge" -o "%output"
29412941
** xxdiff "%original" "%baseline" "%merge" -M "%output"
29422942
** meld "%baseline" "%original" "%merge" "%output"
29432943
*/
29442944
/*
@@ -3020,11 +3020,11 @@
30203020
/*
30213021
** SETTING; pgp-command width=40
30223022
** DEFAULT: gpg --clearsign -o
30233023
**
30243024
** Command used to clear-sign manifests at check-in.
3025
-*/
3025
+*/
30263026
/*
30273027
** SETTING: proxy width=32 default=off
30283028
** URL of the HTTP proxy. If undefined or "off" then
30293029
** the "http_proxy" environment variable is consulted.
30303030
** If the http_proxy environment variable is undefined
30313031
--- src/db.c
+++ src/db.c
@@ -2763,11 +2763,11 @@
2763 };
2764 #endif /* INTERFACE */
2765
2766 /*
2767 ** SETTING: access-log boolean default=off
2768 **
2769 ** When the access-log setting is enabled, all login attempts (successful
2770 ** and unsuccessful) on the web interface are recorded in the "access" table
2771 ** of the repository.
2772 */
2773 /*
@@ -2934,11 +2934,11 @@
2934 */
2935 /*
2936 ** SETTING: gmerge-command width=40
2937 ** The value is a graphical merge conflict resolver command operating
2938 ** on four files. Examples:
2939 **
2940 ** kdiff3 "%baseline" "%original" "%merge" -o "%output"
2941 ** xxdiff "%original" "%baseline" "%merge" -M "%output"
2942 ** meld "%baseline" "%original" "%merge" "%output"
2943 */
2944 /*
@@ -3020,11 +3020,11 @@
3020 /*
3021 ** SETTING; pgp-command width=40
3022 ** DEFAULT: gpg --clearsign -o
3023 **
3024 ** Command used to clear-sign manifests at check-in.
3025 */
3026 /*
3027 ** SETTING: proxy width=32 default=off
3028 ** URL of the HTTP proxy. If undefined or "off" then
3029 ** the "http_proxy" environment variable is consulted.
3030 ** If the http_proxy environment variable is undefined
3031
--- src/db.c
+++ src/db.c
@@ -2763,11 +2763,11 @@
2763 };
2764 #endif /* INTERFACE */
2765
2766 /*
2767 ** SETTING: access-log boolean default=off
2768 **
2769 ** When the access-log setting is enabled, all login attempts (successful
2770 ** and unsuccessful) on the web interface are recorded in the "access" table
2771 ** of the repository.
2772 */
2773 /*
@@ -2934,11 +2934,11 @@
2934 */
2935 /*
2936 ** SETTING: gmerge-command width=40
2937 ** The value is a graphical merge conflict resolver command operating
2938 ** on four files. Examples:
2939 **
2940 ** kdiff3 "%baseline" "%original" "%merge" -o "%output"
2941 ** xxdiff "%original" "%baseline" "%merge" -M "%output"
2942 ** meld "%baseline" "%original" "%merge" "%output"
2943 */
2944 /*
@@ -3020,11 +3020,11 @@
3020 /*
3021 ** SETTING; pgp-command width=40
3022 ** DEFAULT: gpg --clearsign -o
3023 **
3024 ** Command used to clear-sign manifests at check-in.
3025 */
3026 /*
3027 ** SETTING: proxy width=32 default=off
3028 ** URL of the HTTP proxy. If undefined or "off" then
3029 ** the "http_proxy" environment variable is consulted.
3030 ** If the http_proxy environment variable is undefined
3031
+5 -5
--- src/diff.c
+++ src/diff.c
@@ -2367,15 +2367,15 @@
23672367
** the date of the changes and the check-in hash (with a link to the
23682368
** check-in). /blame and /praise also show the user who made the check-in.
23692369
**
23702370
** Reverse Annotations: Normally, these web pages look at versions of
23712371
** FILENAME moving backwards in time back toward the root check-in. However,
2372
-** However, if the origin= query parameter is used to specify some future
2373
-** check-in (example: "origin=trunk") then these pages show changes moving
2374
-** towards that alternative origin. Hence, using "origin=trunk" on an
2375
-** historical version of the file shows the first time each line in the
2376
-** file was been changed in subsequent check-ins.
2372
+** if the origin= query parameter is used to specify some future check-in
2373
+** (example: "origin=trunk") then these pages show changes moving towards
2374
+** that alternative origin. Thus using "origin=trunk" on an historical
2375
+** version of the file shows the first time each line in the file was been
2376
+** changed in subsequent check-ins.
23772377
**
23782378
** Query parameters:
23792379
**
23802380
** checkin=ID The check-in at which to start the annotation
23812381
** filename=FILENAME The filename.
23822382
--- src/diff.c
+++ src/diff.c
@@ -2367,15 +2367,15 @@
2367 ** the date of the changes and the check-in hash (with a link to the
2368 ** check-in). /blame and /praise also show the user who made the check-in.
2369 **
2370 ** Reverse Annotations: Normally, these web pages look at versions of
2371 ** FILENAME moving backwards in time back toward the root check-in. However,
2372 ** However, if the origin= query parameter is used to specify some future
2373 ** check-in (example: "origin=trunk") then these pages show changes moving
2374 ** towards that alternative origin. Hence, using "origin=trunk" on an
2375 ** historical version of the file shows the first time each line in the
2376 ** file was been changed in subsequent check-ins.
2377 **
2378 ** Query parameters:
2379 **
2380 ** checkin=ID The check-in at which to start the annotation
2381 ** filename=FILENAME The filename.
2382
--- src/diff.c
+++ src/diff.c
@@ -2367,15 +2367,15 @@
2367 ** the date of the changes and the check-in hash (with a link to the
2368 ** check-in). /blame and /praise also show the user who made the check-in.
2369 **
2370 ** Reverse Annotations: Normally, these web pages look at versions of
2371 ** FILENAME moving backwards in time back toward the root check-in. However,
2372 ** if the origin= query parameter is used to specify some future check-in
2373 ** (example: "origin=trunk") then these pages show changes moving towards
2374 ** that alternative origin. Thus using "origin=trunk" on an historical
2375 ** version of the file shows the first time each line in the file was been
2376 ** changed in subsequent check-ins.
2377 **
2378 ** Query parameters:
2379 **
2380 ** checkin=ID The check-in at which to start the annotation
2381 ** filename=FILENAME The filename.
2382
+1 -1
--- src/dispatch.c
+++ src/dispatch.c
@@ -132,11 +132,11 @@
132132
** as an alias in the CONFIG table of the repository. If it is, then make
133133
** appropriate changes to the CGI environment and set *ppCmd to point to the
134134
** aliased command.
135135
**
136136
** Return 0 if the command is successfully aliased. Return 1 if there
137
-** is not alias for zName. Any kind of error in the alias value causes a
137
+** is not alias for zName. Any kind of error in the alias value causes a
138138
** error to be thrown.
139139
**
140140
** Alias entries in the CONFIG table have a "name" value of "walias:NAME"
141141
** where NAME is the input page name. The value is a string of the form
142142
** "NEWNAME?QUERYPARAMS". The ?QUERYPARAMS is optional. If present (and it
143143
--- src/dispatch.c
+++ src/dispatch.c
@@ -132,11 +132,11 @@
132 ** as an alias in the CONFIG table of the repository. If it is, then make
133 ** appropriate changes to the CGI environment and set *ppCmd to point to the
134 ** aliased command.
135 **
136 ** Return 0 if the command is successfully aliased. Return 1 if there
137 ** is not alias for zName. Any kind of error in the alias value causes a
138 ** error to be thrown.
139 **
140 ** Alias entries in the CONFIG table have a "name" value of "walias:NAME"
141 ** where NAME is the input page name. The value is a string of the form
142 ** "NEWNAME?QUERYPARAMS". The ?QUERYPARAMS is optional. If present (and it
143
--- src/dispatch.c
+++ src/dispatch.c
@@ -132,11 +132,11 @@
132 ** as an alias in the CONFIG table of the repository. If it is, then make
133 ** appropriate changes to the CGI environment and set *ppCmd to point to the
134 ** aliased command.
135 **
136 ** Return 0 if the command is successfully aliased. Return 1 if there
137 ** is not alias for zName. Any kind of error in the alias value causes a
138 ** error to be thrown.
139 **
140 ** Alias entries in the CONFIG table have a "name" value of "walias:NAME"
141 ** where NAME is the input page name. The value is a string of the form
142 ** "NEWNAME?QUERYPARAMS". The ?QUERYPARAMS is optional. If present (and it
143
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -1408,11 +1408,11 @@
14081408
login_insert_csrf_secret();
14091409
@ To leave this login group press
14101410
@ <input type="submit" value="Leave Login Group" name="leave">
14111411
@ </form></p>
14121412
@ <br />For best results, use the same number of <a href="setup_access#ipt">
1413
- @ IP octets</a> in the login cookie across all repositories in the
1413
+ @ IP octets</a> in the login cookie across all repositories in the
14141414
@ same Login Group.
14151415
@ <hr /><h2>Implementation Details</h2>
14161416
@ <p>The following are fields from the CONFIG table related to login-groups,
14171417
@ provided here for instructional and debugging purposes:</p>
14181418
@ <table border='1' id='configTab'>
14191419
--- src/setup.c
+++ src/setup.c
@@ -1408,11 +1408,11 @@
1408 login_insert_csrf_secret();
1409 @ To leave this login group press
1410 @ <input type="submit" value="Leave Login Group" name="leave">
1411 @ </form></p>
1412 @ <br />For best results, use the same number of <a href="setup_access#ipt">
1413 @ IP octets</a> in the login cookie across all repositories in the
1414 @ same Login Group.
1415 @ <hr /><h2>Implementation Details</h2>
1416 @ <p>The following are fields from the CONFIG table related to login-groups,
1417 @ provided here for instructional and debugging purposes:</p>
1418 @ <table border='1' id='configTab'>
1419
--- src/setup.c
+++ src/setup.c
@@ -1408,11 +1408,11 @@
1408 login_insert_csrf_secret();
1409 @ To leave this login group press
1410 @ <input type="submit" value="Leave Login Group" name="leave">
1411 @ </form></p>
1412 @ <br />For best results, use the same number of <a href="setup_access#ipt">
1413 @ IP octets</a> in the login cookie across all repositories in the
1414 @ same Login Group.
1415 @ <hr /><h2>Implementation Details</h2>
1416 @ <p>The following are fields from the CONFIG table related to login-groups,
1417 @ provided here for instructional and debugging purposes:</p>
1418 @ <table border='1' id='configTab'>
1419

Keyboard Shortcuts

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