Merge branch 'stable-2.10'

* 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

Documentation/install-j2ee.txt

@@ -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:
 `'$JETTY_HOME'/contexts/gerrit.xml`
 
+[[tomcat]]
 == Tomcat 7.x
 
-[TIP]
-If reverse proxy is used in front of Tomcat then see the configuration
-instructions for encoding slashes link:config-reverseproxy.html. Otherwise
-Tomcat must be configured to encode slashes, by adding
--Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true to
-CATALINA_OPTS environment variable. Excerpt from the documentation
-https://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html:
+If a reverse proxy is used in front of Tomcat then see the
+link:config-reverseproxy.html[configuration instructions for encoding
+slashes]. Otherwise Tomcat must be configured to encode slashes, by adding
+`-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true` to the
+`CATALINA_OPTS` environment variable.
+
+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:

Documentation/rest-api-accounts.txt

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

Documentation/user-upload.txt

@@ -155,6 +155,7 @@ updates:
   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`)
 option in the reference: