[struts-site] branch master updated: Replaces some of old absolute /docs references

2017-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 4c2e8df  Replaces some of old absolute /docs references
4c2e8df is described below

commit 4c2e8dfbc0669f3323c4da79dd5c947375948d5f
Author: Yasser Zamani 
AuthorDate: Wed Nov 22 12:06:02 2017 +0330

Replaces some of old absolute /docs references
---
 .../conversion-error-field-validator-annotation.md | 26 +++---
 source/core-developers/type-conversion.md  |  4 
 source/security/index.md   |  2 +-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git 
a/source/core-developers/conversion-error-field-validator-annotation.md 
b/source/core-developers/conversion-error-field-validator-annotation.md
index 86b9187..1501bf6 100644
--- a/source/core-developers/conversion-error-field-validator-annotation.md
+++ b/source/core-developers/conversion-error-field-validator-annotation.md
@@ -5,28 +5,16 @@ title: ConversionErrorFieldValidator Annotation
 
 # ConversionErrorFieldValidator Annotation
 
-
-
-{% comment %}start snippet 
id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
- This validator checks if there are any conversion errors for a field and 
applies them if they exist.
- See https://struts.apache.org/docs/type-conversion.html#TypeConversion-TypeConversionErrorHandling";>Type
 Conversion Error Handling for details.
