none

1 files changed, 11 insertions, 12 deletions

diff --git a/TWiki/FileAttachment.mdwn b/TWiki/FileAttachment.mdwn
index 3998e0e9..86e6e71f 100644
--- a/TWiki/FileAttachment.mdwn
+++ b/TWiki/FileAttachment.mdwn
@@ -3,7 +3,7 @@
 Each topic can have files attached to it. This is similar to an e-mail attachment. Just use your browser to upload or download a file.
 
 * To upload: Click on the Attach link at the bottom of each page. A form is shown where you can browse for a file and upload it. The uploaded file will show up in the FileAttachment table.
-* To download: Click on the file in FileAttachment table.
+* To download: Click on the file in the FileAttachment table.
 
 **FileAttachment table**
 
@@ -38,17 +38,16 @@ Is a table that looks like this:
 
 * Once a file is attached it can be referenced in the topic by <code>%ATTACHURL%/\{filename\}</code> . Example:
   * Attach file: `Sample.txt`
-  * Edit topic and write text: <code>%ATTACHURL%/Sample.txt</code>
-  * Text is shown as: %ATTACHURL%/Sample.txt , i.e. it is a link.
+  * Text is shown as: %PUBURL%/%WEB%/%TOPIC%/Sample.txt , i.e. it is a link.
 * GIF and JPG images can be attached and shown in the text like this:
   * Attach file: `Smile.gif`
   * Edit topic and write text: <code>%ATTACHURL%/Smile.gif</code>
-  * Text is shown as: %ATTACHURL%/Smile.gif , i.e. it shows up as an image.
+  * Text is shown as: %PUBURL%/%WEB%/%TOPIC%/Smile.gif , i.e. it shows up as an image.
 * It is not possible to delete attached files with the current TWiki implementation. Contact %WIKIWEBMASTER% if you need to delete files.
 
 <table border="0" cellpadding="0" cellspacing="4">
   <tr bgcolor="#99CCCC">
-    <th><span style="background:"><font color="">File Attachment</font></span><a href="http://LOCATIONMain/FileAttachment">?</a>: </th>
+    <th> %TWIKIWEB%.FileAttachment: </th>
     <th> Action: </th>
     <th> Size: </th>
     <th> Date: </th>
@@ -59,10 +58,10 @@ Is a table that looks like this:
     <td><twknextitem> </twknextitem></td>
   </tr>
   <tr>
-    <td valign="top"><twkfileicon><img align="top" hight="16" src="%PUBURL%/icn/txt.gif" width="16" /></twkfileicon> <a href="%PUBURL%/%WEB%/%TOPIC%/Sample.txt"><twkfilename>Sample.txt</twkfilename></a> <twkfilepath> <twkdata value="C:\Temp\Sample.txt"> </twkdata></twkfilepath></td>
-    <td valign="top"><twkaction><a href="../../viewfile/Main/FileAttachment?filename=Sample.txt">view</a> <a href="../../attach/Main/FileAttachment?filename=Sample.txt">update</a></twkaction></td>
+    <td valign="top"><twkfileicon><img align="top" hight="16" src="%PUBURLPATH%/icn/txt.gif" width="16" /></twkfileicon> <a href="%PUBURLPATH%/%WEB%/%TOPIC%/Sample.txt"><twkfilename>Sample.txt</twkfilename></a> <twkfilepath> <twkdata value="C:\DATA\Sample.txt"> </twkdata></twkfilepath></td>
+    <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/viewfile%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=Sample.txt">view</a> <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=Sample.txt">update</a></twkaction></td>
     <td align="right" valign="top"><twkfilesize>30</twkfilesize></td>
-    <td valign="top"><twkfiledate>26 Mar 1999 - 04:05</twkfiledate></td>
+    <td valign="top"><twkfiledate>22 Jul 2000 - 19:37</twkfiledate></td>
     <td valign="top"><twkfileuser> <span style="background:"><font color="">Peter Thoeny</font></span><a href="http://LOCATIONMain/PeterThoeny">?</a></twkfileuser></td>
     <td valign="top"><twkfilecomment>Just a sample</twkfilecomment></td>
   </tr>
@@ -70,10 +69,10 @@ Is a table that looks like this:
     <td><twknextitem> </twknextitem></td>
   </tr>
   <tr>
-    <td valign="top"><twkfileicon><img align="top" hight="16" src="%PUBURL%/icn/bmp.gif" width="16" /></twkfileicon> <a href="%PUBURL%/%WEB%/%TOPIC%/Smile.gif"><twkfilename>Smile.gif</twkfilename></a> <twkfilepath> <twkdata value="C:\Temp\Smile.gif"> </twkdata></twkfilepath></td>
-    <td valign="top"><twkaction><a href="../../viewfile/Main/FileAttachment?filename=Smile.gif">view</a> <a href="../../attach/Main/FileAttachment?filename=Smile.gif">update</a></twkaction></td>
+    <td valign="top"><twkfileicon><img align="top" hight="16" src="%PUBURLPATH%/icn/bmp.gif" width="16" /></twkfileicon> <a href="%PUBURLPATH%/%WEB%/%TOPIC%/Smile.gif"><twkfilename>Smile.gif</twkfilename></a> <twkfilepath> <twkdata value="C:\DATA\Smile.gif"> </twkdata></twkfilepath></td>
+    <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/viewfile%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=Smile.gif">view</a> <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=Smile.gif">update</a></twkaction></td>
     <td align="right" valign="top"><twkfilesize>94</twkfilesize></td>
-    <td valign="top"><twkfiledate>26 Mar 1999 - 04:05</twkfiledate></td>
+    <td valign="top"><twkfiledate>22 Jul 2000 - 19:38</twkfiledate></td>
     <td valign="top"><twkfileuser> <span style="background:"><font color="">Peter Thoeny</font></span><a href="http://LOCATIONMain/PeterThoeny">?</a></twkfileuser></td>
     <td valign="top"><twkfilecomment>Smiley face</twkfilecomment></td>
   </tr>
@@ -83,7 +82,7 @@ Is a table that looks like this:
   <tr>
     <td valign="top">
     </td>
-    <td valign="top"><twkaction><a href="../../attach/Main/FileAttachment">add</a><twkaction> </twkaction></twkaction></td>
+    <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%">add</a><twkaction> </twkaction></twkaction></td>
     <td align="right" valign="top">
     </td>
     <td valign="top">