You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2013/12/02 12:18:24 UTC
[1/2] git commit: Fix language in documentation
Updated Branches:
refs/heads/master 82d9d493c -> 377f353fc
Fix language in documentation
use gender neutral pronouns when referring to an administrator.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f61882fe
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f61882fe
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f61882fe
Branch: refs/heads/master
Commit: f61882fe40dc45982c6970cb59748d21d77e4115
Parents: 82d9d49
Author: Igor Galić <i....@brainsware.org>
Authored: Mon Dec 2 12:08:56 2013 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Mon Dec 2 12:08:56 2013 +0100
----------------------------------------------------------------------
doc/arch/cache/cache-appendix.en.rst | 2 +-
doc/arch/cache/tier-storage.en.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f61882fe/doc/arch/cache/cache-appendix.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/cache-appendix.en.rst b/doc/arch/cache/cache-appendix.en.rst
index 9a27d43..bb13b72 100644
--- a/doc/arch/cache/cache-appendix.en.rst
+++ b/doc/arch/cache/cache-appendix.en.rst
@@ -70,7 +70,7 @@ It becomes significant if multiple original URLs are mapped to the same remapped
This is also an issue if a remapping is changed because it is effectively a time axis version of the previous case. If an original URL is remapped to a different server address then the setting determines if existing cached objects will be served for new requests (enabled) or not (disabled). Similarly if the original URL mapped to a particular URL is changed then cached objects from the initial original URL will be served from the updated original URL if pristine headers is disabled.
-These collisions are not of themselves good or bad. An administrator needs to decide which is appropriate for his situation and set the value correspondingly.
+These collisions are not of themselves good or bad. An administrator needs to decide which is appropriate for their situation and set the value correspondingly.
If a greater degree of control is desired a plugin must used to invoke the API call :c:func:`TSCacheUrlSet()` to provide a specific cache key.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f61882fe/doc/arch/cache/tier-storage.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/tier-storage.en.rst b/doc/arch/cache/tier-storage.en.rst
index b802929..20bbfd6 100644
--- a/doc/arch/cache/tier-storage.en.rst
+++ b/doc/arch/cache/tier-storage.en.rst
@@ -37,7 +37,7 @@ The most common case for tiers is an ordered list of tiers, where higher tiers a
(or more limited in capacity). This is not required. It might be that different tiers are differentiated by other
properties (such as expected persistence). The design here is intended to handle both cases.
-The design presumes that if a user has multiple tiers of storage and an ordering for those tiers, he will usually want
+The design presumes that if a user has multiple tiers of storage and an ordering for those tiers, they will usually want
content stored at one tier level to also be stored at every other lower level as well, so that it does not have to be
copied if evicted from a higher tier.
[2/2] git commit: fix language (spelling/grammar) in comments
Posted by ig...@apache.org.
fix language (spelling/grammar) in comments
gcc is, at best an "it", not a "he". And even then I'm afraid it
cannot feel happiness. Not when compiling C++ anyway.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/377f353f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/377f353f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/377f353f
Branch: refs/heads/master
Commit: 377f353fcf6a300e898b81daacb145cd7ae70835
Parents: f61882f
Author: Igor Galić <i....@brainsware.org>
Authored: Mon Dec 2 12:15:19 2013 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Mon Dec 2 12:17:37 2013 +0100
----------------------------------------------------------------------
proxy/InkAPI.cc | 2 +-
proxy/Prefetch.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/377f353f/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index a4e82c2..4b533d7 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -493,7 +493,7 @@ _hdr_obj_to_mime_hdr_impl(HdrHeapObjImpl * obj)
impl = (MIMEHdrImpl *) obj;
else {
ink_release_assert(!"mloc not a header type");
- impl = NULL; /* gcc does not know about 'ink_release_assert' - make him happy */
+ impl = NULL; /* gcc does not know about 'ink_release_assert' - make it happy */
}
return impl;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/377f353f/proxy/Prefetch.cc
----------------------------------------------------------------------
diff --git a/proxy/Prefetch.cc b/proxy/Prefetch.cc
index 41a6419..69f2489 100644
--- a/proxy/Prefetch.cc
+++ b/proxy/Prefetch.cc
@@ -2199,7 +2199,7 @@ KeepAliveConn::handleEvent(int event, void *data)
vio = childVC->do_io_write(this, INT64_MAX, reader);
- //his read lets us disconnect when the other side closes
+ //this read lets us disconnect when the other side closes
childVC->do_io_read(this, INT64_MAX, read_buf);
break;