Update documentation

git-svn-id: https://svn.m0n0.ch/wall/trunk@90 e36fee2c-cc09-0410-a7cc-ebac5c6737de

diff --git a/phpconf/inc/captiveportal.inc b/phpconf/inc/captiveportal.inc
index b5c0612b70e3a8bf2007b5de1f742da4ab8b88bd..14bfe391393b5b9f8a692e5e82b8bc49f10c7f63 100644 (file)
--- a/phpconf/inc/captiveportal.inc
+++ b/phpconf/inc/captiveportal.inc
@@ -890,10 +890,10 @@ function captiveportal_write_elements() {
  * This function will calculate the traffic produced by a client
  * based on its firewall rule
  *
- * Point of view: Client
+ * Point of view: NAS
  *
- * Input on the FW will be viewed as Output for the Client
- * Output on the FW will be viewed as Input for the Client
+ * Input means: from the client
+ * Output means: to the client
  *
  */
 

diff --git a/webgui/services_captiveportal.php b/webgui/services_captiveportal.php
index 5390ff31e45d51d16e4a0db5d859e5a86f9f34c3..ba0026b3bb943abd0ab8de014ece40463b202b2e 100755 (executable)
--- a/webgui/services_captiveportal.php
+++ b/webgui/services_captiveportal.php
@@ -543,7 +543,8 @@ Example code for the form:<br>
                  <br>
                <?php endif; ?>
 The contents of the HTML file that you upload here are displayed when an authentication error occurs.
-You may include &quot;$PORTAL_MESSAGE$&quot;, which will be replaced by the error or reply messages from the RADIUS server, if any.</td>
+You may include &quot;$PORTAL_MESSAGE$&quot;, which will be replaced by the error or reply messages from the RADIUS server, if any.
+Its also possible to include a new login form in the error page for a direct user relogin possibility</td>
        </tr>
        <tr> 
          <td width="22%" valign="top">&nbsp;</td>