Skip to content

Commit 6c21128

Browse files
committed
remove master and replace with main [skip ci]
1 parent 7f070d9 commit 6c21128

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
1010
|-----|-------|-----|--------|--------|
1111
| latest/3.1.1 | Main Branch |1.22.1 | 8.2.4 | 3.17 |
1212

13-
For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)
13+
For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/versioning.md)
1414

1515
__NOTE:__ From 2.0.5 onwards there are x86 and arm64 builds available
1616

@@ -38,29 +38,29 @@ You can then browse to ```http://<DOCKER_HOST>``` to view the default install fi
3838
For more detailed examples and explanations please refer to the documentation.
3939
## Documentation
4040

41-
- [Building from source](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/building.md)
42-
- [Versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)
43-
- [Config Flags](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/config_flags.md)
44-
- [Git Auth](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md)
45-
- [Personal Access token](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md#personal-access-token)
46-
- [SSH Keys](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md#ssh-keys)
47-
- [Git Commands](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md)
48-
- [Push](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md#push-code-to-git)
49-
- [Pull](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md#pull-code-from-git-refresh)
50-
- [Repository layout / webroot](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/repo_layout.md)
51-
- [webroot](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/repo_layout.md#src--webroot)
52-
- [User / Group Identifiers](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/UID_GID_Mapping.md)
53-
- [Custom Nginx Config files](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/nginx_configs.md)
54-
- [REAL IP / X-Forwarded-For Headers](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/nginx_configs.md#real-ip--x-forwarded-for-headers)
55-
- [Scripting and Templating](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/scripting_templating.md)
56-
- [Environment Variables](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/scripting_templating.md#using-environment-variables--templating)
57-
- [Lets Encrypt Support](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md)
58-
- [Setup](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md#setup)
59-
- [Renewal](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md#renewal)
60-
- [PHP Modules](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/php_modules.md)
61-
- [Xdebug](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/xdebug.md)
62-
- [Logging and Errors](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/logs.md)
41+
- [Building from source](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/building.md)
42+
- [Versioning](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/versioning.md)
43+
- [Config Flags](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/config_flags.md)
44+
- [Git Auth](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_auth.md)
45+
- [Personal Access token](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_auth.md#personal-access-token)
46+
- [SSH Keys](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_auth.md#ssh-keys)
47+
- [Git Commands](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_commands.md)
48+
- [Push](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_commands.md#push-code-to-git)
49+
- [Pull](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/git_commands.md#pull-code-from-git-refresh)
50+
- [Repository layout / webroot](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/repo_layout.md)
51+
- [webroot](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/repo_layout.md#src--webroot)
52+
- [User / Group Identifiers](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/UID_GID_Mapping.md)
53+
- [Custom Nginx Config files](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/nginx_configs.md)
54+
- [REAL IP / X-Forwarded-For Headers](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/nginx_configs.md#real-ip--x-forwarded-for-headers)
55+
- [Scripting and Templating](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/scripting_templating.md)
56+
- [Environment Variables](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/scripting_templating.md#using-environment-variables--templating)
57+
- [Lets Encrypt Support](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/lets_encrypt.md)
58+
- [Setup](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/lets_encrypt.md#setup)
59+
- [Renewal](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/lets_encrypt.md#renewal)
60+
- [PHP Modules](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/php_modules.md)
61+
- [Xdebug](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/xdebug.md)
62+
- [Logging and Errors](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/logs.md)
6363

6464
## Guides
65-
- [Running in Kubernetes](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/guides/kubernetes.md)
66-
- [Using Docker Compose](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/guides/docker_compose.md)
65+
- [Running in Kubernetes](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/guides/kubernetes.md)
66+
- [Using Docker Compose](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/guides/docker_compose.md)

docs/scripting_templating.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Scripting
2-
There is often an occasion where you need to run a script on code to do a transformation once code lands in the container. For this reason we have developed scripting support. By including a scripts folder in your git repository and passing the __RUN_SCRIPTS=1__ flag to your command line the container will execute your scripts. Please see the [repo layout guidelines](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/repo_layout.md) for more details on how to organise this.
2+
There is often an occasion where you need to run a script on code to do a transformation once code lands in the container. For this reason we have developed scripting support. By including a scripts folder in your git repository and passing the __RUN_SCRIPTS=1__ flag to your command line the container will execute your scripts. Please see the [repo layout guidelines](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/repo_layout.md) for more details on how to organise this.
33

44
## Using environment variables / templating
55
To set the variables pass them in as environment variables on the docker command line.

docs/versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n
1111

1212
### Current versions and tags
1313

14-
The latest tag will always follow the master branch in git. the other versions will have releases attached.
14+
The latest tag will always follow the main branch in git. the other versions will have releases attached.
1515

1616
#### PHP 8.2.x
1717

0 commit comments

Comments
 (0)