From ed7113843566f86b0bc698b9dfe85375c097569c Mon Sep 17 00:00:00 2001
From: Sam Davis
Date: Fri, 23 May 2014 13:09:56 -0700
Subject: 435342: regenerate help for 3.12

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=435342
---
 org.eclipse.mylyn.help.ui/Mylyn/FAQ/Bugzilla-Connector.html |  4 +++-
 org.eclipse.mylyn.help.ui/Mylyn/FAQ/Misc.html               | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Bugzilla-Connector.html b/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Bugzilla-Connector.html
index f7119651a..49010fbd8 100644
--- a/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Bugzilla-Connector.html
+++ b/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Bugzilla-Connector.html
@@ -192,7 +192,9 @@
 			</li>
 		</ul>
 		<ul>
-			<li>The server setting "Timezone used to display dates and times" must be set to "Same as Server," otherwise you will get a security token error when performing any submit operation other than submitting a new bug.</li>
+			<li>The server setting "Timezone used to display dates and times" must be set to "Same as Server," otherwise you will get a security token error when performing any submit operation other than submitting a new bug. This may also manifest as a midair collision. (
+				<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=429523" target="mylyn_external">bug#429523</a>)
+			</li>
 		</ul><hr/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
diff --git a/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Misc.html b/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Misc.html
index 291b2d794..58a5e33e9 100644
--- a/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Misc.html
+++ b/org.eclipse.mylyn.help.ui/Mylyn/FAQ/Misc.html
@@ -116,6 +116,18 @@
 					<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=413191" target="mylyn_external">bug 413191</a> for more info.
 				</td>
 			</tr>
+			<tr>
+				<td><code>org.eclipse.mylyn.http.connections.per.host</code></td>
+				<td><center>3.12</center></td>
+				<td>100</td>
+				<td>The maximum number of connections to be used per host by HTTP connection managers.</td>
+			</tr>
+			<tr>
+				<td><code>org.eclipse.mylyn.http.total.connections</code></td>
+				<td><center>3.12</center></td>
+				<td>1000</td>
+				<td>The maximum number of connections allowed by HTTP connection managers.</td>
+			</tr>
 		</table>
 		<h2 id="How_can_I_report_a_dead-lock_or_a_problem_about_a_stalled_UI.3F">How can I report a dead-lock or a problem about a stalled UI?</h2>
 		<p>The recommended way is to file a bug with a full thread dump using jstack which is part of the Java Development Kit 6. These wiki pages have more details on using jstack on different platforms: </p>
-- 
cgit v1.2.3