diff --git a/ground/controllers/ArticlesController.php b/ground/controllers/ArticlesController.php
index 78b8228..03b3428 100644
--- a/ground/controllers/ArticlesController.php
+++ b/ground/controllers/ArticlesController.php
@@ -55,7 +55,7 @@ class ArticlesController extends Controller
 			App::error404();
 		}
 
-		App::setConfig('title', $article->title . ' - wikipoints.ru');
+		App::setConfig('title', $article->title . ' :: Статьи на wikipoints.ru');
 
 		self::render('articles/edit.php', array(
 			'article' => $article,
@@ -77,6 +77,7 @@ class ArticlesController extends Controller
 		$title = $_POST['title'];
 		$text = $_POST['text'];
 		$text = strip_tags($text);
+		$text = str_replace(array('<','>','"',"'",'--'), array('&lt;','&gt;','&Prime;','&prime;','&ndash;'), $text);
 		$allowComments = (int) isset($_POST['allowComments']);
 
 		$article = $id ? Article::model()->getByPK($id) : new Article();
diff --git a/ground/views/articles/edit.php b/ground/views/articles/edit.php
index 0210a8b..3cd0638 100644
--- a/ground/views/articles/edit.php
+++ b/ground/views/articles/edit.php
@@ -61,6 +61,7 @@ function insertAtCursor(myField, myValue) {
 					<div class="form-group">
 						<label for="articleText">Текст статьи</label>
 						<textarea name="text" id="articleText" class="form-control" rows="10"><?= $article->text ?></textarea>
+						<i>*текст*</i> <b>**текст**</b> <b><i>***текст***</i></b> <a href="#">http://ссылка.ру</a> # заголвок1 ## заголовк2 ### заголовк3 [#512|ссылка на точку 512]
 					</div>
 
 					<div class="checkbox">