http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/performance-tuning.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/performance-tuning.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/performance-tuning.en.po
new file mode 100644
index 0000000..dbc2b9a
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/admin/performance-tuning.en.po
@@ -0,0 +1,57 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../admin/performance-tuning.en.rst:5
+msgid "Performance Tuning"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:29
+msgid "Before you start"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:31
+msgid ""
+"There is no single option to that will guarantee maximum performance of "
+"Apache Traffic Server in every use-case. There are however numerous options "
+"that help tune its performance under different loads and in its - often "
+"vastly different - use-cases."
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:37
+msgid "Building Traffic Server"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:39
+msgid ""
+"A lot of speed can be gained or lost depending on the way ATS is built."
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:42
+msgid "Tuning the Machine"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:45
+msgid "Operating Systems Options"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:48
+msgid "Optimal Use of Memory"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:51
+msgid "Tuning different Thread types"
+msgstr ""
+
+#: ../../admin/performance-tuning.en.rst:54
+msgid "Tuning Plugin Execution"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
index a9c8d9c..136a756 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
@@ -245,14 +245,6 @@ msgstr ""
 ":ts:cv:`proxy.config.http.server_ports` で SSL 
通信に使用されるポート番号を"
 "設定する"
 
-#: ../../admin/security-options.en.rst:120
-msgid ""
-"Edit :file:`ssl_multicert.config` to specify the filename and location of "
-"the SSL certificates and provate keys."
-msgstr ""
-"SSL 証明書と秘密鍵のファイル名と場所を指定するために 
:file:`ssl_multicert."
-"config` を編集する"
-
 #: ../../admin/security-options.en.rst:122
 msgid ""
 "(Optional) Configure the use of client certificates: Client certificates "
@@ -480,3 +472,16 @@ msgstr ":ts:cv:`proxy.config.ssl.client.CA.cert.filename`"
 #: ../../admin/security-options.en.rst:224
 msgid ":ts:cv:`proxy.config.ssl.client.CA.cert.path`"
 msgstr ":ts:cv:`proxy.config.ssl.client.CA.cert.path`"
+
+#: ../../admin/security-options.en.rst:120
+msgid ""
+"Edit :file:`ssl_multicert.config` to specify the filename and location of "
+"the SSL certificates and private keys."
+msgstr ""
+
+#~ msgid ""
+#~ "Edit :file:`ssl_multicert.config` to specify the filename and location "
+#~ "of the SSL certificates and provate keys."
+#~ msgstr ""
+#~ "SSL 証明書と秘密鍵のファイル名とå 
´æ‰€ã‚’指定するために :file:"
+#~ "`ssl_multicert.config` を編集する"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy.en.po
index a16c6cf..010b7a7 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy.en.po
@@ -15,23 +15,23 @@ msgstr ""
 msgid "Transparent Proxying"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:33
+#: ../../admin/transparent-proxy.en.rst:32
 msgid ""
 "Transparent Proxying is the ability of a proxy (such as ATS) to intercept "
 "connections between clients and servers without being visible."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:36
+#: ../../admin/transparent-proxy.en.rst:35
 msgid ""
 "The general network structure that will be used in this documentation looks "
 "like this --"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:43
+#: ../../admin/transparent-proxy.en.rst:42
 msgid "ATS basic traffic flow of Transparent Proxy"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:45
+#: ../../admin/transparent-proxy.en.rst:44
 msgid ""
 "There must be a gateway device through which passes all network traffic "
 "from the client to the Internet (or external cloud). The gateway is "
@@ -42,7 +42,7 @@ msgid ""
 "system, the redirected traffic can flow over other network infrastructure."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:54
+#: ../../admin/transparent-proxy.en.rst:53
 msgid ""
 "Because ATS uses two connections transparency can be set independently on "
 "the client and origin server (Internet / external cloud) side. We will "
@@ -50,7 +50,7 @@ msgid ""
 "*inbound transparency* and *outbound transparency*."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:59
+#: ../../admin/transparent-proxy.en.rst:58
 msgid ""
 "Inbound transparency is a proxy that is transparent to connections that are "
 "inbound to the proxy, i.e. a connection initiated by a client which "
@@ -59,7 +59,7 @@ msgid ""
 "i.e. a connection initiated by the proxy to an origin server (red-2)."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:66
+#: ../../admin/transparent-proxy.en.rst:65
 msgid ""
 "In most treatments these two types of transparency are treated as unitarily "
 "but that is not required. This implementation supports transparency "
