Test merge conflict #4
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Owner
velkovb
commented
Oct 4, 2019
velkovb
commented
- [ ]
made changes to the ID description.
Issue - "fill in the blank" assignments - Description has been updated now.
Issue - "fill in the blank" assignments - Description has been updated now.
Issue - "fill in the blank" assignments - Description has been updated now.
Issue - "fill in the blank" assignments - Description has been updated now.
Added parameter description in 2012 version and adjusted formatting in all versions so it is uniform.
Removed the "registered trademark symbol"
I've updated the document with the suggested modifications. Kindly review. Thank you.
Added syntax description
Corrected Syntax
Corrected syntax
added SMb instance
added SMB instance
added Description for examples and added description for SMB instance
Co-Authored-By: JohanFreelancer9 <48568725+JohanFreelancer9@users.noreply.github.com>
added a commit to update description for SMB instance on 2012 r2 version
added a commit to update SMinstance description to 2012 R2 version
update example description and SMB instance
updated syntax description and added Cannot use wildcards in ID description
updated ID description with cannot use wild cards
updated example description and added SMB instance
updated example and SMB instance description for 2012 R2 version.
added a description to examples and correct syntax.
added description for enableloadbalancescaleout
updated syntax description
added description for SMB instance
Add parameter description.
Publish 10/1/2019 10:30 PST
Update Remove-SmbShare.md
Update Revoke-SmbShareAccess.md
Update Set-SmbShare.md
Update set-smbclientconfiguration.md
Update add-neteventpacketcaptureprovider.md
Update Grant-SmbShareAccess.md
Merge pull request MicrosoftDocs#1403 from MicrosoftDocs/master
Publish 10/02/2019 10:30 PST
Fix casing of `windows` module and cmdlet filenames
Publish 10/02/2019 3:31 PM PST
Co-Authored-By: JohanFreelancer9 <48568725+JohanFreelancer9@users.noreply.github.com>
Co-Authored-By: JohanFreelancer9 <48568725+JohanFreelancer9@users.noreply.github.com>
Update Get-NetTCPConnection.md
Update Get-DtcAdvancedHostSetting.md
Add cmdlets description in Hyper-V.md
Update Get-SmbClientNetworkInterface.md
Update Get-SmbServerNetworkInterface.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.