types+tlv: distinguish "value" and "number"
The word "value" is used only when referring to TLV-VALUE.
Otherwise, the word "number" is used instead.
refs #2880
Change-Id: Ifaa850dea02fae3cc704ecc1c31345c0326eb26a
diff --git a/types.rst b/types.rst
index a63926f..c6be8ff 100644
--- a/types.rst
+++ b/types.rst
@@ -1,86 +1,86 @@
.. _types:
-Type value assignment
----------------------
+TLV-TYPE number assignment
+--------------------------
-+---------------------------------------------+-------------------+----------------+
-| Type | Assigned value | Assigned value |
-| | (decimal) | (hexadecimal) |
-+=============================================+===================+================+
++---------------------------------------------+------------------+-----------------+
+| Type | Assigned number | Assigned number |
+| | (decimal) | (hexadecimal) |
++=============================================+==================+=================+
| **Packet types** |
-+---------------------------------------------+-------------------+----------------+
-| Interest | 5 | 0x05 |
-+---------------------------------------------+-------------------+----------------+
-| Data | 6 | 0x06 |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| Interest | 5 | 0x05 |
++---------------------------------------------+------------------+-----------------+
+| Data | 6 | 0x06 |
++---------------------------------------------+------------------+-----------------+
| **Common fields** |
-+---------------------------------------------+-------------------+----------------+
-| Name | 7 | 0x07 |
-+---------------------------------------------+-------------------+----------------+
-| NameComponent | 8 | 0x08 |
-+---------------------------------------------+-------------------+----------------+
-| ImplicitSha256DigestComponent | 1 | 0x01 |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| Name | 7 | 0x07 |
++---------------------------------------------+------------------+-----------------+
+| NameComponent | 8 | 0x08 |
++---------------------------------------------+------------------+-----------------+
+| ImplicitSha256DigestComponent | 1 | 0x01 |
++---------------------------------------------+------------------+-----------------+
| **Interest packet** |
-+---------------------------------------------+-------------------+----------------+
-| Selectors | 9 | 0x09 |
-+---------------------------------------------+-------------------+----------------+
-| Nonce | 10 | 0x0a |
-+---------------------------------------------+-------------------+----------------+
-| InterestLifetime | 12 | 0x0c |
-+---------------------------------------------+-------------------+----------------+
-| ForwardingHint | 30 | 0x1e |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| Selectors | 9 | 0x09 |
++---------------------------------------------+------------------+-----------------+
+| Nonce | 10 | 0x0a |
++---------------------------------------------+------------------+-----------------+
+| InterestLifetime | 12 | 0x0c |
++---------------------------------------------+------------------+-----------------+
+| ForwardingHint | 30 | 0x1e |
++---------------------------------------------+------------------+-----------------+
| **Interest/Selectors** |
-+---------------------------------------------+-------------------+----------------+
-| MinSuffixComponents | 13 | 0x0d |
-+---------------------------------------------+-------------------+----------------+
-| MaxSuffixComponents | 14 | 0x0e |
-+---------------------------------------------+-------------------+----------------+
-| PublisherPublicKeyLocator | 15 | 0x0f |
-+---------------------------------------------+-------------------+----------------+
-| Exclude | 16 | 0x10 |
-+---------------------------------------------+-------------------+----------------+
-| ChildSelector | 17 | 0x11 |
-+---------------------------------------------+-------------------+----------------+
-| MustBeFresh | 18 | 0x12 |
-+---------------------------------------------+-------------------+----------------+
-| Any | 19 | 0x13 |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| MinSuffixComponents | 13 | 0x0d |
++---------------------------------------------+------------------+-----------------+
+| MaxSuffixComponents | 14 | 0x0e |
++---------------------------------------------+------------------+-----------------+
+| PublisherPublicKeyLocator | 15 | 0x0f |
++---------------------------------------------+------------------+-----------------+
+| Exclude | 16 | 0x10 |
++---------------------------------------------+------------------+-----------------+
+| ChildSelector | 17 | 0x11 |
++---------------------------------------------+------------------+-----------------+
+| MustBeFresh | 18 | 0x12 |
++---------------------------------------------+------------------+-----------------+
+| Any | 19 | 0x13 |
++---------------------------------------------+------------------+-----------------+
| **Data packet** |
-+---------------------------------------------+-------------------+----------------+
-| MetaInfo | 20 | 0x14 |
-+---------------------------------------------+-------------------+----------------+
-| Content | 21 | 0x15 |
-+---------------------------------------------+-------------------+----------------+
-| SignatureInfo | 22 | 0x16 |
-+---------------------------------------------+-------------------+----------------+
-| SignatureValue | 23 | 0x17 |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| MetaInfo | 20 | 0x14 |
++---------------------------------------------+------------------+-----------------+
+| Content | 21 | 0x15 |
++---------------------------------------------+------------------+-----------------+
+| SignatureInfo | 22 | 0x16 |
++---------------------------------------------+------------------+-----------------+
+| SignatureValue | 23 | 0x17 |
++---------------------------------------------+------------------+-----------------+
| **Data/MetaInfo** |
-+---------------------------------------------+-------------------+----------------+
-| ContentType | 24 | 0x18 |
-+---------------------------------------------+-------------------+----------------+
-| FreshnessPeriod | 25 | 0x19 |
-+---------------------------------------------+-------------------+----------------+
-| FinalBlockId | 26 | 0x1a |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| ContentType | 24 | 0x18 |
++---------------------------------------------+------------------+-----------------+
+| FreshnessPeriod | 25 | 0x19 |
++---------------------------------------------+------------------+-----------------+
+| FinalBlockId | 26 | 0x1a |
++---------------------------------------------+------------------+-----------------+
| **Data/Signature** |
-+---------------------------------------------+-------------------+----------------+
-| SignatureType | 27 | 0x1b |
-+---------------------------------------------+-------------------+----------------+
-| KeyLocator | 28 | 0x1c |
-+---------------------------------------------+-------------------+----------------+
-| KeyDigest | 29 | 0x1d |
-+---------------------------------------------+-------------------+----------------+
++---------------------------------------------+------------------+-----------------+
+| SignatureType | 27 | 0x1b |
++---------------------------------------------+------------------+-----------------+
+| KeyLocator | 28 | 0x1c |
++---------------------------------------------+------------------+-----------------+
+| KeyDigest | 29 | 0x1d |
++---------------------------------------------+------------------+-----------------+
.. _type reservations:
-Type value reservations
-~~~~~~~~~~~~~~~~~~~~~~~
+TLV-TYPE number reservations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+----------------+-----------------------------------------------------------+
-| Values | Designation |
+| Number range | Designation |
+================+===========================================================+
| 0, 2-4, 31-79 | Reserved for future assignments (1-byte encoding) |
+----------------+-----------------------------------------------------------+
@@ -103,4 +103,4 @@
| >32767 | For application use (3+-byte encoding) |
+----------------+-----------------------------------------------------------+
-.. _NDNLP: http://redmine.named-data.net/projects/nfd/wiki/NDNLPv2
+.. _NDNLP: https://redmine.named-data.net/projects/nfd/wiki/NDNLPv2