... | ... | @@ -7,7 +7,7 @@ The coversheet should contain the following information: |
|
|
|
|
|
## Clauses affected and changes to attachments
|
|
|
|
|
|
The "Clauses affected" field should reference each attachment that is being changed. CR authors should include the filename of the relevant attachment, as taken from the Forge.
|
|
|
The "Clauses affected" field should reference each attachment that is being changed. CR authors should include the filename of the relevant attachment, as taken from the Forge.
|
|
|
|
|
|
> **EXAMPLE**
|
|
|
>
|
... | ... | @@ -18,14 +18,14 @@ The "Clauses affected" field should reference each attachment that is being chan |
|
|
Changes to attachments should be given in the CR, after any changes to the prose. The change block should indicate which attachment is being changed, by giving the filename of the attachment somewhere in the start of the change block.
|
|
|
|
|
|
> **EXAMPLE**
|
|
|
>
|
|
|
> For the change above, the first change block would be the changes to the prose in clause 6.
|
|
|
> The change to the attachment would be given in the second change block, which would be indicated
|
|
|
> as follows:
|
|
|
>
|
|
|
> ** --- SECOND CHANGE (LI-PS-PDU.ASN) --- **
|
|
|
> { changes}
|
|
|
> ** --- END OF CHANGES --- **
|
|
|
> For the change above, the first change block would be the changes to the prose in clause 6. The change to the attachment would be given in the second change block, which would be indicated as follows:
|
|
|
>
|
|
|
> **--- SECOND CHANGE (LI-PS-PDU.ASN) ---**
|
|
|
>
|
|
|
> { changes}
|
|
|
>
|
|
|
> **--- END OF CHANGES ---**
|
|
|
|
|
|
The content of the change block can be given in one of two ways:
|
|
|
|
... | ... | @@ -38,12 +38,10 @@ Each is described below: |
|
|
|
|
|
The CR author obtains a standard diff file that describes the changes to each attachment. For CR authors using the Forge web UI, this can be done from the Merge Request page.
|
|
|
|
|
|
img tbd
|
|
|
![image](uploads/483f3b6408bbbc938e46aa5cd1c6242c/image.png)
|
|
|
|
|
|
The diff file will contain a set of changes to all the attachments affected by the CR. The CR author can then take the set of changes for each attachment and put them in a change block for that attachment. An example is given below:
|
|
|
|
|
|
![image](uploads/e09302da05c8fa14e158b7e8a09bdb45/image.png)
|
|
|
|
|
|
### Showing changes to attachments via track changes
|
|
|
|
|
|
The CR author can obtain the changes in Word track-changes format by downloading the post-build artefacts from the Merge Request front page.
|
... | ... | @@ -58,11 +56,9 @@ If this method is used, the CR author **must copy the entire attachment into the |
|
|
|
|
|
## Other comments and references to the Forge
|
|
|
|
|
|
in the "Other comments" field:
|
|
|
in the "Other comments" field:
|
|
|
|
|
|
* A reference to the Merge Request associated with the CR
|
|
|
|
|
|
|
|
|
* A reference to the **latest** commit hash for that Merge Request.
|
|
|
|
|
|
For consistency, CR authors should adopt the following convention when writing the text to go in the "Comments" field:
|
... | ... | |