@@ -67,7 +67,7 @@ msgid ""
 "transparency-use-cases>`_."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:71
+#: ../../admin/transparent-proxy.en.rst:70
 msgid ""
 "It is critical to note that any transparency requires specialized routing "
 "and cannot be done solely by configuring ATS. ATS transparency also "
@@ -75,28 +75,28 @@ msgid ""
 "on sufficiently recent Linux kernels that support the following features --"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:77
+#: ../../admin/transparent-proxy.en.rst:76
 msgid "TPROXY"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:78
+#: ../../admin/transparent-proxy.en.rst:77
 msgid "POSIX capabilities"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:80
+#: ../../admin/transparent-proxy.en.rst:79
 msgid ""
 "In addition the specialized routing will require using ``iptables`` and in "
 "some cases ``ebtables``."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:83
+#: ../../admin/transparent-proxy.en.rst:82
 msgid ""
 "Standard build procedures should work for transparency support but if not "
 "consult these :ref:`more detailed instructions <building-ats-for-"
 "transparency>`"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:86
+#: ../../admin/transparent-proxy.en.rst:85
 msgid ""
 "Transparency is configured per server port not globally. This is done via "
 "the configuration values :ts:cv:`proxy.config.http.server_ports`. In "
@@ -104,58 +104,58 @@ msgid ""
 "the client side is transparent. That should be fixed in a future patch."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:91
+#: ../../admin/transparent-proxy.en.rst:90
 msgid ""
 "In the first case use the attribute character (replacing the default 'X')"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:94
+#: ../../admin/transparent-proxy.en.rst:93
 msgid "**Attribute** **Transparency Style** **Reverse Proxy**"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:97
+#: ../../admin/transparent-proxy.en.rst:96
 msgid "``=``"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:97
+#: ../../admin/transparent-proxy.en.rst:96
 msgid "Full transparency: either"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:100
+#: ../../admin/transparent-proxy.en.rst:99
 msgid "``>``"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:100
+#: ../../admin/transparent-proxy.en.rst:99
 msgid "Inbound (client) transparency: enabled"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:103
+#: ../../admin/transparent-proxy.en.rst:102
 msgid "``<``"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:103
+#: ../../admin/transparent-proxy.en.rst:102
 msgid "Outbound (origin server) transparency: either"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:105
+#: ../../admin/transparent-proxy.en.rst:104
 msgid ""
 "In the outbound transparent case clients must connect directly to ATS "
 "either through an explicit proxy mechanism or by advertising the IP address "
 "of the ATS server via DNS as the origin server address."
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:109
+#: ../../admin/transparent-proxy.en.rst:108
 msgid "Some tested scenarios --"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:111
-msgid "`Transparent bridging <bridge>`_"
+#: ../../admin/transparent-proxy.en.rst:110
+msgid ":doc:`transparent-proxy/bridge.en`"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:112
-msgid "`Inline router <router-inline>`_"
+#: ../../admin/transparent-proxy.en.rst:111
+msgid ":doc:`transparent-proxy/router-inline.en`"
 msgstr ""
 
-#: ../../admin/transparent-proxy.en.rst:113
-msgid "`WCCP Configuration <wccp-configuration>`_"
+#: ../../admin/transparent-proxy.en.rst:112
+msgid ":doc:`transparent-proxy/wccp-configuration.en`"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/bridge.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/bridge.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/bridge.en.po
index cc0e7cd..512b99d 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/bridge.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/bridge.en.po
@@ -77,21 +77,6 @@ msgid ""
 "(from client to bridge) and red 1 (origin server to bridge)."
 msgstr ""
 
-#: ../../admin/transparent-proxy/bridge.en.rst:74
-msgid ""
-"In this example we will intercept port 80 (HTTP) traffic. We will use the "
-"``BROUTING`` chain because it is traversed only for packets that originated "
-"externally and arrived on a (forwarding enabled) interface. Although it "
-"looks like this will intercept all port 80 traffic it will only affect the "
-"two flows described above. ``-j redirect`` marks the packet as being "
-"diverted to the bridge and not forwarded, and the ``DROP`` target puts the "
-"packets in the normal ``iptables`` routing so that we can use standard "
-"device tests on them [1]_(#1). Although this example handles only port 80, "
-"other ports are the same except for the port value. Note also the port here "
-"is the port from the point of view of the clients and origin servers, not "
-"the Traffic Server server port. ::"
-msgstr ""
-
 #: ../../admin/transparent-proxy/bridge.en.rst:94
 msgid ""
 "Traffic Server operates at layer 3 so we need to use ``iptables`` to handle "
