Fossil SCM

Fix comment typos in main.c - including some comments that are used as on-line help text.

drh 2015-12-29 21:52 trunk
Commit d76a980fd18f0694bf4e9cfc52106bebb69aef88
Parent 219f967cd7ac7c4…
1 file changed +9 -8
~ src/main.c
M src/main.c
+9 -8
--- src/main.c
+++ src/main.c
@@ -1111,11 +1111,11 @@
11111111
 **
11121112
 ** Usage: %fossil help COMMAND
11131113
 ** or: %fossil COMMAND --help
11141114
 **
11151115
 ** Display information on how to use COMMAND. To display a list of
1116
-** available commands one of:
1116
+** available commands use one of:
11171117
 **
11181118
 ** %fossil help Show common commands
11191119
 ** %fossil help -a|--all Show both common and auxiliary commands
11201120
 ** %fossil help -t|--test Show test commands only
11211121
 ** %fossil help -x|--aux Show auxiliary commands only
@@ -1427,11 +1427,12 @@
14271427
 **
14281428
 ** Assume the user-id and group-id of the repository, or if zRepo
14291429
 ** is a directory, of that directory.
14301430
 **
14311431
 ** The noJail flag means that the chroot jail is not entered. But
1432
-** privileges are still lowered to that of the the user-id and group-id.
1432
+** privileges are still lowered to that of the user-id and group-id
1433
+** of the repository file.
14331434
 */
