Merge branch 'pr9'
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/b93572c8 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/b93572c8 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/b93572c8 Branch: refs/heads/master Commit: b93572c861fb17bd15a4a657475fef7b98f6e6be Parents: aaa6464 b2e8be3 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Tue Apr 18 07:36:35 2017 +0200 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Apr 18 07:36:35 2017 +0200 ---------------------------------------------------------------------- .../att14974992_Basic_Struts2_Mvn.png | Bin 18234 -> 0 bytes .../attachments/att14974993_Hello.png | Bin 13038 -> 0 bytes .../att14974994_Struts2HelloWorld.png | Bin 20676 -> 0 bytes .../attachments/basic_struts2_maven_jsp.png | Bin 0 -> 8387 bytes .../attachments/helloworld_hello_action.png | Bin 0 -> 7009 bytes .../attachments/helloworld_index_action.png | Bin 0 -> 9653 bytes .../hello-world-using-struts2.md | 108 ++++++------- .../how-to-create-a-struts2-web-application.md | 151 +++++++++++-------- 8 files changed, 137 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-site/blob/b93572c8/source/getting-started/hello-world-using-struts2.md ---------------------------------------------------------------------- diff --cc source/getting-started/hello-world-using-struts2.md index 10a0cec,be719a3..21accab --- a/source/getting-started/hello-world-using-struts2.md +++ b/source/getting-started/hello-world-using-struts2.md @@@ -168,19 -158,19 +158,19 @@@ First add the taglib directive at the t **index.jsp** - ```html - <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + ```jsp + <!DOCTYPE html> + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> - <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> <html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Basic Struts 2 Application - Welcome</title> - </head> - <body> - <h1>Welcome To Struts 2!</h1> - <p><a href="<s:url action='hello'/>">Hello World</a></p> - </body> + <head> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> ++ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Basic Struts 2 Application - Welcome</title> + </head> + <body> + <h1>Welcome To Struts 2!</h1> + <p><a href="<s:url action='hello'/>">Hello World</a></p> + </body> </html> ``` http://git-wip-us.apache.org/repos/asf/struts-site/blob/b93572c8/source/getting-started/how-to-create-a-struts2-web-application.md ----------------------------------------------------------------------
