Ignore:
Timestamp:
05/14/13 18:10:22 (12 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/help.html

    r507 r593  
    1 <html><head>
    2 
    3 <title>IP Database</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    4 
    5 <link rel="stylesheet" type="text/css" href="ipdb.css" />
    6 <link rel="stylesheet" type="text/css" href="local.css" />
    7 
     1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
     2<html>
     3<head>
     4        <title>IP Database Quick Help</title>
     5        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     6        <link rel="stylesheet" type="text/css" href="ipdb.css">
     7        <link rel="stylesheet" type="text/css" href="local.css">
    88</head>
    99<body>
    … …  
    1111<table class="regular">
    1212
    13 <tr><td class="heading">Quick Searches:</td><tr>
     13<tr><td class="heading">Quick Searches:</td></tr>
    1414
    15 <tr class="color1">
    16 <td>IP blocks</td><td>192.168.28 or 192.</td>
     15<tr class="row0">
     16<td>IP blocks</td>
     17<td>192.168.28 or 192.</td>
    1718<td>Lists all alloctions starting with that set of octets.  Note that matches on the
    1819first octet MUST include the period to be considered an IP search.</td>
    1920</tr>
    20 <tr class="color2">
    21 <td>CIDR blocks</td><td>192.168.28/30</br>or
    22 192.168.28.0/30</td><td>Lists all /30's beginning with 192.168.28 or checks for an
     21
     22<tr class="row1">
     23<td>CIDR blocks</td>
     24<td>192.168.28/30<br>or 192.168.28.0/30</td>
     25<td>Lists all /30's beginning with 192.168.28 or checks for an
    2326exact match for 192.168.28.0/30 respectively</td>
    2427</tr>
    25 <tr class="color1">
    26 <td>IP address</td><td>192.168.28.30</td><td>Finds the alloction that IP is a
    27 part of (if any)</td>
    28 </tr>
    29 <tr class="color2">
    30 <td>Customer ID:</td><td>123456</td><td>Find all alloctions to that
    31 customer.  Customer IDs are assumed to be numeric for this search.
    32 </td>
    33 </tr>
    34 <tr class="color1">
    35 <td>Description:</td><td>cable or BigCustomer</td><td>Find all allocations with the search term in
    36 the description.  Note that searches for CustIDs with letters will fall under this category
    37 unless CustIDs are all-numeric.</td>
     28
     29<tr class="row0">
     30<td>IP address</td>
     31<td>192.168.28.30</td>
     32<td>Finds the alloction that IP is a part of (if any)</td>
    3833</tr>
    3934
    40 <tr class="regular"><!-- blank row --><td></td></tr>
     35<tr class="row1">
     36<td>Customer ID:</td>
     37<td>123456</td>
     38<td>Find all alloctions to that customer.  Customer IDs are assumed to be
     39numeric for this search.</td>
     40</tr>
     41
     42<tr class="row0">
     43<td>Description:</td>
     44<td>cable or BigCustomer</td>
     45<td>Find all allocations with the search term in the description.  Note that searches for CustIDs with letters
     46will fall under this category unless CustIDs are all-numeric.</td>
     47</tr>
     48
    4149<tr><td colspan="3">A blank query will "show all"</td></tr>
    4250<tr><td colspan="3">The title in the top right hand corner is a link home.</td></tr>
    4351
    44 <tr class="regular"><!-- blank row --><td></td></tr>
    45 <tr class="regular"><!-- blank row --><td></td></tr>
    46 <tr class="regular"><!-- blank row --><td></td></tr>
    47 
    48 <tr class="color1"><td>Subnet Calculator</td>
     52<tr class="row0"><td>Subnet Calculator</td>
    4953<td colspan="2">
    5054<form method="POST" action="cgi-bin/snCalc.cgi">
     55<fieldset><legend></legend>
    5156 / <input type="text" size="5" maxlength="10" name="input" class="regular">
    5257<input type="submit" value="Calculate" class="heading">&nbsp; Show
    5358<span class="mask">subnet mask</span>, <span class="wildcard">wildcard mask</span>,
    5459and possible subnet ranges for the entered mask length.
     60</fieldset>
    5561</form>
    5662</tr>
Note: See TracChangeset for help on using the changeset viewer.