@@ -156,14 +141,6 @@ msgstr ""
 msgid "Additional troubleshooting"
 msgstr ""
 
-#: ../../admin/transparent-proxy/bridge.en.rst:140
-msgid "Check to make sure that ``iptables`` is not filtering (blocking)"
-msgstr ""
-
-#: ../../admin/transparent-proxy/bridge.en.rst:141
-msgid "incoming HTTP connections."
-msgstr ""
-
 #: ../../admin/transparent-proxy/bridge.en.rst:143
 msgid ""
 "It is frequently the case that the default tables prevent incoming HTTP. "
@@ -184,17 +161,53 @@ msgid ""
 "allowing HTTP traffic through."
 msgstr ""
 
-#: ../../admin/transparent-proxy/bridge.en.rst:157
-msgid "Verify that IP packet forwarding is enabled. You can check this with::"
-msgstr ""
-
-#: ../../admin/transparent-proxy/bridge.en.rst:171
+#: ../../admin/transparent-proxy/bridge.en.rst:173
 msgid "Footnotes"
 msgstr ""
 
-#: ../../admin/transparent-proxy/bridge.en.rst:173
+#: ../../admin/transparent-proxy/bridge.en.rst:175
 msgid ""
 "The ``--redirect-target`` can be omitted, but then the ``iptables`` rules "
 "would need to use ``--physdev`` instead of just ``-i``. The actual packet "
 "processing is identical."
 msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:74
+msgid ""
+"In this example we will intercept port 80 (HTTP) traffic. We will use the "
+"``BROUTING`` chain because it is traversed only for packets that originated "
+"externally and arrived on a (forwarding enabled) interface. Although it "
+"looks like this will intercept all port 80 traffic it will only affect the "
+"two flows described above. ``-j redirect`` marks the packet as being "
+"diverted to the bridge and not forwarded, and the ``DROP`` target puts the "
+"packets in the normal ``iptables`` routing so that we can use standard "
+"device tests on them [1]_. Although this example handles only port 80, "
+"other ports are the same except for the port value. Note also the port here "
+"is the port from the point of view of the clients and origin servers, not "
+"the Traffic Server server port. ::"
+msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:140
+msgid ""
+"Check to make sure that ``iptables`` is not filtering (blocking) incoming "
+"HTTP connections."
+msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:157
+msgid "Verify that IP packet forwarding is enabled."
+msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:159
+msgid "You can check this with::"
+msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:163
+msgid ""
+"The output should be a non-zero value (usually '1'). If it is zero, you can "
+"set it with::"
+msgstr ""
+
+#: ../../admin/transparent-proxy/bridge.en.rst:168
+msgid ""
+"This can setting can be persisted by putting it in ``/etc/sysctl.conf``: ::"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/router-inline.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/router-inline.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/router-inline.en.po
index fa1b2a0..02534d2 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/router-inline.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/router-inline.en.po
@@ -90,31 +90,30 @@ msgstr ""
 msgid "``proxy.config.http.server_port``"
 msgstr ""
 
-#: ../../admin/transparent-proxy/router-inline.en.rst:77
-msgid "``STRING`` Default: *value from* ```--on-port`` <#on_port>`_"
-msgstr ""
-
-#: ../../admin/transparent-proxy/router-inline.en.rst:80
-msgid ""
-"proxy.config.http.server_port_attr {#proxy.config.http.server_port_attr}"
-msgstr ""
-
-#: ../../admin/transparent-proxy/router-inline.en.rst:82
+#: ../../admin/transparent-proxy/router-inline.en.rst:81
 msgid "``STRING`` Default: ``=``"
 msgstr ""
 
-#: ../../admin/transparent-proxy/router-inline.en.rst:87
+#: ../../admin/transparent-proxy/router-inline.en.rst:86
 msgid "``proxy.config.reverse_proxy.enabled``"
 msgstr ""
 
-#: ../../admin/transparent-proxy/router-inline.en.rst:86
+#: ../../admin/transparent-proxy/router-inline.en.rst:85
 msgid "``INT`` Default: ``1``"
 msgstr ""
 
