--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- a/LICENSE +++ b/LICENSE @@ -516,7 +516,7 @@ This program may be used and copied freely providing this copyright notice is not removed. -This software is provided "as is" and any express or implied waranties, +This software is provided "as is" and any express or implied warranties, including but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, --- a/docs/man/httxt2dbm.1 +++ b/docs/man/httxt2dbm.1 @@ -50,7 +50,7 @@ Specify the DBM type to be used for the output\&. If not specified, will use the APR Default\&. Available types are: \fBGDBM\fR for GDBM files, \fBSDBM\fR for SDBM files, \fBDB\fR for berkeley DB files, \fBNDBM\fR for NDBM files, \fBdefault\fR for the default DBM type\&. .TP \fB-i \fISOURCE_TXT\fR\fR -Input file from which the dbm is to be created\&. The file should be formated with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&. +Input file from which the dbm is to be created\&. The file should be formatted with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&. .TP \fB-o \fIOUTPUT_DBM\fR\fR Name of the output dbm files\&. --- a/docs/manual/howto/htaccess.html.ja.utf8 +++ b/docs/manual/howto/htaccess.html.ja.utf8 @@ -247,7 +247,7 @@
As discussed in the documentation on Configuration Sections,
.htaccess
files can override the <Directory>
sections for
- the corresponding directory, but will be overriden by other types
+ the corresponding directory, but will be overridden by other types
of configuration sections from the main configuration files. This
fact can be used to enforce certain configurations, even in the
presence of a liberal AllowOverride
setting. For example, to
@@ -414,4 +414,4 @@
prettyPrint();
}
//-->
-