Skip to content

Commit

Permalink
Merge branch 'main' into all-assemblies-per-rid
Browse files Browse the repository at this point in the history
* main:
  [Documentation] Appease PoliCheck Rule: 79604 (dotnet#8197)
  • Loading branch information
grendello committed Jul 19, 2023
2 parents 49e6ff4 + 5507af9 commit 4ccbc52
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Documentation/guides/building-apps/build-items.md
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ In a Xamarin.Android binding project, the **JavaDocJar** build action
is used on `.jar` files that contain *Javadoc HTML*. The Javadoc HTML
is parsed in order to extract parameter names.

Only certain "Javadoc HTML dialects" are supported, including:
Only certain "Javadoc HTML variations" are supported, including:

* JDK 1.7 `javadoc` output.
* JDK 1.8 `javadoc` output.
Expand Down
4 changes: 2 additions & 2 deletions Documentation/workflow/commit-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ message is where to put that information.

# English

Commit message should be properly spelled in some English dialect; it doesn't
need to be American English vs. British English, but for whichever dialect
Commit message should be properly spelled in some English regional language; it doesn't
need to be American English vs. British English, but for whichever regional language
*is* used, words should be spelled correctly. Proper grammar should be used.

Present tense should be used for work done within the current commit.
Expand Down

0 comments on commit 4ccbc52

Please sign in to comment.