aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/docs.yml2
-rw-r--r--docs.md2
-rw-r--r--src/fpm/cmd/new.f904
-rw-r--r--src/fpm_command_line.f902
4 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 635156d..2ecb418 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
- name: Build Documentation
run: ford docs.md
- uses: JamesIves/github-pages-deploy-action@3.7.1
- if: github.event_name == 'push' && github.repository == 'fortran-lang/fpm' && ( startsWith( github.ref, 'refs/tags/' ) || github.ref == 'refs/heads/master' )
+ if: github.event_name == 'push' && github.repository == 'fortran-lang/fpm' && ( startsWith( github.ref, 'refs/tags/' ) || github.ref == 'refs/heads/main' )
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
diff --git a/docs.md b/docs.md
index 218367c..e94a563 100644
--- a/docs.md
+++ b/docs.md
@@ -2,7 +2,7 @@
project: Fortran-lang/fpm
summary: Fortran Package Manager
project_github: https://github.com/fortran-lang/fpm
-project_download: https://github.com/fortran-lang/fpm/archive/master.zip
+project_download: https://github.com/fortran-lang/fpm/archive/main.zip
author: fortran-lang/fpm contributors
author_pic: https://fortran-lang.org/assets/img/fortran_logo_512x512.png
author_email: fortran-lang@groups.io
diff --git a/src/fpm/cmd/new.f90 b/src/fpm/cmd/new.f90
index abc1d67..a402432 100644
--- a/src/fpm/cmd/new.f90
+++ b/src/fpm/cmd/new.f90
@@ -131,9 +131,9 @@ character(len=:,kind=tfc),allocatable :: littlefile(:)
&' # The fpm home page at ',&
&' # https://github.com/fortran-lang/fpm ',&
&' # A complete list of keys and their attributes at ',&
- &' # https://github.com/fortran-lang/fpm/blob/master/manifest-reference.md ',&
+ &' # https://github.com/fortran-lang/fpm/blob/main/manifest-reference.md ',&
&' # examples of fpm project packaging at ',&
- &' # https://github.com/fortran-lang/fpm/blob/master/PACKAGING.md ',&
+ &' # https://github.com/fortran-lang/fpm/blob/main/PACKAGING.md ',&
&' # The Fortran TOML file interface and it''s references at ',&
&' # https://github.com/toml-f/toml-f ',&
&' # ',&
diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90
index 2f00b58..178e885 100644
--- a/src/fpm_command_line.f90
+++ b/src/fpm_command_line.f90
@@ -723,7 +723,7 @@ contains
' + 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://github.com/fortran-lang/fpm/blob/master/manifest-reference.md ', &
+ ' https://github.com/fortran-lang/fpm/blob/main/manifest-reference.md ', &
'']
help_list=[character(len=80) :: &
'NAME ', &