DDSIRTP23 — Use the term "Encapsulation" consistently and precisely

Encapsulation has a precise technical meaning from the CORBA spec (formal/11-11-02 section 9.3.3) and a similar meaning from chapter 10 of RTPS, neither of which matches most of the other uses of “encapsulation” throughout the RTPS spec. In general, encapsulation means adding specific prefix bytes to the on-the-wire representation of data. This prefix can be used by the receiver to understand the format of the following bytes. The majority of uses of “encapsulation” in the specification do not agree with this meaning. This issue seeks to fix that by using the simpler term of “encoding” in place of “encapsulation.”

Encapsulate
-----------------

Section: 8.3.2, Table 8.13, Count_t row
Page: 30
Change: replace “'encapsulate'” with “'hold”'

Section: 8.3.3.2, Table 8.15, flags row
Page: 34
Change: replace '“encapsulate”' with “'encode”' in two places

Section: 8.3.5.1
Page: 37
Change: replace “'encapsulate'” with '“contain'”

Section: 8.3.5.9, Paragraph 1
Page: 41
Change: replace “encapsulate” with “'contain'”

Section: 8.3.7.9.2, Table 8.41, protocolVersion and VendorId rows
Page: 59
Change: replace “'to encapsulate subsequent Submessages'” with “"for subsequent Submessages”"
Change 'vendor that encapsulated subsequent submessages' with “'vendor that originated the subsequent submessages' ”

Section: 8.4.10.3
Page: 105
Change: replace “'encapsulated”' with “'maintained”'

Section: 8.4.11.1.2
Page: 110
Change: replace 'the DATA message encapsulates' with 'the DATA message contains'

Section: 8.4.12.1.2
Page: 112
Change: replace 'the DATA message encapsulates' with 'the DATA message contains'

Section: 8.5.3.2, Table 8.73, expectesInlineQos row
Page: 126
Change: replace '“encapsulated”' with '“included'”

Section 9.4.2.12
Page: 166
Change: replace 'process used to encapsulate' with 'process used to encode'

Section: 9.6.2.2, Paragraphs 4-5
Page: 181
Change: replace “'encapsulates'” with “'contains'”; replace “'encapsulated'” with “'represented'” (twice)

Section: 9.6.2.2.2
Page: 182
Change: replace “'used to encapsulate the data'” with '“used for the data'”

Section: 9.6.3
Page: 187
Change: replace “'are encapsulated'” with “'are contained'”

Section: 9.6.3.3
Page: 190
Change: replace “'any unfilled bits in the KeyHash_t after all the key fields have been encapsulated shall be set to zero' with 'any unfilled bits in the KeyHash_t shall be set to zero”'

Page: 191
Change: replace “'encapsulated as' with 'represented as'

Section: 10
This is handled on a separate issue.

Encapsulation
-------------------

Section 6.2 change 'data encapsulation' to 'data representation' (twice)

Section 8.3.3 change 'transport encapsulation' to 'transport headers'

Section 8.3.5.9 change 'The encapsulation' to 'the representation'

Section 8.3.5.12 change 'For additional information on data encapsulation see ...' to 'For additional information see ...'
Section 8.3.5.13 change 'For additional information on data encapsulation see ...' to 'For additional information see ...'

Table 8.34 change 'contains the encapsulation of the ...' to 'contains the ...' (twice in serializedPayload row).

Table 8.35 serializedPayload row:
Change 'Encapsulation of a consecutive ...' with ' A consecutive ...'
Change 'contains the encapsulation of the ...' to 'contains the ...' (twice in serializedPayload row).

Section 8.4.11.1.1 and 8.4.11.1.2
Change 'The encapsulation is described' to 'The representation is described' (once on each section)

Section: 9.4.2.11, Paragraphs 5, 7, 9
Page: 165
Change: “'CDR encapsulation”' with 'CDR representation' and 'ParameterList encapsulation' with 'ParameterList representation'

Change 'These are two predefined values of the parameterId used for the encapsulation' with 'These are two predefined values of the parameterId:'

Section 9.5 Change title to "Mapping to UDP/IP Transport Messages"
Change body to:
When RTPS is used over UDP/IP, each UDP/IP datagram shall contain exactly one or more complete RTPS Messages.

Note: This is a change. Currently the requirement is one datagram one RTPS message.

Section: 9.6.3.3
Page: 190-191
Change: replace “'“encapsulation'” with '“representation'” (seven times)

Replace all uses of any form of 'Encapsulate'

Encapsulation has a precise technical meaning from the CORBA spec (formal/11-11-02 section 9.3.3) and a similar meaning from chapter 10 of RTPS, neither of which matches most of the other uses of “encapsulation” throughout the RTPS spec. We are therefore replacing all uses of any form of the word 'encapsulate' with a different word.
Three general rules of thumb were followed:

1. In cases describing the contents of SubmessageElements or messages, we have replaced encapsulate with 'contain'.
2. Anywhere that said 'data encapsulation' or 'CDR encapsulation' is replaced with 'data representation'.
3. We have removed the phrase containing encapsulation all together in places where it was used unnecessarily.

All other situations were dealt with on a case-by-case basis