[tomcat-training] branch master updated: First pass at ApacheCon 2020 updates

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[tomcat-training] branch master updated: First pass at ApacheCon 2020 updates

markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-training.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e66341  First pass at ApacheCon 2020 updates
0e66341 is described below

commit 0e66341a23f12c77bb7e3ae5ca39f6f58fd28b5d
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 16 13:40:57 2020 +0100

    First pass at ApacheCon 2020 updates
---
 modules/background-01.html | 12 +++++++-----
 modules/intro.html         |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/background-01.html b/modules/background-01.html
index 5bd79cd..5fd91b4 100644
--- a/modules/background-01.html
+++ b/modules/background-01.html
@@ -33,7 +33,7 @@
     <br>
     Tomcat 9 and 8.5 require Java 9 for pure Java HTTP/2 support
     <br>
-    Tomcat 7 requires Java 7 for JSR 356
+    Tomcat 7 requires Java 7 for Java WebSocket support
   </aside>
 </section>
 <section>
@@ -125,10 +125,13 @@
   <h3>File structure</h3>
   <p>conf/tomcat-users.xml</p>
   <p>Configures users for default Realm</p>
-  <p>Only read at Tomcat start</p>
+  <p>Monitored for updates by default</p>
+  <p></p>
   <p>XML schema file provided</p>
   <aside class="notes">
     Not ideal choice for production. Can use it with JMX.
+    <br/>
+    Used to be only read at Tomcat start
   </aside>
 </section>
 <section>
@@ -193,12 +196,11 @@
 <section>
   <h3>Running as a Service</h3>
   <p>Windows</p>
-  <p>Runs as Local System by default</p>
-  <p>Consider using 'NT AUTHORITY\LocalService'</p>
+  <p>Runs as Local Service by default</p>
   <p>(no password)</p>
-  <p>See also <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=55969">Bug 55969</a></p>
   <aside class="notes">
     Patches welcome. Windows installer is easy to build.
+    Used to be Local System
   </aside>
 </section>
 <section>
diff --git a/modules/intro.html b/modules/intro.html
index b37e88f..55ae55b 100644
--- a/modules/intro.html
+++ b/modules/intro.html
@@ -49,7 +49,8 @@
   <p>Issue tracker: <a href="https://bz.apache.org/bugzilla">https://bz.apache.org/bugzilla</a>
   <p>Stack overflow</p>
   <aside class="notes">
-    Master source code currently in svn but looking to move to git soon.
+    Master source code in git. Used to be svn. History for 6.0.x and earlier
+    only available in svn.
     <br>
     Aim to fix all open bugs (not enhancements) before next release. Monthly release cycle.
   </aside>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]