BugTrack2/2: merged with r1_4_7.

[pukiwiki/pukiwiki.git] / wiki.en / 48656C70.txt

diff --git a/wiki.en/48656C70.txt b/wiki.en/48656C70.txt
index 2c604d0..5c17349 100644 (file)
--- a/wiki.en/48656C70.txt
+++ b/wiki.en/48656C70.txt
@@ -1,12 +1,12 @@
+#freeze
 #contents
 -[[FAQ(PukiWiki-official)>pukiwiki:PukiWiki/FAQ]](Japanese)
--[[Text Formatting Rule Abstract>FormatRule]] (also included as the last part of this page)
---[[Text Formatting Rule>TextFormattingRule]] (now preparing. Please refer to pukiwiki.dev site: [[Text Formatting Rule:http://pukiwiki.sourceforge.jp/dev/index.php?cmd=read&page=%3ACategoryDev%2FDocument%2FText%20Formatting%20Rule]].)
+-[[Text Formatting Rules Abstract>FormattingRules]]
 -[[Plugin Help>PluginHelp]]
 
 ***What's PukiWiki? [#vf6f358a]
 Anyone can edit all of the pages((except for pages frozen by the administrators)) in the PukiWiki. You move to the page you want to edit, and click "[ Edit ]" at the top of the page. Then you can see a textfield, in which you can edit the descriptions of page.
-The edited content are formed by the [[FormatRule]].
+The edited content are formed by the [[FormattingRules]].
 
 You can edit the page [[ForPractice]] in any way as a rule. So we advise you to try and edit a page!
 
@@ -26,5 +26,3 @@ Yes! In WikiClone, such as PukiWiki, anyone can dirty, remove, and even ruin pag
 If another person is editing the page you are editing, what happens? It's OK. PukiWiki checks the differences between the changes on the original page and your modifications, by comparing the date of the  updated original page with the date of your updated page. 
 
 In the case of conflict, you should reload the page you have edited and try to edit it again.
-
-#include(FormatRule)