From 17c78064b8de485d20e59aa43c7cba6e995a2a0e Mon Sep 17 00:00:00 2001
From: PeterThoeny <PeterThoeny>
Date: Sun, 5 Jan 2003 05:13:39 +0000
Subject: [PATCH] none

---
 TWiki/ManagingWebs.mdwn   |  2 +-
 TWiki/TWikiFAQ.mdwn       |  2 +-
 TWiki/TWikiSkins.mdwn     | 16 ++++------------
 TWiki/TWikiTemplates.mdwn |  4 ++--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/TWiki/ManagingWebs.mdwn b/TWiki/ManagingWebs.mdwn
index e491c17..26cad6b 100644
--- a/TWiki/ManagingWebs.mdwn
+++ b/TWiki/ManagingWebs.mdwn
@@ -21,7 +21,7 @@ A [[TWikiSite]] is divided into webs; each one represents one subject, one area
 
 ## <a name="Adding a New Web"></a> Adding a New Web
 
-<form action="http://www.dementia.org/twiki//manage/%WEBURLENDODED%/%TOPICURLENDODED%" method="post" name="admin"> Create a new web by filling out this form. <strong><em>Note:</em></strong> It is not recommended to create a new web for each little project. You can organize content within a web using [[Main/TWikiForms]] and [[Main/FormattedSearch]]. Cross-linking topics and search is easier if there are only a few larger webs. <table border="1" cellpadding="0" cellspacing="0">
+<form action="http://www.dementia.org/twiki//manage/%WEB%/%TOPIC%" method="post" name="admin"> Create a new web by filling out this form. <strong><em>Note:</em></strong> It is not recommended to create a new web for each little project. You can organize content within a web using [[Main/TWikiForms]] and [[Main/FormattedSearch]]. Cross-linking topics and search is easier if there are only a few larger webs. <table border="1" cellpadding="0" cellspacing="0">
     <tr>
       <th align="right" bgcolor="#99CCCC"><strong> Name of new web: </strong></th>
       <td><input name="newweb" size="16" type="text" value="" /></td>
diff --git a/TWiki/TWikiFAQ.mdwn b/TWiki/TWikiFAQ.mdwn
index 94470f9..bdc6a6f 100644
--- a/TWiki/TWikiFAQ.mdwn
+++ b/TWiki/TWikiFAQ.mdwn
@@ -12,7 +12,7 @@ Incorrect format of search template (missing sections? There should be 4 %SPLIT%
 
 **_NOTE:_** The FAQs here are for frequently asked questions **_including_** answers; please ask support questions in the TWiki:Support web. New FAQ topics are based on the [[TWikiFaqTemplate]].
 
-<form action="http://www.dementia.org/twiki//edit/%WEBURLENCODED%/"> New FAQ topic:   (Use a name in [[TWiki/WikiNotation]]) <br /><input name="topic" size="32" type="text" /> <input name="onlywikiname" type="hidden" value="on" /> <input name="templatetopic" type="hidden" value="TWikiFaqTemplate" /> <input type="submit" value="Create Topic" /><br />
+<form action="http://www.dementia.org/twiki//edit/%WEB%/"> New FAQ topic:   (Use a name in [[TWiki/WikiNotation]]) <br /><input name="topic" size="32" type="text" /> <input name="onlywikiname" type="hidden" value="on" /> <input name="templatetopic" type="hidden" value="TWikiFaqTemplate" /> <input type="submit" value="Create Topic" /><br />
 </form>
 
 ## <a name="More sources..."></a> More sources...
diff --git a/TWiki/TWikiSkins.mdwn b/TWiki/TWikiSkins.mdwn
index 2fad1fc..94a0a81 100644
--- a/TWiki/TWikiSkins.mdwn
+++ b/TWiki/TWikiSkins.mdwn
@@ -67,19 +67,11 @@ You can use [[template variables|Main/TWikiTemplates#TemplateVariables]], [[TWik
   </tr>
   <tr>
     <td><code>%WEB%</code></td>
-    <td> The name of the current web </td>
-  </tr>
-  <tr>
-    <td><code>%WEBURLENCODED%</code></td>
-    <td> The name of the current web, URL encoded (for form action) </td>
+    <td> The name of the current web. <strong><em>Note:</em></strong> It is recommended to URL-encode the variable in form actions with <code>%URLENCODE{"%WEB%"}%</code> for proper handling in an internationalized environment </td>
   </tr>
   <tr>
     <td><code>%TOPIC%</code></td>
-    <td> The name of the current topic </td>
-  </tr>
-  <tr>
-    <td><code>%TOPICURLENCODED%</code></td>
-    <td> The name of the current topic, URL encoded (for form action) </td>
+    <td> The name of the current topic. <strong><em>Note:</em></strong> It is recommended to URL-encode the variable in form actions with <code>%URLENCODE{"%TOPIC%"}%</code> for proper handling in an internationalized environment </td>
   </tr>
   <tr>
     <td><code>%WEBTOPICLIST%</code></td>
@@ -127,7 +119,7 @@ The `%WEBTOPICLIST%` includes a "Go" box to jump to a topic. The box also unders
 
 Here is an example form that has a select box and the "Go" box for illustration purposes. You need to have JavaScript enabled for this to work:
 
-<form action="http://www.dementia.org/twiki//view/%WEBURLENCODED%/%TOPICURLENCODED%" name="sample">
+<form action="http://www.dementia.org/twiki//view/%WEB%/%TOPIC%" name="sample">
   <table border="3">
     <tr>
       <td><select name="sel" onchange="this.form.topic.value=this.options[this.selectedIndex].value; this.form.submit()"><option selected value="">Navigate...</option>
@@ -161,4 +153,4 @@ A skin can be activated in two ways:
 
 The <code>**?skin=name**</code> URL parameter overrides the SKIN Preference value.
 
--- [[PeterThoeny]] - 03 Jan 2003
+-- [[PeterThoeny]] - 05 Jan 2003
diff --git a/TWiki/TWikiTemplates.mdwn b/TWiki/TWikiTemplates.mdwn
index 03e3a49..3bdb7df 100644
--- a/TWiki/TWikiTemplates.mdwn
+++ b/TWiki/TWikiTemplates.mdwn
@@ -154,7 +154,7 @@ All template topics are located in the TWiki web. The [[WebTopicEditTemplate]] c
 
 Here is an example for creating new topics based on a specific template topic:
 
-<form action="http://www.dementia.org/twiki//edit/%WEBURLENCODED%/" name="new">
+<form action="http://www.dementia.org/twiki//edit/%WEB%/" name="new">
   <ul>
     <li> New example topic: <input name="topic" size="23" type="text" value="ExampleTopic2010x06x29" /> <input name="templatetopic" type="hidden" value="ExampleTopicTemplate" /> <input type="submit" value="Create" /> (date format is YYYYxMMxDD) </li>
   </ul>
@@ -162,7 +162,7 @@ Here is an example for creating new topics based on a specific template topic:
 
 The above form asks for a topic name. A hidden input tag named <code>**templatetopic**</code> specifies [[ExampleTopicTemplate]] as the template topic to use. Here is the HTML source of the form:
 
-    <form name="new" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEBURLENCODED%/">
+    <form name="new" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%URLENCODE{"%WEB%"}%/">
     	* New example topic:
     	  <input type="text" name="topic" value="ExampleTopic%SERVERTIME{$yearx$mox$day}%" size="23" />
     	  <input type="hidden" name="templatetopic" value="ExampleTopicTemplate" />
-- 
1.9.4