-
-{% comment %}end snippet 
id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
+This validator checks if there are any conversion errors for a field and 
applies them if they exist.
+See [Type Conversion Error 
Handling](type-conversion.html#type-conversion-error-handling) for details.
 
 ## Usage
 
+The `ConversionErrorFieldValidator` annotation must be applied at method level.
 
 
-{% comment %}start snippet 
id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
- The ConversionErrorFieldValidator annotation must be applied at method 
level.
-
-{% comment %}end snippet 
id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
-
 ## Parameters
 
-
-
-{% comment %}start snippet 
id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
  
  
   Parameter 
@@ -72,17 +60,9 @@ title: ConversionErrorFieldValidator Annotation
  
  
 
-{% comment %}end snippet 
id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
 
 ## Examples
 
-
-
-{% comment %}start snippet 
id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
-
 ```java
  @ConversionErrorFieldValidator(message = "Default message", key = "i18n.key", 
shortCircuit = true)
-
 ```
-
-{% comment %}end snippet 
id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator
 {% endcomment %}
diff --git a/source/core-developers/type-conversion.md 
b/source/core-developers/type-conversion.md
index 5cc568c..744c3c0 100644
--- a/source/core-developers/type-conversion.md
+++ b/source/core-developers/type-conversion.md
@@ -4,6 +4,10 @@ title: Type Conversion
 ---
 
 # Type Conversion
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
 
 Routine type conversion in the framework is transparent. Generally, all you 
need to do is ensure that HTML inputs have 
 names that can be used in [OGNL](ognl.html) expressions. (HTML inputs are form 
elements and other GET/POST parameters.)
diff --git a/source/security/index.md b/source/security/index.md
index da7708f..d79756c 100644
--- a/source/security/index.md
+++ b/source/security/index.md
@@ -16,7 +16,7 @@ The Apache Struts 2 doesn't provide any security mechanism - 
it is just a pure w
 
 ### Restrict access to the Config Browser Plugin
 
-[Config Browser 
Plugin](https://struts.apache.org/docs/config-browser-plugin.html) exposes 
internal configuration and should be used only during development phase. If you 
must use it on production site, we strictly recommend restricting access to it 
- you can use  Basic Authentication or any other security mechanism (e.g. 
[Apache Shiro](https://shiro.apache.org/))
+[Config Browser Plugin](../plugins/config-browser/) exposes internal 
configuration and should be used only during development phase. If you must use 
it on production site, we strictly recommend restricting access to it - you can 
use  Basic Authentication or any other security mechanism (e.g. [Apache 
Shiro](https://shiro.apache.org/))

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

2017-11-22 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 e47610e  Updates production by Jenkins
e47610e is described below

commit e47610e2ddf432ad9a309cca6cdfc2a913ea6c70
Author: jenkins 
AuthorDate: Wed Nov 22 08:37:25 2017 +

Updates production by Jenkins
---
 ...onversion-error-field-validator-annotation.html | 10 +++-
 content/core-developers/type-conversion.html   | 28 +-
 content/security/index.html|  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git 
a/content/core-developers/conversion-error-field-validator-annotation.html 
b/content/core-developers/conversion-error-field-validator-annotation.html
index af5ea3c..50c2c5c 100644
--- a/content/core-developers/conversion-error-field-validator-annotation.html
+++ b/content/core-developers/conversion-error-field-validator-annotation.html
@@ -128,14 +128,12 @@
 https://github.com/apache/struts-site/edit/master/source/core-developers/conversion-error-field-validator-annotation.md";
 title="Edit this page on GitHub">Edit on GitHub
 ConversionErrorFieldValidator 
Annotation
 
- This validator checks if there are any conversion errors for a field and 
applies them if they exist.
- See https://struts.apache.org/docs/type-conversion.html#TypeConversion-TypeConversionErrorHandling";>Type
 Conversion Error Handling for details.
-
+This validator checks if there are any conversion errors for a field and 
applies them if they exist.
+See Type 
Conversion Error Handling for details.
 
 Usage
 
- The ConversionErrorFieldValidator annotation must be applied at method 
level.
-
+The ConversionErrorFieldValidator 
annotation must be applied at method level.
 
 Parameters
 
@@ -188,11 +186,9 @@
 Examples
 
  @ConversionErrorFieldValidator(message = "Default 
message", key = "i18n.key", 
shortCircuit = true)
-
 
 
 
-
   
 
 
diff --git a/content/core-developers/type-conversion.html 
b/content/core-developers/type-conversion.html
index d22b98e..27839ec 100644
--- a/content/core-developers/type-conversion.html
+++ b/content/core-developers/type-conversion.html
@@ -126,7 +126,33 @@
   
 << back to Core 
Developers Guide
 https://github.com/apache/struts-site/edit/master/source/core-developers/type-conversion.md";
 title="Edit this page on GitHub">Edit on GitHub
-Type Conversion
+Type Conversion
+
+
+  Built in Type Conversion 
Support
+  Relationship to Parameter 
Names
+  Creating a Type Converter
+  Applying a Type 
Converter to an Action
+  Applying a Type 
Converter to a bean or model
+  Applying a Type 
Converter for an application
+  A Simple 
Example
+  Advanced Type Conversion
+  Null Property Handling
+
+  
+  Collection and Map Support

+  Indexing
 a collection by a property of that collection
+  An advanced 
example for indexed Lists and Maps
+
+  
+  Type Conversion Error 
Handling
+  Common 
Problems
+  Null and Blank Values
+  Interfaces
+  Generics and Erasure
+
+  
+
 
 Routine type conversion in the framework is transparent. Generally, all you 
need to do is ensure that HTML inputs have 
 names that can be used in OGNL expressions. (HTML 
inputs are form elements and other GET/POST parameters.)
diff --git a/content/security/index.html b/content/security/index.html
index 72da646..b3d95dc 100644
--- a/content/security/index.html
+++ b/content/security/index.html
@@ -156,7 +156,7 @@
 
 Restrict access to the 
Config Browser Plugin
 
-https://struts.apache.org/docs/config-browser-plugin.html";>Config 
Browser Plugin exposes internal configuration and should be used only 
during development phase. If you must use it on production site, we strictly 
recommend restricting access to it - you can use  Basic Authentication or any 
other security mechanism (e.g. https://shiro.apache.org/";>Apache 
Shiro)
+Config Browser Plugin exposes 
internal configuration and should be used only during development phase. If you 
must use it on production site, we strictly recommend restricting access to it 
- you can use  Basic Authentication or any other security mechanism (e.g. https://shiro.apache.org/";>Apache Shiro)
 
 Don’t mix 
different access levels in the same namespace
 

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


[struts-examples] branch master updated (2ea5a74 -> 20ac206)

2017-11-22 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-examples.git.


from 2ea5a74  Merge pull request #20 from yasserzamani/S2_5_13
 add 818d060  Maybe it should be "then"
 new 20ac206  Merge pull request #21 from fanofxiaofeng/patch-1

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:
 helloworld/src/main/resources/struts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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


[struts-examples] 01/01: Merge pull request #21 from fanofxiaofeng/patch-1

2017-11-22 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-examples.git

commit 20ac20625686698ad2f0ff5ff38008c7fd292b34
Merge: 2ea5a74 818d060
Author: Lukasz Lenart 
AuthorDate: Wed Nov 22 12:07:10 2017 +0100

Merge pull request #21 from fanofxiaofeng/patch-1

Maybe it should be "then"

 helloworld/src/main/resources/struts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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


[struts-site] 01/01: Merge pull request #32 from fanofxiaofeng/patch-1

2017-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

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

commit b5c7a75dcdf83ca2c3d5b8ef6ba895cea1ca88b5
Merge: 4c2e8df b22fc99
Author: Yasser Zamani 
AuthorDate: Wed Nov 22 15:48:06 2017 +0330

Merge pull request #32 from fanofxiaofeng/patch-1

Maybe it should be "than"

 source/getting-started/using-tags.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] branch master updated (4c2e8df -> b5c7a75)

2017-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

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


from 4c2e8df  Replaces some of old absolute /docs references
 add b22fc99  Maybe it should be "than"
 new b5c7a75  Merge pull request #32 from fanofxiaofeng/patch-1

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/getting-started/using-tags.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] branch asf-site updated: Updates production by Jenkins

2017-11-22 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 ad06873  Updates production by Jenkins
ad06873 is described below

commit ad06873b4dd81b88f6211dd64faf27f3357bc1a9
Author: jenkins 
AuthorDate: Wed Nov 22 12:18:49 2017 +

Updates production by Jenkins
---
 content/getting-started/using-tags.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/getting-started/using-tags.html 
b/content/getting-started/using-tags.html
index cb37181..299dcd3 100644
--- a/content/getting-started/using-tags.html
+++ b/content/getting-started/using-tags.html
@@ -215,7 +215,7 @@ a query string parameter and its value use the Struts 2 
param tag, nested inside
 ...
 
 
-Rather then put the url tag as the value for the anchor tag’s href 
attribute, we’ve separated out the s:url tag into 
+Rather than put the url tag as the value for the anchor tag’s href 
attribute, we’ve separated out the s:url tag into 
 its own code block. Nested inside the url tag is the Struts 2 param tag. This 
tag lets you specify a parameter name (
 e.g. userName) and a value for that parameter (e.g. Bruce Phillips).
 

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