opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
* stable-2.10:
  Fix broken formatting in Tomcat reverse proxy config documentation
  Mention the push %l-parameter in the documentation
  Revert "CM3: Add reStructuredText mode"
  Fix example in documentation of Set User Preferences endpoint
  Update replication plugin to latest version

Conflicts:
	Documentation/user-upload.txt

Change-Id: I70ce0e5315502f7745253f7ada93c340faa44878
This commit is contained in:
David Pursehouse
2014-10-21 17:16:23 +09:00
parent 4b64b89911 7eaea57f8d
commit 76235c76e6
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Documentation/install-j2ee.txt
View File

@@ -109,15 +109,18 @@ Under Jetty, restarting the web application (e.g. after modifying
`system_config`) is as simple as touching the context config file: `system_config`) is as simple as touching the context config file:
`'$JETTY_HOME'/contexts/gerrit.xml` `'$JETTY_HOME'/contexts/gerrit.xml`
[[tomcat]]
== Tomcat 7.x == Tomcat 7.x
[TIP] If a reverse proxy is used in front of Tomcat then see the
If reverse proxy is used in front of Tomcat then see the configuration link:config-reverseproxy.html[configuration instructions for encoding
instructions for encoding slashes link:config-reverseproxy.html. Otherwise slashes]. Otherwise Tomcat must be configured to encode slashes, by adding
Tomcat must be configured to encode slashes, by adding `-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true` to the
-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true to `CATALINA_OPTS` environment variable.
CATALINA_OPTS environment variable. Excerpt from the documentation
https://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html: Excerpt from the
link:https://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html[
documentation]:
---- ----
Property org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH: Property org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH:

2
Documentation/rest-api-accounts.txt
View File

@@ -908,7 +908,7 @@ link:#preferences-input[PreferencesInput] entity.
.Request .Request
---- ----
GET /a/accounts/self/preferences HTTP/1.0 PUT /a/accounts/self/preferences HTTP/1.0
Content-Type: application/json;charset=UTF-8 Content-Type: application/json;charset=UTF-8
{ {

1
Documentation/user-upload.txt
View File

@@ -155,6 +155,7 @@ updates:
git push ssh://john.doe@git.example.com:29418/kernel/common HEAD:refs/for/experimental%topic=driver/i42 git push ssh://john.doe@git.example.com:29418/kernel/common HEAD:refs/for/experimental%topic=driver/i42
==== ====
[[review_labels]]
Review labels can be applied to the change by using the `label` (or `l`) Review labels can be applied to the change by using the `label` (or `l`)
option in the reference: option in the reference: