Skip to content

Commit 8c52435

Browse files
mairawThraka
andauthored
remove URI tokens (#3362)
* remove URI tokens * Update xml/System.Windows.Documents/Hyperlink.xml Co-Authored-By: Andy De George <[email protected]>
1 parent 6e0674a commit 8c52435

File tree

72 files changed

+300
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+300
-305
lines changed

includes/tla2sharptla-uri-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tla2sharptla-urisharpplural-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tlasharptla-uri-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tlasharptla-urisharpinitcapsharpplural-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tlasharptla-urisharpplural-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

xml/System.IO.Packaging/PackUriHelper.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
8282
]]></format>
8383
</remarks>
84-
<exception cref="T:System.ArgumentException">Either <paramref name="firstPackUri" /> or <paramref name="secondPackUri" /> is not an absolute [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)].
84+
<exception cref="T:System.ArgumentException">Either <paramref name="firstPackUri" /> or <paramref name="secondPackUri" /> is not an absolute URI.
8585

8686
-or-
8787

@@ -117,9 +117,9 @@
117117
<Parameter Name="secondPartUri" Type="System.Uri" />
118118
</Parameters>
119119
<Docs>
120-
<param name="firstPartUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the first <see cref="T:System.IO.Packaging.PackagePart" />.</param>
121-
<param name="secondPartUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the second <see cref="T:System.IO.Packaging.PackagePart" />.</param>
122-
<summary>Returns a value that indicates whether two package part [!INCLUDE[TLA2#tla_uri#plural](~/includes/tla2sharptla-urisharpplural-md.md)] are equivalent.</summary>
120+
<param name="firstPartUri">The URI of the first <see cref="T:System.IO.Packaging.PackagePart" />.</param>
121+
<param name="secondPartUri">The URI of the second <see cref="T:System.IO.Packaging.PackagePart" />.</param>
122+
<summary>Returns a value that indicates whether two package part URIs are equivalent.</summary>
123123
<returns>A value that indicates the relationship between <paramref name="firstPartUri" /> and <paramref name="secondPartUri" />.
124124

125125
<list type="table"><listheader><term> Value
@@ -143,12 +143,12 @@
143143
<format type="text/markdown"><![CDATA[
144144
145145
## Remarks
146-
If both `firstPartUri` and `secondPartUri` are `null`, <xref:System.IO.Packaging.PackUriHelper.ComparePartUri%2A> returns 0. When comparing <xref:System.IO.Packaging.PackagePart> [!INCLUDE[TLA2#tla_uri#plural](~/includes/tla2sharptla-urisharpplural-md.md)], a null [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] is always less than a non-null [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)]. For cases where `firstPartUri` and `secondPartUri` are both relative <xref:System.IO.Packaging.PackagePart> URIs, <xref:System.IO.Packaging.PackUriHelper.ComparePartUri%2A> performs the comparison.
146+
If both `firstPartUri` and `secondPartUri` are `null`, <xref:System.IO.Packaging.PackUriHelper.ComparePartUri%2A> returns 0. When comparing <xref:System.IO.Packaging.PackagePart> URIs, a null URI is always less than a non-null URI. For cases where `firstPartUri` and `secondPartUri` are both relative <xref:System.IO.Packaging.PackagePart> URIs, <xref:System.IO.Packaging.PackUriHelper.ComparePartUri%2A> performs the comparison.
147147
148148
]]></format>
149149
</remarks>
150150
<exception cref="T:System.ArgumentException">
151-
<paramref name="firstPartUri" /> or <paramref name="secondPartUri" /> is not a valid part [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] syntax.</exception>
151+
<paramref name="firstPartUri" /> or <paramref name="secondPartUri" /> is not a valid part URI syntax.</exception>
152152
<altmember cref="M:System.IO.Packaging.PackUriHelper.ComparePackUri(System.Uri,System.Uri)" />
153153
</Docs>
154154
</Member>
@@ -284,9 +284,9 @@
284284
<Parameter Name="partUri" Type="System.Uri" Index="1" FrameworkAlternate="netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;dotnet-plat-ext-3.0;netcore-3.0" />
285285
</Parameters>
286286
<Docs>
287-
<param name="packageUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the <see cref="T:System.IO.Packaging.Package" />.</param>
288-
<param name="partUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the <see cref="T:System.IO.Packaging.PackagePart" /> in the package.</param>
289-
<summary>Creates a pack URI given a <see cref="T:System.IO.Packaging.Package" /> [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] and the [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of a part in the package.</summary>
287+
<param name="packageUri">The URI of the <see cref="T:System.IO.Packaging.Package" />.</param>
288+
<param name="partUri">The URI of the <see cref="T:System.IO.Packaging.PackagePart" /> in the package.</param>
289+
<summary>Creates a pack URI given a <see cref="T:System.IO.Packaging.Package" /> URI and the URI of a part in the package.</summary>
290290
<returns>The pack URI of the given <see cref="T:System.IO.Packaging.PackagePart" />.</returns>
291291
<remarks>
292292
<format type="text/markdown"><![CDATA[
@@ -359,10 +359,10 @@
359359
<Parameter Name="fragment" Type="System.String" Index="2" FrameworkAlternate="netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;dotnet-plat-ext-3.0;netcore-3.0" />
360360
</Parameters>
361361
<Docs>
362-
<param name="packageUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the <see cref="T:System.IO.Packaging.Package" />.</param>
363-
<param name="partUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the <see cref="T:System.IO.Packaging.PackagePart" /> in the package.</param>
362+
<param name="packageUri">The URI of the <see cref="T:System.IO.Packaging.Package" />.</param>
363+
<param name="partUri">The URI of the <see cref="T:System.IO.Packaging.PackagePart" /> in the package.</param>
364364
<param name="fragment">A "#" reference identifying an element within the package part.</param>
365-
<summary>Creates a pack URI given a <see cref="T:System.IO.Packaging.Package" /> [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)], the [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of a part in the package, and a "#" fragment to append.</summary>
365+
<summary>Creates a pack URI given a <see cref="T:System.IO.Packaging.Package" /> URI, the URI of a part in the package, and a "#" fragment to append.</summary>
366366
<returns>The pack URI that identifies the specified package, package part, and fragment.</returns>
367367
<remarks>
368368
<format type="text/markdown"><![CDATA[
@@ -452,7 +452,7 @@
452452
<format type="text/markdown"><![CDATA[
453453
454454
## Remarks
455-
The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of a <xref:System.IO.Packaging.PackagePart> is always referenced from the <xref:System.IO.Packaging.Package> root.
455+
The URI of a <xref:System.IO.Packaging.PackagePart> is always referenced from the <xref:System.IO.Packaging.Package> root.
456456
457457
The returned <xref:System.IO.Packaging.PackagePart> URI is an absolute path that always starts with "/" and conforms to the syntax defined in the [Open Packaging Conventions Specification](https://go.microsoft.com/fwlink/?LinkID=71255).
458458
@@ -676,7 +676,7 @@ The partUri extracted from <paramref name="packUri" /> does not conform to the v
676676
</Parameters>
677677
<Docs>
678678
<param name="partUri">The <see cref="P:System.IO.Packaging.PackagePart.Uri" /> of the <see cref="T:System.IO.Packaging.PackagePart" /> to return the URI for the associated <see cref="T:System.IO.Packaging.PackageRelationship" />.</param>
679-
<summary>Returns the [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the relationship part associated with a specified <see cref="T:System.IO.Packaging.PackagePart" />.</summary>
679+
<summary>Returns the URI of the relationship part associated with a specified <see cref="T:System.IO.Packaging.PackagePart" />.</summary>
680680
<returns>The URI of the <see cref="T:System.IO.Packaging.PackageRelationship" /> part associated with the <see cref="T:System.IO.Packaging.PackagePart" /> identified by <paramref name="partUri" />.</returns>
681681
<remarks>
682682
<format type="text/markdown"><![CDATA[
@@ -737,10 +737,10 @@ The partUri extracted from <paramref name="packUri" /> does not conform to the v
737737
<Parameter Name="targetPartUri" Type="System.Uri" />
738738
</Parameters>
739739
<Docs>
740-
<param name="sourcePartUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the source part.</param>
741-
<param name="targetPartUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the target part.</param>
742-
<summary>Returns the relative [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] between two specified <see cref="T:System.IO.Packaging.PackagePart" /> [!INCLUDE[TLA2#tla_uri#plural](~/includes/tla2sharptla-urisharpplural-md.md)].</summary>
743-
<returns>The relative [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] from <paramref name="sourcePartUri" /> to <paramref name="targetPartUri" />.</returns>
740+
<param name="sourcePartUri">The URI of the source part.</param>
741+
<param name="targetPartUri">The URI of the target part.</param>
742+
<summary>Returns the relative URI between two specified <see cref="T:System.IO.Packaging.PackagePart" /> URIs.</summary>
743+
<returns>The relative URI from <paramref name="sourcePartUri" /> to <paramref name="targetPartUri" />.</returns>
744744
<remarks>
745745
<format type="text/markdown"><![CDATA[
746746
@@ -789,8 +789,8 @@ The partUri extracted from <paramref name="packUri" /> does not conform to the v
789789
<Parameter Name="relationshipPartUri" Type="System.Uri" />
790790
</Parameters>
791791
<Docs>
792-
<param name="relationshipPartUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the relationship part to return the <see cref="P:System.IO.Packaging.PackageRelationship.SourceUri" /> from.</param>
793-
<summary>Returns the <see cref="P:System.IO.Packaging.PackageRelationship.SourceUri" /> from the <see cref="T:System.IO.Packaging.PackageRelationship" /> with a specified [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)].</summary>
792+
<param name="relationshipPartUri">The URI of the relationship part to return the <see cref="P:System.IO.Packaging.PackageRelationship.SourceUri" /> from.</param>
793+
<summary>Returns the <see cref="P:System.IO.Packaging.PackageRelationship.SourceUri" /> from the <see cref="T:System.IO.Packaging.PackageRelationship" /> with a specified URI.</summary>
794794
<returns>The <see cref="P:System.IO.Packaging.PackageRelationship.SourceUri" /> of the <see cref="T:System.IO.Packaging.PackagePart" /> from the relationship with the specified <paramref name="relationshipPartUri" />.</returns>
795795
<remarks>
796796
<format type="text/markdown"><![CDATA[
@@ -805,7 +805,7 @@ The partUri extracted from <paramref name="packUri" /> does not conform to the v
805805
<exception cref="T:System.ArgumentNullException">
806806
<paramref name="relationshipPartUri" /> is <see langword="null" />.</exception>
807807
<exception cref="T:System.ArgumentException">
808-
<paramref name="relationshipPartUri" /> is an absolute [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)].
808+
<paramref name="relationshipPartUri" /> is an absolute URI.
809809

810810
-or-
811811

@@ -849,7 +849,7 @@ The partUri extracted from <paramref name="packUri" /> does not conform to the v
849849
<Parameter Name="partUri" Type="System.Uri" />
850850
</Parameters>
851851
<Docs>
852-
<param name="partUri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] to check for a <see cref="T:System.IO.Packaging.PackageRelationship" /> part.</param>
852+
<param name="partUri">The URI to check for a <see cref="T:System.IO.Packaging.PackageRelationship" /> part.</param>
853853
<summary>Returns a value that indicates whether a specified URI is the URI of a <see cref="T:System.IO.Packaging.PackageRelationship" /> part.</summary>
854854
<returns>
855855
<see langword="true" /> if <paramref name="partUri" /> identifies a <see cref="T:System.IO.Packaging.PackageRelationship" /> part; otherwise, <see langword="false" />.</returns>
@@ -863,7 +863,7 @@ This method does not inspect the part contents; it is based solely on the name.
863863
<exception cref="T:System.ArgumentNullException">
864864
<paramref name="partUri" /> is <see langword="null" />.</exception>
865865
<exception cref="T:System.ArgumentException">
866-
<paramref name="partUri" /> is an absolute [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)].
866+
<paramref name="partUri" /> is an absolute URI.
867867

868868
-or-
869869

xml/System.IO.Packaging/PackWebRequest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<format type="text/markdown"><![CDATA[
121121
122122
## Remarks
123-
Note that the pack URI protocol does not process information in the request other than the [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)]. For most traditional purposes (such as estimating the size of POST information), there is no need for this property.
123+
Note that the pack URI protocol does not process information in the request other than the uniform resource identifier (URI). For most traditional purposes (such as estimating the size of POST information), there is no need for this property.
124124
125125
<xref:System.IO.Packaging.PackWebRequest.ContentLength%2A> returns 0 if the request resolves from the <xref:System.IO.Packaging.PackageStore> cache.
126126
@@ -154,7 +154,7 @@
154154
<format type="text/markdown"><![CDATA[
155155
156156
## Remarks
157-
Note that the pack URI protocol does not process information in the request other than the [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)]. For most purposes (such as determining the type of POST information), there is no use for this property.
157+
Note that the pack URI protocol does not process information in the request other than the uniform resource identifier (URI). For most purposes (such as determining the type of POST information), there is no use for this property.
158158
159159
<xref:System.IO.Packaging.PackWebRequest.ContentType%2A> returns an empty string if the request resolves from the <xref:System.IO.Packaging.PackageStore> cache.
160160
@@ -449,8 +449,8 @@
449449
<ReturnType>System.Uri</ReturnType>
450450
</ReturnValue>
451451
<Docs>
452-
<summary>Gets the [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the resource associated with the request.</summary>
453-
<value>The [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)] of the resource associated with the request.</value>
452+
<summary>Gets the URI of the resource associated with the request.</summary>
453+
<value>The uniform resource identifier (URI) of the resource associated with the request.</value>
454454
<remarks>To be added.</remarks>
455455
<altmember cref="T:System.IO.Packaging.PackUriHelper" />
456456
</Docs>

xml/System.IO.Packaging/PackWebRequestFactory.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
<Parameter Name="uri" Type="System.Uri" />
7777
</Parameters>
7878
<Docs>
79-
<param name="uri">The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] to create the Web request.</param>
79+
<param name="uri">The URI to create the Web request.</param>
8080
<summary>This member supports the [!INCLUDE[TLA#tla_winclient](~/includes/tlasharptla-winclient-md.md)] infrastructure and is not intended to be used directly from your code. Use the type-safe <see cref="T:System.IO.Packaging.PackUriHelper" /> method instead.</summary>
8181
<returns>The pack URI Web request.</returns>
8282
<remarks>
8383
<format type="text/markdown"><![CDATA[
8484
8585
## Remarks
86-
Creates a pack URI Web request from a given [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)].
86+
Creates a pack URI Web request from a given uniform resource identifier (URI).
8787
8888
]]></format>
8989
</remarks>

xml/System.IO.Packaging/PackWebResponse.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
## Remarks
2323
When you use the pack URI protocol, you can reference a package and its part elements either locally from inside a package or externally from a Web source.
2424
25-
For the pack URI protocol, the forward-slash characters (//) of an embedded [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)] are represented by commas (,,). For example: `pack://http:,,www.adatum.com,folder,file.package/images/picture1.jpg` references the file `/images/picture1.jpg` that is contained in `http://www.adatum.com/folder/file.package`.
25+
For the pack URI protocol, the forward-slash characters (//) of an embedded uniform resource identifier (URI) are represented by commas (,,). For example: `pack://http:,,www.adatum.com,folder,file.package/images/picture1.jpg` references the file `/images/picture1.jpg` that is contained in `http://www.adatum.com/folder/file.package`.
2626
2727
]]></format>
2828
</remarks>
@@ -278,8 +278,8 @@
278278
<ReturnType>System.Uri</ReturnType>
279279
</ReturnValue>
280280
<Docs>
281-
<summary>Gets the [!INCLUDE[TLA#tla_uri](~/includes/tlasharptla-uri-md.md)] of the response.</summary>
282-
<value>The [!INCLUDE[TLA2#tla_uri](~/includes/tla2sharptla-uri-md.md)] of the response.</value>
281+
<summary>Gets the uniform resource identifier (URI) of the response.</summary>
282+
<value>The URI of the response.</value>
283283
<remarks>To be added.</remarks>
284284
<related type="ExternalDocumentation" href="https://go.microsoft.com/fwlink/?LinkID=73431">The Addressing Model of the Open Packaging Conventions</related>
285285
</Docs>

0 commit comments

Comments
 (0)