[struts-site] branch master updated: Replaces ([A-Z, a-z, 0-9].)\n\n~~~~~~~\n([^\n]+)\n~~~~~~~\n(.[A-Z, a-z, 0-9]) with $1`$2`$3

[ya...@apache.org]

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 879a5b1  Replaces ([A-Z,a-z,0-9].)\n\n~~~~~~~\n([^\n]+)\n~~~~~~~\n(.[A-Z,a-z,0-9]) with $1`$2`$3
879a5b1 is described below

commit 879a5b136f0be6401619b5e934bd61dbdc070732
Author: Yasser Zamani <ya...@apache.org>
AuthorDate: Thu Nov 23 22:11:00 2017 +0330

    Replaces ([A-Z,a-z,0-9].)\n\n~~~~~~~\n([^\n]+)\n~~~~~~~\n(.[A-Z,a-z,0-9]) with $1`$2`$3
---
 source/core-developers/file-upload.md | 21 +++------------------
 source/tag-developers/velocity.md     |  7 +------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/source/core-developers/file-upload.md b/source/core-developers/file-upload.md
index 5a2f2f1..1e625c5 100644
--- a/source/core-developers/file-upload.md
+++ b/source/core-developers/file-upload.md
@@ -271,12 +271,7 @@ public class MultipleFileUploadUsingListAction extends ActionSupport {
 
 ## Advanced Configuration
 
-The Struts 2 
-
-~~~~~~~
-default.properties
-~~~~~~~
- file defines several settings that affect the behavior of file uploading\. You may find in necessary to change these values\. The names and default values are:
+The Struts 2 `default.properties` file defines several settings that affect the behavior of file uploading\. You may find in necessary to change these values\. The names and default values are:
 
 
 ~~~~~~~
@@ -326,12 +321,7 @@ Additionally the `fileUpload` interceptor has settings that can be put in place
 
 __File Size Limits__
 
-There are two separate file size limits\. First is `struts.multipart.maxSize` which comes from the Struts 2 
-
-~~~~~~~
-default.properties
-~~~~~~~
- file\. This setting exists for security reasons to prohibit a malicious user from uploading extremely large files to file up your servers disk space\. This setting defaults to approximately 2 megabytes and should be adjusted to the maximum size file (2 gigs max) that your will need the framework to receive\. If you are uploading more than one file on a form the `struts.multipart.maxSize` applies to the combined total, not the individual file sizes\. The other setting, 
+There are two separate file size limits\. First is `struts.multipart.maxSize` which comes from the Struts 2 `default.properties` file\. This setting exists for security reasons to prohibit a malicious user from uploading extremely large files to file up your servers disk space\. This setting defaults to approximately 2 megabytes and should be adjusted to the maximum size file (2 gigs max) that your will need the framework to receive\. If you are uploading more than one file on a form the [...]
 
 ~~~~~~~
 maximumSize
@@ -397,12 +387,7 @@ If an error occurs several field errors will be added assuming that the action i
 
 __Temporary Directories__
 
-All uploaded files are saved to a temporary directory by the framework before being passed in to an Action\. Depending on the allowed file sizes it may be necessary to have the framework store these temporary files in an alternate location\. To do this change `struts.multipart.saveDir` to the directory where the uploaded files will be placed\. If this property is not set it defaults to `javax.servlet.context.tempdir`\. Keep in mind that on some operating systems, like Solaris, 
-
-~~~~~~~
-/tmp
-~~~~~~~
- is memory based and files stored in that directory would consume an amount of RAM approximately equal to the size of the uploaded file\.
+All uploaded files are saved to a temporary directory by the framework before being passed in to an Action\. Depending on the allowed file sizes it may be necessary to have the framework store these temporary files in an alternate location\. To do this change `struts.multipart.saveDir` to the directory where the uploaded files will be placed\. If this property is not set it defaults to `javax.servlet.context.tempdir`\. Keep in mind that on some operating systems, like Solaris, `/tmp` is  [...]
 
 __Alternate Libraries__
 
diff --git a/source/tag-developers/velocity.md b/source/tag-developers/velocity.md
index d51743c..44d4001 100644
--- a/source/tag-developers/velocity.md
+++ b/source/tag-developers/velocity.md
@@ -81,12 +81,7 @@ In Velocity, there are three sources for variables, searched in a specific order
 
 3. Built-in variables
 
-Since the action context is resolved after the value stack, you can reference the variable without the typical preceding marker (#) that has to be used with the JSP 
-
-~~~~~~~
-s:property
-~~~~~~~
- tag. Omitting the marker can be convenient, but it can also trip you up, if used carelessly.
+Since the action context is resolved after the value stack, you can reference the variable without the typical preceding marker (#) that has to be used with the JSP `s:property` tag. Omitting the marker can be convenient, but it can also trip you up, if used carelessly.
 
 
 ~~~~~~~

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