diff options
author | Chris Buechler <cmb@pfsense.org> | 2009-04-07 02:06:07 -0400 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2009-04-07 02:06:07 -0400 |
commit | b040124aa6d4c40478bb3f2b99a8689d82fbdbf9 (patch) | |
tree | e95c9bc4359b5cf76b9c9896f5c991ca298b1f55 /usr/local/www | |
parent | 7098c77f67e787ec92a2eb43336945ed6f4f5abd (diff) | |
download | pfsense-b040124aa6d4c40478bb3f2b99a8689d82fbdbf9.zip pfsense-b040124aa6d4c40478bb3f2b99a8689d82fbdbf9.tar.gz |
clean up text
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/interfaces_gif_edit.php | 12 | ||||
-rw-r--r-- | usr/local/www/interfaces_gre.php | 15 | ||||
-rw-r--r-- | usr/local/www/interfaces_gre_edit.php | 30 |
3 files changed, 26 insertions, 31 deletions
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php index 3569891..04ccfe5 100644 --- a/usr/local/www/interfaces_gif_edit.php +++ b/usr/local/www/interfaces_gif_edit.php @@ -146,21 +146,21 @@ include("head.inc"); <span class="vexpl">The interface here servers as the local address to be used for the gif tunnel.</span></td> </tr> <tr> - <td valign="top" class="vncellreq">gif remote address. </td> + <td valign="top" class="vncellreq">gif remote address</td> <td class="vtable"> <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="16" value="<?=$pconfig['remote-addr'];?>"> <br> <span class="vexpl">Peer address where encapsulated gif packets will be sent. </span></td> </tr> <tr> - <td valign="top" class="vncellreq">gif tunnel local address. </td> + <td valign="top" class="vncellreq">gif tunnel local address</td> <td class="vtable"> <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="16" value="<?=$pconfig['tunnel-local-addr'];?>"> <br> - <span class="vexpl">Local gif tunnel endpoint. </span></td> + <span class="vexpl">Local gif tunnel endpoint</span></td> </tr> <tr> - <td valign="top" class="vncellreq">gif tunnel remote address. </td> + <td valign="top" class="vncellreq">gif tunnel remote address </td> <td class="vtable"> <input name="tunnel-remote-addr" type="text" class="formfld unknown" id="tunnel-remote-addr" size="16" value="<?=$pconfig['tunnel-remote-addr'];?>"> <select name="tunnel-remote-net" class="formselect" id="tunnel-remote-net"> @@ -178,14 +178,14 @@ include("head.inc"); <span class="vexpl">Remote gif address endpoint. The subnet part is used for the determinig the network that is tunneled.</span></td> </tr> <tr> - <td valign="top" class="vncellreq">Route caching </td> + <td valign="top" class="vncell">Route caching </td> <td class="vtable"> <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked";?>> <br> <span class="vexpl">Specify if route caching can be enabled. Be careful with these settings on dynamic networks. </span></td> </tr> <tr> - <td valign="top" class="vncellreq">ECN friendly behaviour. </td> + <td valign="top" class="vncell">ECN friendly behaviour</td> <td class="vtable"> <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked";?>> <br> diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index 79a43e2..8b188e8 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -58,7 +58,7 @@ function gre_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (gre_inuse($_GET['id'])) { - $input_errors[] = "This GRE TUNNEL cannot be deleted because it is still being used as an interface."; + $input_errors[] = "This GRE tunnel cannot be deleted because it is still being used as an interface."; } else { mwexec("/sbin/ifconfig " . $a_gres[$_GET['id']]['greif'] . " destroy"); unset($a_gres[$_GET['id']]); @@ -124,14 +124,11 @@ include("head.inc"); <td class="list" colspan="3"> </td> <td class="list"> <a href="interfaces_gre_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> - <tr> - <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - Note:<br> - </strong></span> - Something meaningful here. - </td> - <td class="list"> </td> - </tr> + <tr> + <td class="tabcont" colspan="3"> + <p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.</span></p> + </td> + </tr> </table> </div> </td> diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index b6ab594..de4ca9b 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -145,24 +145,24 @@ include("head.inc"); ?> </select> <br/> - <span class="vexpl">The interface here servers as the local address to be used for the GRE tunnel.</span></td> + <span class="vexpl">The interface here serves as the local address to be used for the GRE tunnel.</span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE remote address. </td> + <td valign="top" class="vncellreq">GRE remote address</td> <td class="vtable"> <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="16" value="<?=$pconfig['remote-addr'];?>"> <br> - <span class="vexpl">Peer address where encapsulated GRE packets will be sent. </span></td> + <span class="vexpl">Peer address where encapsulated GRE packets will be sent </span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE tunnel local address. </td> + <td valign="top" class="vncellreq">GRE tunnel local address </td> <td class="vtable"> <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="16" value="<?=$pconfig['tunnel-local-addr'];?>"> <br> - <span class="vexpl">Local GRE tunnel endpoint. </span></td> + <span class="vexpl">Local GRE tunnel endpoint</span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE tunnel remote address. </td> + <td valign="top" class="vncellreq">GRE tunnel remote address </td> <td class="vtable"> <input name="tunnel-remote-addr" type="text" class="formfld unknown" id="tunnel-remote-addr" size="16" value="<?=$pconfig['tunnel-remote-addr'];?>"> <select name="tunnel-remote-net" class="formselect" id="tunnel-remote-net"> @@ -177,35 +177,33 @@ include("head.inc"); ?> </select> <br/> - <span class="vexpl">Remote GRE address endpoint. The subnet part is used for the determinig the network that is tunneled.</span></td> + <span class="vexpl">Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.</span></td> </tr> <tr> - <td valign="top" class="vncellreq">Mobile tunnel. </td> + <td valign="top" class="vncell">Mobile tunnel</td> <td class="vtable"> <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked";?>> <br> - <span class="vexpl">Specify which encapsulation method the tunnel should do. </span></td> + <span class="vexpl">Specify which encapsulation method the tunnel should use. </span></td> </tr> <tr> - <td valign="top" class="vncellreq">Route search type. </td> + <td valign="top" class="vncell">Route search type</td> <td class="vtable"> <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked";?>> <br> <span class="vexpl"> - For correct operation, the gre device needs a route to the destination + For correct operation, the GRE device needs a route to the destination that is less specific than the one over the tunnel. (Basically, there needs to be a route to the decapsulating host that does not run over the - tunnel, as this would be a loop.) If the addresses are ambiguous, doing - the ifconfig tunnel step before the ifconfig(8) call to set the gre IP - addresses will help to find a route outside the tunnel. + tunnel, as this would be a loop.) </span></td> </tr> <tr> - <td valign="top" class="vncellreq">WCCP version. </td> + <td valign="top" class="vncell">WCCP version</td> <td class="vtable"> <input name="link2" type="checkbox" id="link2" <?if ($pconfig['link2']) echo "checked";?>> <br> - <span class="vexpl">Specify which WCCP encapsulation(version 1 or 2) method the tunnel should do. </span></td> + <span class="vexpl">Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use</span></td> </tr> <tr> <td width="22%" valign="top" class="vncell">Description</td> |