-#: ../../admin/transparent-proxy/router-inline.en.rst:91
+#: ../../admin/transparent-proxy/router-inline.en.rst:90
 msgid "``proxy.config.url_remap.remap_required``"
 msgstr ""
 
-#: ../../admin/transparent-proxy/router-inline.en.rst:90
+#: ../../admin/transparent-proxy/router-inline.en.rst:89
 msgid "``INT`` Default: ``0``"
 msgstr ""
+
+#: ../../admin/transparent-proxy/router-inline.en.rst:77
+msgid "``STRING`` Default: *value from* ``--on-port``"
+msgstr ""
+
+#: ../../admin/transparent-proxy/router-inline.en.rst:82
+msgid "``proxy.config.http.server_port_attr``"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/wccp-configuration.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/wccp-configuration.en.po 
b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/wccp-configuration.en.po
index 9c0dafd..a597d5c 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/wccp-configuration.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/transparent-proxy/wccp-configuration.en.po
@@ -36,15 +36,6 @@ msgid ""
 "and users continue to have Internet access."
 msgstr ""
 
-#: ../../admin/transparent-proxy/wccp-configuration.en.rst:36
-msgid ""
-"Use of WCCP only makes sense for client side transparency [1]_(#1) because "
-"if the clients are explicitly proxied by Traffic Server there's no benefit "
-"to WCCP fail open, as the clients will continue to directly access the "
-"unresponsive Traffic Server host. It would be better to adjust the routing "
-"tables on the router for explicit proxying."
-msgstr ""
-
 #: ../../admin/transparent-proxy/wccp-configuration.en.rst:42
 msgid ""
 "Because the router serves as the inline network element, Traffic Server "
@@ -124,14 +115,6 @@ msgid ""
 "server traffic share an interface."
 msgstr ""
 
-#: ../../admin/transparent-proxy/wccp-configuration.en.rst:86
-msgid ""
-"In general the dedicated topology is preferred. However, if the router has "
-"only two interfaces one of the shared topologies will be required [2]_(#2). "
-"Click the links above for more detailed configuration information on a "
-"specific topology."
-msgstr ""
-
 #: ../../admin/transparent-proxy/wccp-configuration.en.rst:92
 msgid "Shared interface issues"
 msgstr ""
@@ -145,18 +128,6 @@ msgid ""
 "the router has three or more interfaces."
 msgstr ""
 
-#: ../../admin/transparent-proxy/wccp-configuration.en.rst:100
-msgid ""
-"The basic concept for a shared interface is to use a tunnel to simulate the "
-"dedicated interface case. This enables the packets to be distinguished at "
-"layer 3. For this reason, layer 2 redirection cannot be used because the "
-"WCCP configuration cannot distinguish between packets returning from the "
-"origin server and packets returning from Traffic Server as they are "
-"distinguished only by layer 2 addressing [3]_(#3). Fortunately the GRE "
-"tunnel used for packet forwarding and return can be used as the simulated "
-"interface for Traffic Server."
-msgstr ""
-
 #: ../../admin/transparent-proxy/wccp-configuration.en.rst:110
 msgid "Frequently encountered problems"
 msgstr ""
@@ -206,3 +177,32 @@ msgstr ""
 msgid ""
 "This is not fundamentally impossible, as the packets are distinct in layer"
 msgstr ""
+
+#: ../../admin/transparent-proxy/wccp-configuration.en.rst:36
+msgid ""
+"Use of WCCP only makes sense for client side transparency [1]_ because if "
+"the clients are explicitly proxied by Traffic Server there's no benefit to "
+"WCCP fail open, as the clients will continue to directly access the "
+"unresponsive Traffic Server host. It would be better to adjust the routing "
+"tables on the router for explicit proxying."
+msgstr ""
+
+#: ../../admin/transparent-proxy/wccp-configuration.en.rst:86
+msgid ""
+"In general the dedicated topology is preferred. However, if the router has "
+"only two interfaces one of the shared topologies will be required [2]_ "
+"Click the links above for more detailed configuration information on a "
+"specific topology."
+msgstr ""
+
+#: ../../admin/transparent-proxy/wccp-configuration.en.rst:100
+msgid ""
+"The basic concept for a shared interface is to use a tunnel to simulate the "
+"dedicated interface case. This enables the packets to be distinguished at "
+"layer 3. For this reason, layer 2 redirection cannot be used because the "
+"WCCP configuration cannot distinguish between packets returning from the "
+"origin server and packets returning from Traffic Server as they are "
+"distinguished only by layer 2 addressing [3]_. Fortunately the GRE tunnel "
+"used for packet forwarding and return can be used as the simulated "
+"interface for Traffic Server."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/arch/cache/cache-appendix.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/arch/cache/cache-appendix.en.po 
b/doc/locale/ja/LC_MESSAGES/arch/cache/cache-appendix.en.po
index 3cd64fe..78e00e0 100644
--- a/doc/locale/ja/LC_MESSAGES/arch/cache/cache-appendix.en.po
+++ b/doc/locale/ja/LC_MESSAGES/arch/cache/cache-appendix.en.po
@@ -142,19 +142,6 @@ msgid ""
 "updated original URL if pristine headers is disabled."
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:73
-msgid ""
-"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."
-msgstr ""
-
-#: ../../arch/cache/cache-appendix.en.rst:75
-msgid ""
-"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."
-msgstr ""
-
 #: ../../arch/cache/cache-appendix.en.rst:77
 msgid ""
 "A plugin that changes the cache key *must* do so consistently for both "
