Skip to content

Commit e5f94c4

Browse files
committed
use "cachable" and "requestor" spellings
1 parent 25f1889 commit e5f94c4

File tree

15 files changed

+29
-29
lines changed

15 files changed

+29
-29
lines changed

docs/ConfigExamples/Caching/WindowsUpdates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ requests. Particularly when large objects are involved.
4343
Default value is a bit small. It needs to be somewhere 100MB or
4444
higher to cope with the IE updates.
4545
- **[range_offset_limit](http://www.squid-cache.org/Doc/config/range_offset_limit)**.
46-
Does the main work of converting range requests into cacheable
46+
Does the main work of converting range requests into cachable
4747
requests. Use the same size limit as
4848
[maximum_object_size](http://www.squid-cache.org/Doc/config/maximum_object_size)
4949
to prevent conversion of requests for objects which will not cache

docs/DeveloperResources/RequestUseCases.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interact for a number of use cases.
2929
- Requests on a client side connection are owned by the connection.
3030
- The data source from the store or upstream to satisfy a connection
3131
is owned by the request.
32-
- Upstream requests are owned by the requester - the client request
32+
- Upstream requests are owned by the requestor - the client request
3333
when the request is not being diverted to the store, and the store
3434
when it is being copied to cache.
3535
- The server-side connection is owned by the OS - it must remain a
@@ -206,8 +206,8 @@ Socket - an fd on unix, a HANDLE on windows.
206206
request to read data.
207207
11. the client
208208

209-
## Uncacheable request
209+
## Uncacheble request
210210

211211
## Tunnel request
212212

213-
## Cacheable request
213+
## Cacheble request

docs/Features/CollapsedForwarding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ for the same URI to be processed as one request to the backend server.
2020
Normally disabled to avoid increased latency on dynamic content, but
2121
there can be benefit from enabling this in accelerator setups where the
2222
web servers are the bottleneck but are reliable and return mostly
23-
cacheable information.
23+
cachable information.
2424

2525
It was left out of [Squid-3.0](/Releases/Squid-3.0)
2626
due to time and stability constraints. The

docs/Features/ConnPin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ servers using Microsoft Integrated Login (NTLM/Negotiate), it needs:
2525
- code to activate the tying when a stateful authentication layer is
2626
seen
2727
- code to mark the objects downloaded over a pinned connection
28-
uncacheable
28+
uncachable
2929
- code to add a header advertising this capability to clients
3030

3131
The HTTP protocol extensions used to negotiate this is documented in

docs/Features/LinuxOptimizedIO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ involving pipes: splice, tee and vmsplice
1515
pipe
1616

1717
Those ***might*** be useful in different cases: respectively disk cache
18-
hit, cacheable miss and (probably) error pages. We need to verify that
18+
hit, cachable miss and (probably) error pages. We need to verify that
1919
the semantics are right, and what kind of compromises are required to
2020
implement them
2121

docs/Features/PartialResponsesCaching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ categories: WantedFeature
2020
(from the bug report): When range_offset_limit is set to -1, Squid
2121
tries to fetch the entire object in response to an HTTP range request.
2222

23-
- **Bug**: The entire object is fetched even when it is not cacheable
23+
- **Bug**: The entire object is fetched even when it is not cachable
2424
(e.g. because it is larger than
2525
[maximum_object_size](http://www.squid-cache.org/Doc/config/maximum_object_size)
2626
or some other criteria).

docs/Http11Checklist.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,15 @@ categories: [WantedFeature, Feature]
376376
| | | 351 | MUST | 14.8 | always revalidate responses with cache-control: s-maxage=0 | |
377377
| | | 352 | MUST | 14.9 | follow the cache-control header directives at all times | |
378378
| | | 353 | MUST | 14.9 | pass cache-control directives through to the next link in the message path (ie don't eat them) | |
379-
| | | 354 | MAY | 14.9.1 | cache responses with cache-control: public even of the header/method might not normally be cacheable | |
379+
| | | 354 | MAY | 14.9.1 | cache responses with cache-control: public even of the header/method might not normally be cachable | |
380380
| | | 355 | MUST NOT | 14.9.1 | cache responses with cache-control: private | |
381381
| | | 356 | MUST NOT | 14.9.1 | use responses with cache-control: no-cache to satisfy other requests without successful revalidation | ie auto GET to IMS is allowed |
382382
| | | 357 | MAY | 14.9.1 | use responses with cache-control: no-cache to satisfy other requests without successful revalidation if the no-cache directive includes field-names | |
383383
| | | 358 | MUST NOT | 14.9.1 | send the headers listed in responses with cache-control: no-cache (header…) to satisfy other requests without successful revalidation if the no-cache directive includes field-names | |
384384
| | | 359 | MAY | 14.9.2 | use no-store on requests or responses to prevent data storage | |
385385
| | | 360 | MUST NOT | 14.9.2 | store any part of a request or it's response if the cache-control: no-store directive was in the request | This directive applies to both non-shared and shared caches. "MUST NOT store" in this context means that the cache MUST NOT intentionally store the information in non-volatile storage, and MUST make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it. |
386386
| | | 361 | MUST NOT | 14.9.2 | store any part of a response or the request that elicited it if the cache-control: no-store directive was in the response | This directive applies to both non-shared and shared caches. "MUST NOT store" in this context means that the cache MUST NOT intentionally store the information in non-volatile storage, and MUST make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it. |
387-
| | | 362 | SHOULD | 14.9.3 | consider responses with an Expires value that is \<= the response date and no cache-control header field to be non-cacheable | |
387+
| | | 362 | SHOULD | 14.9.3 | consider responses with an Expires value that is \<= the response date and no cache-control header field to be non-cachable | |
388388
| | | 363 | MUST | 14.9.3 | mark stale responses with Warning 110 | |
389389
| | | 364 | MAY | 14.9.3 | have squid configurable to return stale responses even when not requested by clients but responses served MUST NOT conlict with other MUST or MUST NOT requirements | |
390390
| | | 365 | MUST NOT | 14.9.4 | use a cached copy to respond to a request with cache-control: no-cache or Pragma: no-cache | |
@@ -455,8 +455,8 @@ categories: [WantedFeature, Feature]
455455
| | | 430 | MUST | 14.42 | use the upgrade header in a response with status code 101 | |
456456
| | | 431 | MUST | 14.42 | include the Upgrade connection-token whenever we use the Upgrade header | |
457457
| | | 432 | SHOULD | 14.43 | for the client - include a user-Agent field in requests | |
458-
| | | 433 | SHOULD | 14.44 | include a Vary header on any cacheable response we generate that used server negotiation | |
459-
| | | 434 | MAY | 14.44 | for the 'server' include a vary header with a non-cacheable response the used server negotiation | |
458+
| | | 433 | SHOULD | 14.44 | include a Vary header on any cachable response we generate that used server negotiation | |
459+
| | | 434 | MAY | 14.44 | for the 'server' include a vary header with a non-cachable response the used server negotiation | |
460460
| | | 435 | MAY | 14.44 | assume the same response will be given by a server for future requests with the same request field values as those listed by the vary header in the response whilst the response is still fresh | |
461461
| | | 436 | MUST NOT | 14.44 | generate a \* value for a vary field | |
462462
| | | 437 | MUST | 14.45 | fill in the Via header | |

docs/KnowledgeBase/Benchmarks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This number was taken in a **controlled test environment**. It has
4545
nothing to do with the numbers someone would get in a production
4646
environment; it's just an estimate of how fast squid can be. Squid was
4747
configured to do no logging, no access control, and apachebench was used
48-
to hammer squid asking 10M times for a static, cacheable, 600-bytes long
48+
to hammer squid asking 10M times for a static, cachable, 600-bytes long
4949
document. Of the 4 cores, 3 were running a multi-worker squid, one was
5050
running ab over the loopback interface.
5151

@@ -229,7 +229,7 @@ nothing to do with the numbers someone would get in a production
229229
environment; it's just an estimate of how fast squid can be. Squid was
230230
configured to do no logging and apachebench was used to hammer squid
231231
asking 250K times for a blocked url (leading to a 403 response with a
232-
location header) or with a cacheable, 16KB long document. Of the 4
232+
location header) or with a cachable, 16KB long document. Of the 4
233233
cores, 2 were running a multi-worker squid. The apache benchmark was run
234234
from another host and from the same host with similar results.
235235

docs/KnowledgeBase/HierarchyControl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ The various directives are evaluated in this order:
3232

3333
The purpose of cache hierarchy is to maximize the chance of finding
3434
objects in siblings, so a set of heuristics is applied to try and
35-
determine in advance whether an object is likely to be cacheable. A few
36-
objects are **not** cacheable, and are thus **not** hierarchic. Those
35+
determine in advance whether an object is likely to be cachable. A few
36+
objects are **not** cachable, and are thus **not** hierarchic. Those
3737
are:
3838

3939
- reload requests

docs/SquidFaq/CacheDigests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Every object referenced in the index in RAM is checked to see if it is
154154
suitable for addition to the digest.
155155

156156
A number of objects are not suitable, e.g. those that are private, not
157-
cacheable, negatively cached etc. and are skipped immediately.
157+
cachable, negatively cached etc. and are skipped immediately.
158158

159159
A *freshness* test is next made in an attempt to guess if the object
160160
will expire soon, since if it does, it is not worthwhile adding it to

0 commit comments

Comments
 (0)