Fossil SCM

Typos in the help text and the change log.

drh 2020-06-27 17:05 trunk
Commit cd061779d2c192c239e1eb6d0e9254d8193ffa7bf387feb1ae54dd69743448a4
+4 -4
--- src/alerts.c
+++ src/alerts.c
@@ -1586,26 +1586,26 @@
15861586
**
15871587
** Edit email alert and notification settings.
15881588
**
15891589
** The subscriber is identified in several ways:
15901590
**
1591
-** (1) The name= query parameter contains the complete subscriberCode.
1591
+** * The name= query parameter contains the complete subscriberCode.
15921592
** This only happens when the user receives a verification
15931593
** email and clicks on the link in the email. When a
15941594
** compilete subscriberCode is seen on the name= query parameter,
15951595
** that constitutes verification of the email address.
15961596
**
1597
-** (2) The sid= query parameter contains an integer subscriberId.
1597
+** * The sid= query parameter contains an integer subscriberId.
15981598
** This only works for the administrator. It allows the
15991599
** administrator to edit any subscription.
16001600
**
1601
-** (3) The user is logged into an account other than "nobody" or
1601
+** * The user is logged into an account other than "nobody" or
16021602
** "anonymous". In that case the notification settings
16031603
** associated with that account can be edited without needing
16041604
** to know the subscriber code.
16051605
**
1606
-** (4) The name= query parameter contains a 32-digit prefix of
1606
+** * The name= query parameter contains a 32-digit prefix of
16071607
** subscriber code. (Subscriber codes are normally 64 hex digits
16081608
** in length.) This uniquely identifies the subscriber without
16091609
** revealing the complete subscriber code, and hence without
16101610
** verifying the email address.
16111611
*/
16121612
--- src/alerts.c
+++ src/alerts.c
@@ -1586,26 +1586,26 @@
1586 **
1587 ** Edit email alert and notification settings.
1588 **
1589 ** The subscriber is identified in several ways:
1590 **
1591 ** (1) The name= query parameter contains the complete subscriberCode.
1592 ** This only happens when the user receives a verification
1593 ** email and clicks on the link in the email. When a
1594 ** compilete subscriberCode is seen on the name= query parameter,
1595 ** that constitutes verification of the email address.
1596 **
1597 ** (2) The sid= query parameter contains an integer subscriberId.
1598 ** This only works for the administrator. It allows the
1599 ** administrator to edit any subscription.
1600 **
1601 ** (3) The user is logged into an account other than "nobody" or
1602 ** "anonymous". In that case the notification settings
1603 ** associated with that account can be edited without needing
1604 ** to know the subscriber code.
1605 **
1606 ** (4) The name= query parameter contains a 32-digit prefix of
1607 ** subscriber code. (Subscriber codes are normally 64 hex digits
1608 ** in length.) This uniquely identifies the subscriber without
1609 ** revealing the complete subscriber code, and hence without
1610 ** verifying the email address.
1611 */
1612
--- src/alerts.c
+++ src/alerts.c
@@ -1586,26 +1586,26 @@
1586 **
1587 ** Edit email alert and notification settings.
1588 **
1589 ** The subscriber is identified in several ways:
1590 **
1591 ** * The name= query parameter contains the complete subscriberCode.
1592 ** This only happens when the user receives a verification
1593 ** email and clicks on the link in the email. When a
1594 ** compilete subscriberCode is seen on the name= query parameter,
1595 ** that constitutes verification of the email address.
1596 **
1597 ** * The sid= query parameter contains an integer subscriberId.
1598 ** This only works for the administrator. It allows the
1599 ** administrator to edit any subscription.
1600 **
1601 ** * The user is logged into an account other than "nobody" or
1602 ** "anonymous". In that case the notification settings
1603 ** associated with that account can be edited without needing
1604 ** to know the subscriber code.
1605 **
1606 ** * The name= query parameter contains a 32-digit prefix of
1607 ** subscriber code. (Subscriber codes are normally 64 hex digits
1608 ** in length.) This uniquely identifies the subscriber without
1609 ** revealing the complete subscriber code, and hence without
1610 ** verifying the email address.
1611 */
1612
+1 -1
--- src/dispatch.c
+++ src/dispatch.c
@@ -239,11 +239,11 @@
239239
static void appendMixedFont(Blob *pOut, const char *z, int n){
240240
const char *zEnd = "";
241241
int i = 0;
242242
int j;
243243
while( i<n ){
244
- if( z[i]==' ' || z[j]=='=' ){
244
+ if( z[i]==' ' || z[i]=='=' ){
245245
for(j=i+1; j<n && (z[j]==' ' || z[j]=='='); j++){}
246246
blob_append(pOut, z+i, j-i);
247247
i = j;
248248
}else{
249249
for(j=i; j<n && z[j]!=' ' && z[j]!='=' && !fossil_isalpha(z[j]); j++){}
250250
--- src/dispatch.c
+++ src/dispatch.c
@@ -239,11 +239,11 @@
239 static void appendMixedFont(Blob *pOut, const char *z, int n){
240 const char *zEnd = "";
241 int i = 0;
242 int j;
243 while( i<n ){
244 if( z[i]==' ' || z[j]=='=' ){
245 for(j=i+1; j<n && (z[j]==' ' || z[j]=='='); j++){}
246 blob_append(pOut, z+i, j-i);
247 i = j;
248 }else{
249 for(j=i; j<n && z[j]!=' ' && z[j]!='=' && !fossil_isalpha(z[j]); j++){}
250
--- src/dispatch.c
+++ src/dispatch.c
@@ -239,11 +239,11 @@
239 static void appendMixedFont(Blob *pOut, const char *z, int n){
240 const char *zEnd = "";
241 int i = 0;
242 int j;
243 while( i<n ){
244 if( z[i]==' ' || z[i]=='=' ){
245 for(j=i+1; j<n && (z[j]==' ' || z[j]=='='); j++){}
246 blob_append(pOut, z+i, j-i);
247 i = j;
248 }else{
249 for(j=i; j<n && z[j]!=' ' && z[j]!='=' && !fossil_isalpha(z[j]); j++){}
250
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,11 +2,11 @@
22
33
<a name='v2_12'></a>
44
<h2>Changes for Version 2.12 (pending)</h2>
55
66
* Security fix in the "fossil git export" command. The same fix is
7
- also backported to version 2.10.1 and 2.11.1. New "safety-nets"
7
+ also backported to version 2.10.1 and 2.11.1. New "safety-net"
88
features were added to prevent similar problems in the future.
99
* Enhancements to the graph display for cases when there are
1010
many merges into a single check-in.
1111
[/info/2d75e87b760c0a9?diff=0|Example]
1212
* Enhance the markdown formatter to more closely follow the
1313
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,11 +2,11 @@
2
3 <a name='v2_12'></a>
4 <h2>Changes for Version 2.12 (pending)</h2>
5
6 * Security fix in the "fossil git export" command. The same fix is
7 also backported to version 2.10.1 and 2.11.1. New "safety-nets"
8 features were added to prevent similar problems in the future.
9 * Enhancements to the graph display for cases when there are
10 many merges into a single check-in.
11 [/info/2d75e87b760c0a9?diff=0|Example]
12 * Enhance the markdown formatter to more closely follow the
13
--- www/changes.wiki
+++ www/changes.wiki
@@ -2,11 +2,11 @@
2
3 <a name='v2_12'></a>
4 <h2>Changes for Version 2.12 (pending)</h2>
5
6 * Security fix in the "fossil git export" command. The same fix is
7 also backported to version 2.10.1 and 2.11.1. New "safety-net"
8 features were added to prevent similar problems in the future.
9 * Enhancements to the graph display for cases when there are
10 many merges into a single check-in.
11 [/info/2d75e87b760c0a9?diff=0|Example]
12 * Enhance the markdown formatter to more closely follow the
13

Keyboard Shortcuts

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