@@ -165,7 +152,7 @@ msgid ""
 "detect such an occurrence."
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:79
+#: ../../arch/cache/cache-appendix.en.rst:81
 msgid ""
 "It is a requirement that the string be syntactically a URL but otherwise it "
 "is completely arbitrary and need not have any path. For instance if the "
@@ -174,13 +161,13 @@ msgid ""
 "key like ::"
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:83
+#: ../../arch/cache/cache-appendix.en.rst:85
 msgid ""
 "The scheme ``ngeo`` was picked because it is *not* a valid URL scheme and "
 "so will not collide with any valid URL."
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:85
+#: ../../arch/cache/cache-appendix.en.rst:87
 msgid ""
 "This can be useful if the URL encodes both important and unimportant data. "
 "Instead of storing potentially identical content under different URLs "
@@ -188,13 +175,13 @@ msgid ""
 "important parts could be created and used."
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:87
+#: ../../arch/cache/cache-appendix.en.rst:89
 msgid ""
 "For example, suppose the URL for Network Geographics content encoded both "
 "the document GUID and a referral key. ::"
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:91
+#: ../../arch/cache/cache-appendix.en.rst:93
 msgid ""
 "We don't want to the same content for every possible referrer. Instead we "
 "could use a plugin to convert this to the previous example and requests "
@@ -202,7 +189,7 @@ msgid ""
 "entry. Note that we would also map ::"
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:95
+#: ../../arch/cache/cache-appendix.en.rst:97
 msgid ""
 "to the same cache key. This can be handy for \"sharing\" content between "
 "servers when that content is identical. Note also the plugin can change the "
@@ -213,7 +200,7 @@ msgid ""
 "extract all relevant elements for use in the cache key."
 msgstr ""
 
-#: ../../arch/cache/cache-appendix.en.rst:97
+#: ../../arch/cache/cache-appendix.en.rst:99
 msgid ""
 "While there is explicit no requirement that the synthetic cache key be "
 "based on the HTTP request header, in practice it is generally necessary due "
@@ -224,3 +211,28 @@ msgid ""
 "that do not affect the content to minimize cache footprint and improve "
 "cache hit rates."
 msgstr ""
+
+#: ../../arch/cache/cache-appendix.en.rst:73
+msgid ""
+"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."
+msgstr ""
+
+#: ../../arch/cache/cache-appendix.en.rst:75
+msgid ""
+"If a greater degree of control is desired a plugin must be used to invoke "
+"the API call :c:func:`TSCacheUrlSet()` to provide a specific cache key.  "
+"The :c:func:`TSCacheUrlSet()` API can be called as early as "
+"``TS_HTTP_READ_REQUEST_HDR_HOOK``, but no later than "
+"``TS_HTTP_POST_REMAP_HOOK``. It can be called only once per transaction; "
+"calling it multiple times has no additional effect."
+msgstr ""
+
+#: ../../arch/cache/cache-appendix.en.rst:79
+msgid ""
+"If :c:func:`TSHttpTxnCacheLookupUrlGet()` is called after new cache url set "
+"by :c:func:`TSCacheUrlSet()`, it should use a URL location created by :c:"
+"func:`TSUrlCreate()` as its 3rd input parameter instead of getting url_loc "
+"from client request."
+msgstr ""

Reply via email to