Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Documentation fixes: help text and manifest URL #999

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Documentation fixes: help text and manifest URL #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d2e91
doc: fix manifest URL
rouson Feb 25, 2024
dc32c50
doc(fpm_command_line): fix help text
rouson Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifest-reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# 301 - Moved

This document now lives at https://fpm.fortran-lang.org/en/spec/manifest.html.
This document now lives at https://fpm.fortran-lang.org/spec/manifest.html
9 changes: 5 additions & 4 deletions src/fpm_command_line.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ module fpm_command_line
' --flag FFLAGS selects compile arguments for the build, the default value is',&
' set by the FPM_FFLAGS environment variable. These are added ',&
' to the profile options if --profile is specified, else these ',&
' options override the defaults. Note object and .mod ',&
' are added to the defaults. To override the defaults, use the ',&
' keyword [fortran] in the manifest. Note object and .mod ',&
' directory locations are always built in. ',&
' --c-flag CFLAGS selects compile arguments specific for C source in the build.',&
' The default value is set by the FPM_CFLAGS environment ',&
Expand Down Expand Up @@ -972,7 +973,7 @@ subroutine set_help()
' + The fpm(1) home page is at https://github.com/fortran-lang/fpm ', &
' + Registered fpm(1) packages are at https://fortran-lang.org/packages ', &
' + The fpm(1) TOML file format is described at ', &
' https://fpm.fortran-lang.org/en/spec/manifest.html ', &
' https://fpm.fortran-lang.org/spec/manifest.html ', &
'']
help_list=[character(len=80) :: &
'NAME ', &
Expand Down Expand Up @@ -1404,10 +1405,10 @@ subroutine set_help()
' See documentation for more information regarding package upload and usage:', &
'', &
' Package upload:', &
' https://fpm.fortran-lang.org/en/spec/publish.html', &
' https://fpm.fortran-lang.org/spec/publish.html', &
'', &
' Package usage:', &
' https://fpm.fortran-lang.org/en/spec/manifest.html#dependencies-from-a-registry', &
' https://fpm.fortran-lang.org/spec/manifest.html#dependencies-from-a-registry', &
'', &
'OPTIONS', &
' --show-package-version show package version without publishing', &
Expand Down
Loading