14341435
 static char *enter_chroot_jail(char *zRepo, int noJail){
14351436
 #if !defined(_WIN32)
14361437
 if( getuid()==0 ){
14371438
 int i;
@@ -1534,11 +1535,11 @@
15341535
 ** and the actual repository is taken from the first element of PATH_INFO.
15351536
 **
15361537
 ** Process the webpage specified by the PATH_INFO or REQUEST_URI
15371538
 ** environment variable.
15381539
 **
1539
-** If the repository is not known, the a search is done through the
1540
+** If the repository is not known, then a search is done through the
15401541
 ** file hierarchy rooted at g.zRepositoryName for a suitable repository
15411542
 ** with a name of $prefix.fossil, where $prefix is any prefix of PATH_INFO.
15421543
 ** Or, if an ordinary file named $prefix is found, and $prefix matches
15431544
 ** pFileGlob and $prefix does not match "*.fossil*" and the mimetype of
15441545
 ** $prefix can be determined from its suffix, then the file $prefix is
@@ -2105,12 +2106,12 @@
21052106
 /*
21062107
 ** If g.argv[arg] exists then it is either the name of a repository
21072108
 ** that will be used by a server, or else it is a directory that
21082109
 ** contains multiple repositories that can be served. If g.argv[arg]
21092110
 ** is a directory, the repositories it contains must be named
2110
-** "*.fossil". If g.argv[arg] does not exists, then we must be within
2111
-** a check-out and the repository to be served is the repository of
2111
+** "*.fossil". If g.argv[arg] does not exist, then we must be within
2112
+** an open check-out and the repository serve is the repository of
21122113
 ** that check-out.
21132114
 **
21142115
 ** Open the repository to be served if it is known. If g.argv[arg] is
21152116
 ** a directory full of repositories, then set g.zRepositoryName to
21162117
 ** the name of that directory and the specific repository will be
@@ -2155,11 +2156,11 @@
21552156
 /*
21562157
 ** undocumented format:
21572158
 **
21582159
 ** fossil http INFILE OUTFILE IPADDR ?REPOSITORY?
21592160
 **
2160
-** The argv==6 form is used by the win32 server only.
2161
+** The argv==6 form (with no options) is used by the win32 server only.
21612162
 **
21622163
 ** COMMAND: http*
21632164
 **
21642165
 ** Usage: %fossil http ?REPOSITORY? ?OPTIONS?
21652166
 **
@@ -2167,12 +2168,12 @@
21672168
 ** is delivered on stdout. This method is used to launch an HTTP request
21682169
 ** handler from inetd, for example. The argument is the name of the
21692170
 ** repository.
21702171
 **
21712172
 ** If REPOSITORY is a directory that contains one or more repositories,
2172
-** either directly in REPOSITORY itself, or in subdirectories, and
2173
-** with names of the form "*.fossil" then the a prefix of the URL pathname
2173
+** either directly in REPOSITORY itself or in subdirectories, and
2174
+** with names of the form "*.fossil" then a prefix of the URL pathname
21742175
 ** selects from among the various repositories. If the pathname does
21752176
 ** not select a valid repository and the --notfound option is available,
21762177
 ** then the server redirects (HTTP code 302) to the URL of --notfound.
21772178
 ** When REPOSITORY is a directory, the pathname must contain only
21782179
 ** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
21792180
--- src/main.c
+++ src/main.c
@@ -1111,11 +1111,11 @@
1111 **
1112 ** Usage: %fossil help COMMAND
1113 ** or: %fossil COMMAND --help
1114 **
1115 ** Display information on how to use COMMAND. To display a list of
1116 ** available commands one of:
1117 **
1118 ** %fossil help Show common commands
1119 ** %fossil help -a|--all Show both common and auxiliary commands
1120 ** %fossil help -t|--test Show test commands only
1121 ** %fossil help -x|--aux Show auxiliary commands only
@@ -1427,11 +1427,12 @@
1427 **
1428 ** Assume the user-id and group-id of the repository, or if zRepo
1429 ** is a directory, of that directory.
1430 **
1431 ** The noJail flag means that the chroot jail is not entered. But
1432 ** privileges are still lowered to that of the the user-id and group-id.
 
1433 */
1434 static char *enter_chroot_jail(char *zRepo, int noJail){
1435 #if !defined(_WIN32)
1436 if( getuid()==0 ){
1437 int i;
@@ -1534,11 +1535,11 @@
1534 ** and the actual repository is taken from the first element of PATH_INFO.
1535 **
1536 ** Process the webpage specified by the PATH_INFO or REQUEST_URI
1537 ** environment variable.
1538 **
1539 ** If the repository is not known, the a search is done through the
1540 ** file hierarchy rooted at g.zRepositoryName for a suitable repository
1541 ** with a name of $prefix.fossil, where $prefix is any prefix of PATH_INFO.
1542 ** Or, if an ordinary file named $prefix is found, and $prefix matches
1543 ** pFileGlob and $prefix does not match "*.fossil*" and the mimetype of
1544 ** $prefix can be determined from its suffix, then the file $prefix is
@@ -2105,12 +2106,12 @@
2105 /*
2106 ** If g.argv[arg] exists then it is either the name of a repository
2107 ** that will be used by a server, or else it is a directory that
2108 ** contains multiple repositories that can be served. If g.argv[arg]
2109 ** is a directory, the repositories it contains must be named
2110 ** "*.fossil". If g.argv[arg] does not exists, then we must be within
2111 ** a check-out and the repository to be served is the repository of
2112 ** that check-out.
2113 **
2114 ** Open the repository to be served if it is known. If g.argv[arg] is
2115 ** a directory full of repositories, then set g.zRepositoryName to
2116 ** the name of that directory and the specific repository will be
@@ -2155,11 +2156,11 @@
2155 /*
2156 ** undocumented format:
2157 **
2158 ** fossil http INFILE OUTFILE IPADDR ?REPOSITORY?
2159 **
2160 ** The argv==6 form is used by the win32 server only.
2161 **
2162 ** COMMAND: http*
2163 **
2164 ** Usage: %fossil http ?REPOSITORY? ?OPTIONS?
2165 **
@@ -2167,12 +2168,12 @@
2167 ** is delivered on stdout. This method is used to launch an HTTP request
2168 ** handler from inetd, for example. The argument is the name of the
2169 ** repository.
2170 **
2171 ** If REPOSITORY is a directory that contains one or more repositories,
2172 ** either directly in REPOSITORY itself, or in subdirectories, and
2173 ** with names of the form "*.fossil" then the a prefix of the URL pathname
2174 ** selects from among the various repositories. If the pathname does
2175 ** not select a valid repository and the --notfound option is available,
2176 ** then the server redirects (HTTP code 302) to the URL of --notfound.
2177 ** When REPOSITORY is a directory, the pathname must contain only
2178 ** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
2179
--- src/main.c
+++ src/main.c
@@ -1111,11 +1111,11 @@
1111 **
1112 ** Usage: %fossil help COMMAND
1113 ** or: %fossil COMMAND --help
1114 **
1115 ** Display information on how to use COMMAND. To display a list of
1116 ** available commands use one of:
1117 **
1118 ** %fossil help Show common commands
1119 ** %fossil help -a|--all Show both common and auxiliary commands
1120 ** %fossil help -t|--test Show test commands only
1121 ** %fossil help -x|--aux Show auxiliary commands only
@@ -1427,11 +1427,12 @@
1427 **
1428 ** Assume the user-id and group-id of the repository, or if zRepo
1429 ** is a directory, of that directory.
1430 **
1431 ** The noJail flag means that the chroot jail is not entered. But
1432 ** privileges are still lowered to that of the user-id and group-id
1433 ** of the repository file.
1434 */
1435 static char *enter_chroot_jail(char *zRepo, int noJail){
1436 #if !defined(_WIN32)
1437 if( getuid()==0 ){
1438 int i;
@@ -1534,11 +1535,11 @@
1535 ** and the actual repository is taken from the first element of PATH_INFO.
1536 **
1537 ** Process the webpage specified by the PATH_INFO or REQUEST_URI
1538 ** environment variable.
1539 **
1540 ** If the repository is not known, then a search is done through the
1541 ** file hierarchy rooted at g.zRepositoryName for a suitable repository
1542 ** with a name of $prefix.fossil, where $prefix is any prefix of PATH_INFO.
1543 ** Or, if an ordinary file named $prefix is found, and $prefix matches
1544 ** pFileGlob and $prefix does not match "*.fossil*" and the mimetype of
1545 ** $prefix can be determined from its suffix, then the file $prefix is
@@ -2105,12 +2106,12 @@
2106 /*
2107 ** If g.argv[arg] exists then it is either the name of a repository
2108 ** that will be used by a server, or else it is a directory that
2109 ** contains multiple repositories that can be served. If g.argv[arg]
2110 ** is a directory, the repositories it contains must be named
2111 ** "*.fossil". If g.argv[arg] does not exist, then we must be within
2112 ** an open check-out and the repository serve is the repository of
2113 ** that check-out.
2114 **
2115 ** Open the repository to be served if it is known. If g.argv[arg] is
2116 ** a directory full of repositories, then set g.zRepositoryName to
2117 ** the name of that directory and the specific repository will be
@@ -2155,11 +2156,11 @@
2156 /*
2157 ** undocumented format:
2158 **
2159 ** fossil http INFILE OUTFILE IPADDR ?REPOSITORY?
2160 **
2161 ** The argv==6 form (with no options) is used by the win32 server only.
2162 **
2163 ** COMMAND: http*
2164 **
2165 ** Usage: %fossil http ?REPOSITORY? ?OPTIONS?
2166 **
@@ -2167,12 +2168,12 @@
2168 ** is delivered on stdout. This method is used to launch an HTTP request
2169 ** handler from inetd, for example. The argument is the name of the
2170 ** repository.
2171 **
2172 ** If REPOSITORY is a directory that contains one or more repositories,
2173 ** either directly in REPOSITORY itself or in subdirectories, and
2174 ** with names of the form "*.fossil" then a prefix of the URL pathname
2175 ** selects from among the various repositories. If the pathname does
2176 ** not select a valid repository and the --notfound option is available,
2177 ** then the server redirects (HTTP code 302) to the URL of --notfound.
2178 ** When REPOSITORY is a directory, the pathname must contain only
2179 ** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
2180

Keyboard Shortcuts

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