diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/networking/ipddp.txt | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'Documentation/networking/ipddp.txt')
| -rw-r--r-- | Documentation/networking/ipddp.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/networking/ipddp.txt b/Documentation/networking/ipddp.txt index 661a5558dd8e..ba5c217fffe0 100644 --- a/Documentation/networking/ipddp.txt +++ b/Documentation/networking/ipddp.txt | |||
| @@ -36,11 +36,6 @@ AppleTalk-IP to IP decapsulation. | |||
| 36 | Basic instructions for user space tools | 36 | Basic instructions for user space tools |
| 37 | ======================================= | 37 | ======================================= |
| 38 | 38 | ||
| 39 | To enable AppleTalk-IP decapsulation/encapsulation you will need the | ||
| 40 | proper tools. You can get the tools for decapsulation from | ||
| 41 | http://spacs1.spacs.k12.wi.us/~jschlst/index.html and for encapsulation | ||
| 42 | from http://www.maths.unm.edu/~bradford/ltpc.html | ||
| 43 | |||
| 44 | I will briefly describe the operation of the tools, but you will | 39 | I will briefly describe the operation of the tools, but you will |
| 45 | need to consult the supporting documentation for each set of tools. | 40 | need to consult the supporting documentation for each set of tools. |
| 46 | 41 | ||