Skip to content

Update the man help file used in packaging#5173

Merged
adityapatwardhan merged 2 commits intoPowerShell:masterfrom
daxian-dbw:manfile
Oct 19, 2017
Merged

Update the man help file used in packaging#5173
adityapatwardhan merged 2 commits intoPowerShell:masterfrom
daxian-dbw:manfile

Conversation

@daxian-dbw
Copy link
Copy Markdown
Member

@daxian-dbw daxian-dbw commented Oct 19, 2017

Update the man help file to reflect the name change.
I only changed the executable name. I think we should continue to use PowerShell in the rest of file

After this change, you will get No manual entry for powershell when running man powershell.
This is how it looks like when running man pwsh
image

adityapatwardhan
adityapatwardhan reviewed Oct 19, 2017
View reviewed changes
.gitignore
# generated man files
/assets/powershell.1*

# resgen output
Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan Oct 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need /assets/pwsh.1* here?

Copy link
Copy Markdown
Member Author

@daxian-dbw daxian-dbw Oct 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need it. New-UnixPackage command will clean up the generated pwsh.1.gz file in the end.

adityapatwardhan
adityapatwardhan approved these changes Oct 19, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adityapatwardhan adityapatwardhan merged commit 2fd484f into PowerShell:master Oct 19, 2017
@daxian-dbw daxian-dbw deleted the manfile branch October 19, 2017 22:12
@iSazonov
Copy link
Copy Markdown
Collaborator

iSazonov commented Oct 20, 2017 •
edited
Loading

We should fix in ManagedEntranceStrings.resx:

 powershell /h

Usage: powershell[.exe] [[-File] <filePath> [args]]
                        [-Command { - | <script-block> [-args <arg-array>]
                                      | <string> [<CommandParameters>] } ]
                        [-ConfigurationName <string>] [-EncodedCommand <Base64EncodedCommand>]
                        [-ExecutionPolicy <ExecutionPolicy>] [-InputFormat {Text | XML}]
                        [-Interactive] [-NoExit] [-NoLogo] [-NonInteractive] [-NoProfile]
                        [-OutputFormat {Text | XML}] [-Version] [-WindowStyle <style>]

       powershell[.exe] -h | -Help | -? | /?

@daxian-dbw
Copy link
Copy Markdown
Member Author

daxian-dbw commented Oct 20, 2017

Good catch. I will submit a PR shortly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SteveL-MSFT SteveL-MSFT SteveL-MSFT approved these changes

@adityapatwardhan adityapatwardhan adityapatwardhan approved these changes

@TravisEz13 TravisEz13 Awaiting requested review from TravisEz13

Assignees

@adityapatwardhan adityapatwardhan

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@daxian-dbw @iSazonov @SteveL-MSFT @adityapatwardhan