[src/trunk]: src/etc reapply 1.25 to fix upstream inconsistencies

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/664ec5dd0216
branches:  trunk
changeset: 811838:664ec5dd0216
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Nov 18 16:16:36 2015 +0000

description:
reapply 1.25 to fix upstream inconsistencies

diffstat:

 etc/protocols |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r a6acea589215 -r 664ec5dd0216 etc/protocols
--- a/etc/protocols     Wed Nov 18 13:19:52 2015 +0000
+++ b/etc/protocols     Wed Nov 18 16:16:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: protocols,v 1.27 2015/11/14 16:25:48 christos Exp $
+# $NetBSD: protocols,v 1.28 2015/11/18 16:16:36 christos Exp $
 # See also: protocols(5), http://www.sethwklein.net/projects/iana-etc/
 #
 #    Last Updated
@@ -160,9 +160,9 @@
 vmtp          81 VMTP         # VMTP                                        [Dave_Cheriton]
 secure-vmtp   82 SECURE-VMTP  # SECURE-VMTP                                 [Dave_Cheriton]
 vines         83 VINES        # VINES                                       [Brian Horn]
-ttp           84 TTP          # Transaction Transport                       [Jim_Stevens]
+ttp           84 TTP iptm IPTM         # Transaction Transport                       [Jim_Stevens]
 #                               Protocol
-iptm          84 IPTM         # Internet Protocol Traffic                   [Jim_Stevens]
+#iptm          84 IPTM         # Internet Protocol Traffic                   [Jim_Stevens]
 #                               Manager
 nsfnet-igp    85 NSFNET-IGP   # NSFNET-IGP                                  [Hans_Werner_Braun]
 dgp           86 DGP          # Dissimilar Gateway Protocol                 [M/A-COM Government Systems, "Dissimilar Gateway Protocol Specification,
@@ -237,7 +237,7 @@
 mobility     135 Mobility     # Header                                       Y        [RFC6275]
 udplite      136 UDPLite      # [RFC3828]
 mpls-in-ip   137 MPLS-in-IP   # [RFC4023]
-manet        138 manet        # MANET Protocols                             [RFC5498]
+manet        138 MANET        # MANET Protocols                             [RFC5498]
 hip          139 HIP          # Host Identity Protocol             Y        [RFC7401]
 shim6        140 Shim6        # Shim6 Protocol                     Y        [RFC5533]
 wesp         141 WESP         # Wrapped Encapsulating                       [RFC5840]