Skip to content

Commit 9071b9d

Browse files
committed
adjust to semantic branch naming
1 parent 223f86f commit 9071b9d

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- "*.x"
77
pull_request:
88

99
env:

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Spellcheck
33
on:
44
push:
55
branches:
6-
- master
6+
- "*.x"
77
pull_request:
88

99
jobs:

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Static analysis
33
on:
44
push:
55
branches:
6-
- master
6+
- "*.x"
77
pull_request:
88

99
jobs:

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,5 @@
5454
"psr-4": {
5555
"FOS\\HttpCache\\Tests\\": "tests/"
5656
}
57-
},
58-
"extra": {
59-
"branch-alias": {
60-
"dev-master": "2.10.x-dev"
61-
}
6257
}
6358
}

doc/varnish-configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ To enable this feature, add the following to ``your_varnish.vcl``:
470470
471471
.. _ACL: https://www.varnish-cache.org/docs/4.0/users-guide/vcl-example-acls.html
472472
.. _ACL for Varnish 3: https://www.varnish-cache.org/docs/3.0/tutorial/vcl.html#example-3-acls
473-
.. _directory of FOSHttpCache: https://github.com/FriendsOfSymfony/FOSHttpCache/tree/master/resources/config
473+
.. _directory of FOSHttpCache: https://github.com/FriendsOfSymfony/FOSHttpCache/tree/2.x/resources/config
474474
.. _handling PURGE requests: https://www.varnish-cache.org/docs/4.0/users-guide/purging.html#bans
475475
.. _purging for Varnish 3: https://www.varnish-cache.org/docs/3.0/tutorial/purging.html
476476
.. _forcing a refresh: https://www.varnish-cache.org/docs/4.0/users-guide/purging.html#forcing-a-cache-miss
@@ -480,7 +480,7 @@ To enable this feature, add the following to ``your_varnish.vcl``:
480480
.. _ban lurker: https://www.varnish-software.com/blog/ban-lurker
481481
.. _explained in the Varnish documentation: https://www.varnish-cache.org/trac/wiki/VCLExampleRemovingSomeCookies#RemovingallBUTsomecookies
482482
.. _curl Varnish plugin: https://github.com/varnish/libvmod-curl
483-
.. _xkey Varnish module: https://github.com/varnish/varnish-modules/blob/master/docs/vmod_xkey.rst
483+
.. _xkey Varnish module: https://github.com/varnish/varnish-modules/blob/master/docs/vmod_xkey.vcc
484484
.. _ykey documentation: https://docs.varnish-software.com/varnish-cache-plus/vmods/ykey/
485485
.. _Cache Invalidation chapter of the Varnish documentation: http://book.varnish-software.com/4.0/chapters/Cache_Invalidation.html#hashtwo-xkey-varnish-software-implementation-of-surrogate-keys
486486
.. _installing xkey: https://github.com/varnish/varnish-modules#installation

0 commit comments

Comments
 (0)