[struts-site] branch asf-site updated: Updates production by Jenkins

2018-01-06 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 91b53bf  Updates production by Jenkins
91b53bf is described below

commit 91b53bf18f289fdcfad4d46145c7e7ebd00962f2
Author: jenkins 
AuthorDate: Sat Jan 6 09:31:05 2018 +

Updates production by Jenkins
---
 content/core-developers/web-xml.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/core-developers/web-xml.html 
b/content/core-developers/web-xml.html
index 70c157d..5884f2f 100644
--- a/content/core-developers/web-xml.html
+++ b/content/core-developers/web-xml.html
@@ -201,7 +201,7 @@ and execution phase
 This is because Struts 2 serves static content from its jar files, including 
Dojo JavaScript files (if using S2.0, 
 or the Dojo plugin in S2.1+) and FreeMarker templates for the Struts 2 tags 
that produce HTML.
 
-If we change the filter mapping to something else, for example /*.html, we must take this in to account and 
extract 
+If we change the filter mapping to something else, for example /*.html, we must take this into account and 
extract 
 the content that would normally be served from the Struts 2 jar files, or some 
other solution.
 
 Since Struts 2.1.7, you are able to provide a comma separated list of 
patterns for which when matching against 

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] branch master updated (0aa0277 -> 217037e)

2018-01-06 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from 0aa0277  Uses proper extension
 add 307f62c  I think it should be "into" instead of "in to" ^_^
 new 217037e  Merge pull request #91 from fanofxiaofeng/patch-13

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/core-developers/web-xml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] 01/01: Merge pull request #91 from fanofxiaofeng/patch-13

2018-01-06 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 217037e0146d6bc83efa91a1d10d26cb2c56a487
Merge: 0aa0277 307f62c
Author: Lukasz Lenart 
AuthorDate: Sat Jan 6 10:17:11 2018 +0100

Merge pull request #91 from fanofxiaofeng/patch-13

I think it should be "into" instead of "in to" ^_^

 source/core-developers/web-xml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .