Merge branch 'mi/typofixes' into maint
* mi/typofixes: contrib: typofixes Documentation/technical/http-protocol.txt: typofixes typofixes: fix misspelt comments
This commit is contained in:
commit
a4a227a725
@ -307,7 +307,7 @@ Clients MUST first perform ref discovery with
|
||||
S: ....ACK %s, continue
|
||||
S: ....NAK
|
||||
|
||||
Clients MUST NOT reuse or revalidate a cached reponse.
|
||||
Clients MUST NOT reuse or revalidate a cached response.
|
||||
Servers MUST include sufficient Cache-Control headers
|
||||
to prevent caching of the response.
|
||||
|
||||
@ -468,7 +468,7 @@ Clients MUST first perform ref discovery with
|
||||
S:
|
||||
S: ....
|
||||
|
||||
Clients MUST NOT reuse or revalidate a cached reponse.
|
||||
Clients MUST NOT reuse or revalidate a cached response.
|
||||
Servers MUST include sufficient Cache-Control headers
|
||||
to prevent caching of the response.
|
||||
|
||||
|
@ -1205,7 +1205,7 @@ class GitView(object):
|
||||
|
||||
#The first parent always continue on the same line
|
||||
try:
|
||||
# check we alreay have the value
|
||||
# check we already have the value
|
||||
tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
|
||||
except KeyError:
|
||||
self.colours[commit.parent_sha1[0]] = colour
|
||||
|
@ -1315,7 +1315,7 @@ sub get_mw_namespace_id {
|
||||
# Store "notANameSpace" as special value for inexisting namespaces
|
||||
my $store_id = ($id || 'notANameSpace');
|
||||
|
||||
# Store explicitely requested namespaces on disk
|
||||
# Store explicitly requested namespaces on disk
|
||||
if (!exists $cached_mw_namespace_id{$name}) {
|
||||
run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
|
||||
$cached_mw_namespace_id{$name} = 1;
|
||||
|
@ -91,7 +91,7 @@ test_diff_directories () {
|
||||
# Check that <dir> contains exactly <N> files
|
||||
test_contains_N_files () {
|
||||
if test `ls -- "$1" | wc -l` -ne "$2"; then
|
||||
echo "directory $1 sould contain $2 files"
|
||||
echo "directory $1 should contain $2 files"
|
||||
echo "it contains these files:"
|
||||
ls "$1"
|
||||
false
|
||||
|
@ -12,7 +12,7 @@ SERVER_ADDR=localhost
|
||||
TMP=/tmp
|
||||
DB_FILE=wikidb.sqlite
|
||||
|
||||
# If LIGHTTPD is not set to true, the script will use the defaut
|
||||
# If LIGHTTPD is not set to true, the script will use the default
|
||||
# web server running in WIKI_DIR_INST.
|
||||
WIKI_DIR_INST=/var/www
|
||||
|
||||
|
@ -137,7 +137,7 @@ bisect_start() {
|
||||
# cogito usage, and cogito users should understand
|
||||
# it relates to cg-seek.
|
||||
[ -s "$GIT_DIR/head-name" ] &&
|
||||
die "$(gettext "won't bisect on seeked tree")"
|
||||
die "$(gettext "won't bisect on cg-seek'ed tree")"
|
||||
start_head="${head#refs/heads/}"
|
||||
;;
|
||||
*)
|
||||
|
@ -197,11 +197,11 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
|
||||
magic |= short_magic;
|
||||
*p_short_magic = short_magic;
|
||||
|
||||
/* --noglob-pathspec adds :(literal) _unless_ :(glob) is specifed */
|
||||
/* --noglob-pathspec adds :(literal) _unless_ :(glob) is specified */
|
||||
if (noglob_global && !(magic & PATHSPEC_GLOB))
|
||||
global_magic |= PATHSPEC_LITERAL;
|
||||
|
||||
/* --glob-pathspec is overriden by :(literal) */
|
||||
/* --glob-pathspec is overridden by :(literal) */
|
||||
if ((global_magic & PATHSPEC_GLOB) && (magic & PATHSPEC_LITERAL))
|
||||
global_magic &= ~PATHSPEC_GLOB;
|
||||
|
||||
|
@ -133,7 +133,7 @@ void *xcalloc(size_t nmemb, size_t size)
|
||||
/*
|
||||
* Limit size of IO chunks, because huge chunks only cause pain. OS X
|
||||
* 64-bit is buggy, returning EINVAL if len >= INT_MAX; and even in
|
||||
* the absense of bugs, large chunks can result in bad latencies when
|
||||
* the absence of bugs, large chunks can result in bad latencies when
|
||||
* you decide to kill the process.
|
||||
*/
|
||||
#define MAX_IO_SIZE (8*1024*1024)
|
||||
|
Loading…
Reference in New Issue
Block a user