Fix bug 43344. Correct typo. Patch provided by Tim Nowaczyk.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@610946 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml
index 7114f5d..dc12d8f 100644 (file)
--- a/conf/tomcat-users.xml
+++ b/conf/tomcat-users.xml
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <tomcat-users>
-<!--
+  <role rolename="manager"/>
   <role rolename="tomcat"/>
+  <role rolename="admin"/>
   <role rolename="role1"/>
+  <user username="both" password="tomcat" roles="tomcat,role1,manager,admin"/>
   <user username="tomcat" password="tomcat" roles="tomcat"/>
-  <user username="both" password="tomcat" roles="tomcat,role1"/>
   <user username="role1" password="tomcat" roles="role1"/>
--->
 </tomcat-users>

diff --git a/webapps/examples/jsp/tagplugin/if.jsp b/webapps/examples/jsp/tagplugin/if.jsp
index 7aa433b..408655c 100644 (file)
--- a/webapps/examples/jsp/tagplugin/if.jsp
+++ b/webapps/examples/jsp/tagplugin/if.jsp
@@ -25,7 +25,7 @@
     </br>
     <a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></a>
     <br/>
-    <a href="howto.html">Brief Instructions for Wrieting Plugins<font color="#0000FF"></a>
+    <a href="howto.html">Brief Instructions for Writing Plugins<font color="#0000FF"></a>
     <br/> <br/>
     <hr>