Skip to content

Commit 5786b1e

Browse files
authored
Merge pull request #3223 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents 8400891 + a6f8067 commit 5786b1e

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

docs/vs-2015/snippets/csharp/VS_Snippets_Misc/wifclaimsbasedauthorization/cs/webapplication/claims.aspx.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected void Page_Load(object sender, EventArgs e)
2929
// Create a ClaimsPrincipal object from the current user to work with claims
3030
ClaimsPrincipal claimsPrincipal = User as ClaimsPrincipal;
3131

32-
// We can use the FindFirst method to get the first occurance of a specific claim.
32+
// We can use the FindFirst method to get the first occurrence of a specific claim.
3333
// This is very useful when you only expect a single instance of a particular claim type.
3434
// Note the ClaimTypes class contains many common claims defined as properties for your use.
3535

@@ -54,4 +54,4 @@ protected void Page_Load(object sender, EventArgs e)
5454

5555
}
5656
}
57-
}
57+
}

docs/vs-2015/snippets/csharp/VS_Snippets_Misc/wifcustomtokenst/cs/simplewebtoken/simplewebtokenhandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public SimpleWebTokenHandler()
4949
}
5050

5151
/// <summary>
52-
/// Gets the System.Type of the SecurityToken is supported by ththis handler.
52+
/// Gets the System.Type of the SecurityToken is supported by this handler.
5353
/// </summary>
54-
/// <value>The System.Type of the SecurityToken is supported by ththis handler.</value>
54+
/// <value>The System.Type of the SecurityToken is supported by this handler.</value>
5555
public override Type TokenType
5656
{
5757
get
@@ -447,7 +447,7 @@ protected virtual void ValidateAudience( string tokenAudience )
447447
/// Parses the token into a collection.
448448
/// </summary>
449449
/// <param name="encodedToken">The serialized token.</param>
450-
/// <returns>A colleciton of all name-value pairs from the token.</returns>
450+
/// <returns>A collection of all name-value pairs from the token.</returns>
451451
NameValueCollection ParseToken( string encodedToken )
452452
{
453453
if ( String.IsNullOrEmpty( encodedToken ) )

docs/vs-2015/snippets/csharp/VS_Snippets_Misc/wifcustomtokensts/cs/simplewebtoken/simplewebtokenhandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public SimpleWebTokenHandler()
4949
}
5050

5151
/// <summary>
52-
/// Gets the System.Type of the SecurityToken is supported by ththis handler.
52+
/// Gets the System.Type of the SecurityToken is supported by this handler.
5353
/// </summary>
54-
/// <value>The System.Type of the SecurityToken is supported by ththis handler.</value>
54+
/// <value>The System.Type of the SecurityToken is supported by this handler.</value>
5555
public override Type TokenType
5656
{
5757
get
@@ -447,7 +447,7 @@ protected virtual void ValidateAudience( string tokenAudience )
447447
/// Parses the token into a collection.
448448
/// </summary>
449449
/// <param name="encodedToken">The serialized token.</param>
450-
/// <returns>A colleciton of all name-value pairs from the token.</returns>
450+
/// <returns>A collection of all name-value pairs from the token.</returns>
451451
NameValueCollection ParseToken( string encodedToken )
452452
{
453453
if ( String.IsNullOrEmpty( encodedToken ) )

docs/vs-2015/snippets/csharp/VS_Snippets_Misc/wifrccustomtoken/cs/simplewebtoken/simplewebtokenhandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ protected virtual void ValidateAudience( string tokenAudience )
477477
/// Parses the token into a collection.
478478
/// </summary>
479479
/// <param name="encodedToken">The serialized token.</param>
480-
/// <returns>A colleciton of all name-value pairs from the token.</returns>
480+
/// <returns>A collection of all name-value pairs from the token.</returns>
481481
NameValueCollection ParseToken( string encodedToken )
482482
{
483483
if ( String.IsNullOrEmpty( encodedToken ) )

docs/vs-2015/snippets/csharp/VS_Snippets_Wpf/FlowDocumentSnippets/CSharp/Window1.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
boundaries obvious.
5555

5656
The column gap is the space between columns; this FlowDocument will
57-
have a column gap of 20 device-independend pixels. The column rule
57+
have a column gap of 20 device-independent pixels. The column rule
5858
is a vertical line drawn in the column gap, and is used to visually
5959
separate columns; this FlowDocument a Dodger-blue column rule that
6060
is 5 pixels wide.

docs/vs-2015/snippets/csharp/VS_Snippets_Wpf/FlowDocumentSnippets/CSharp/Window1.xaml.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void BlocksProperty()
106106
flowDoc.Blocks.Add(new Paragraph(new Run("Text to append...")));
107107
// </Snippet_FlowDocumentBlocksAdd>
108108

109-
// Insert a content block at the begining of the FlowDocument.
109+
// Insert a content block at the beginning of the FlowDocument.
110110
// <Snippet_FlowDocumentBlocksInsert>
111111
Paragraph p = new Paragraph(new Run("Text to insert..."));
112112
flowDoc.Blocks.InsertBefore(flowDoc.Blocks.FirstBlock, p);
@@ -136,7 +136,7 @@ void BlocksPropertyGen()
136136
secx.Blocks.Add(new Paragraph(new Run("A bit of text content...")));
137137
// </Snippet_SectionBlocksAdd>
138138

139-
// Insert a content block at the begining of the Section.
139+
// Insert a content block at the beginning of the Section.
140140
// <Snippet_SectionBlocksInsert>
141141
Paragraph parx = new Paragraph(new Run("Text to insert..."));
142142
secx.Blocks.InsertBefore(secx.Blocks.FirstBlock, parx);
@@ -163,7 +163,7 @@ void ColumnStuff()
163163
{
164164
// <Snippet_FlowDocumentColumnGap>
165165
FlowDocument flowDoc = new FlowDocument(new Paragraph(new Run("A bit of text content...")));
166-
// Set the desired column gap to 10 device independend pixels.
166+
// Set the desired column gap to 10 device independent pixels.
167167
flowDoc.ColumnGap = 10.0;
168168
// </Snippet_FlowDocumentColumnGap>
169169
}
@@ -224,7 +224,7 @@ void ContentStartEnd()
224224
"Since the new FlowDocument is empty at this point, this will be the initial content " +
225225
"in the FlowDocument."
226226
)));
227-
// Insert a line-break at the beginnign of the document, before the previously inserted paragraph.
227+
// Insert a line-break at the beginning of the document, before the previously inserted paragraph.
228228
flowDoc.Blocks.InsertBefore(flowDoc.Blocks.FirstBlock, new Paragraph(new LineBreak()));
229229
// Insert another paragraph at the beginning of the document.
230230
flowDoc.Blocks.InsertBefore(flowDoc.Blocks.FirstBlock, new Paragraph(new Run(
@@ -248,7 +248,7 @@ void FontStuff()
248248
{
249249
// <Snippet_FlowDocumentFontStuff>
250250
FlowDocument flowDoc = new FlowDocument(new Paragraph(new Run("A bit of text content...")));
251-
// Set the desired column gap to 10 device independend pixels.
251+
// Set the desired column gap to 10 device independent pixels.
252252
flowDoc.FontFamily = new FontFamily("Century Gothic");
253253
flowDoc.FontSize = 12.0;
254254
flowDoc.FontStretch = FontStretches.UltraExpanded;
@@ -351,7 +351,7 @@ void TextEffectsStuff()
351351
tfe.PositionStart = 0;
352352
tfe.PositionCount = int.MaxValue;
353353

354-
// Add this text effect to the FlowDocument's effects colleciton.
354+
// Add this text effect to the FlowDocument's effects collection.
355355
fd.TextEffects = new TextEffectCollection();
356356
fd.TextEffects.Add(tfe);
357357

docs/vs-2015/snippets/csharp/VS_Snippets_Wpf/ListSnippets/CSharp/Window1.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void ListItemsProp()
8080
listx.ListItems.Add(new ListItem(new Paragraph(new Run("A bit of text content..."))));
8181
listx.ListItems.Add(new ListItem(new Paragraph(new Run("A bit more text content..."))));
8282

83-
// Insert a ListItem at the begining of the List.
83+
// Insert a ListItem at the beginning of the List.
8484
ListItem lix = new ListItem(new Paragraph(new Run("ListItem to insert...")));
8585
listx.ListItems.InsertBefore(listx.ListItems.FirstListItem, lix);
8686

docs/vs-2015/snippets/csharp/VS_Snippets_Wpf/SpanSnippets/CSharp/Window1.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void InlinesProp()
126126
spanx.Inlines.Add(new Run("A bit more text content..."));
127127
// </Snippet_SpanInlinesAdd>
128128

129-
// Insert a content inline at the begining of the Span.
129+
// Insert a content inline at the beginning of the Span.
130130
// <Snippet_SpanInlinesInsert>
131131
Run runx = new Run("Text to insert...");
132132
spanx.Inlines.InsertBefore(spanx.Inlines.FirstInline, runx);

docs/vs-2015/snippets/csharp/VS_Snippets_Wpf/basicmanipulation/csharp/mainwindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void Window_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
5959
new Rect(rectToMove.RenderSize));
6060

6161
// Check if the rectangle is completely in the window.
62-
// If it is not and intertia is occuring, stop the manipulation.
62+
// If it is not and intertia is occurring, stop the manipulation.
6363
if (e.IsInertial && !containingRect.Contains(shapeBounds))
6464
{
6565
e.Complete();

docs/vs-2015/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
boundaries obvious.
5454

5555
The column gap is the space between columns; this FlowDocument will
56-
have a column gap of 20 device-independend pixels. The column rule
56+
have a column gap of 20 device-independent pixels. The column rule
5757
is a vertical line drawn in the column gap, and is used to visually
5858
separate columns; this FlowDocument a Dodger-blue column rule that
5959
is 5 pixels wide.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Namespace FlowDocumentSnippets
9494
flowDoc.Blocks.Add(New Paragraph(New Run("Text to append...")))
9595
' </Snippet_FlowDocumentBlocksAdd>
9696

97-
' Insert a content block at the begining of the FlowDocument.
97+
' Insert a content block at the beginning of the FlowDocument.
9898
' <Snippet_FlowDocumentBlocksInsert>
9999
Dim p As New Paragraph(New Run("Text to insert..."))
100100
flowDoc.Blocks.InsertBefore(flowDoc.Blocks.FirstBlock, p)
@@ -123,7 +123,7 @@ Namespace FlowDocumentSnippets
123123
secx.Blocks.Add(New Paragraph(New Run("A bit of text content...")))
124124
' </Snippet_SectionBlocksAdd>
125125

126-
' Insert a content block at the begining of the Section.
126+
' Insert a content block at the beginning of the Section.
127127
' <Snippet_SectionBlocksInsert>
128128
Dim parx As New Paragraph(New Run("Text to insert..."))
129129
secx.Blocks.InsertBefore(secx.Blocks.FirstBlock, parx)
@@ -148,7 +148,7 @@ Namespace FlowDocumentSnippets
148148
Private Sub ColumnStuff()
149149
' <Snippet_FlowDocumentColumnGap>
150150
Dim flowDocColGap As New FlowDocument(New Paragraph(New Run("A bit of text content...")))
151-
' Set the desired column gap to 10 device independend pixels.
151+
' Set the desired column gap to 10 device independent pixels.
152152
flowDocColGap.ColumnGap = 10.0
153153
' </Snippet_FlowDocumentColumnGap>
154154

@@ -191,7 +191,7 @@ Namespace FlowDocumentSnippets
191191

192192
' Insert an initial paragraph at the beginning of the empty FlowDocument.
193193
flowDocStart.Blocks.Add(New Paragraph(New Run("Since the new FlowDocument is empty at this point, this will be the initial content " & "in the FlowDocument.")))
194-
' Insert a line-break at the beginnign of the document, before the previously inserted paragraph.
194+
' Insert a line-break at the beginning of the document, before the previously inserted paragraph.
195195
flowDocStart.Blocks.InsertBefore(flowDocStart.Blocks.FirstBlock, New Paragraph(New LineBreak()))
196196
' Insert another paragraph at the beginning of the document.
197197
flowDocStart.Blocks.InsertBefore(flowDocStart.Blocks.FirstBlock, New Paragraph(New Run("This paragraph will be inserted before the previously added paragraph, replacing the previously" & "added paragraph as the first paragraph in the document.")))
@@ -209,7 +209,7 @@ Namespace FlowDocumentSnippets
209209
Private Sub FontStuff()
210210
' <Snippet_FlowDocumentFontStuff>
211211
Dim flowDoc As New FlowDocument(New Paragraph(New Run("A bit of text content...")))
212-
' Set the desired column gap to 10 device independend pixels.
212+
' Set the desired column gap to 10 device independent pixels.
213213
flowDoc.FontFamily = New FontFamily("Century Gothic")
214214
flowDoc.FontSize = 12.0
215215
flowDoc.FontStretch = FontStretches.UltraExpanded
@@ -306,7 +306,7 @@ Namespace FlowDocumentSnippets
306306
tfe.PositionStart = 0
307307
tfe.PositionCount = Integer.MaxValue
308308

309-
' Add this text effect to the FlowDocument's effects colleciton.
309+
' Add this text effect to the FlowDocument's effects collection.
310310
fd.TextEffects = New TextEffectCollection()
311311
fd.TextEffects.Add(tfe)
312312

docs/vs-2015/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Namespace ListSnippets
7474
listx.ListItems.Add(New ListItem(New Paragraph(New Run("A bit of text content..."))))
7575
listx.ListItems.Add(New ListItem(New Paragraph(New Run("A bit more text content..."))))
7676

77-
' Insert a ListItem at the begining of the List.
77+
' Insert a ListItem at the beginning of the List.
7878
Dim lix As New ListItem(New Paragraph(New Run("ListItem to insert...")))
7979
listx.ListItems.InsertBefore(listx.ListItems.FirstListItem, lix)
8080

docs/vs-2015/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Namespace SpanSnippets
113113
spanx.Inlines.Add(New Run("A bit more text content..."))
114114
' </Snippet_SpanInlinesAdd>
115115

116-
' Insert a content inline at the begining of the Span.
116+
' Insert a content inline at the beginning of the Span.
117117
' <Snippet_SpanInlinesInsert>
118118
Dim runx As New Run("Text to insert...")
119119
spanx.Inlines.InsertBefore(spanx.Inlines.FirstInline, runx)

docs/vs-2015/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
New Rect(rectToMove.RenderSize))
4545

4646
' Check if the rectangle is completely in the window.
47-
' If it is not and intertia is occuring, stop the manipulation.
47+
' If it is not and intertia is occurring, stop the manipulation.
4848
If e.IsInertial AndAlso Not containingRect.Contains(shapeBounds) Then
4949
e.Complete()
5050
End If

0 commit comments

Comments
 (0)