Tom Moulard
|
fbf90e6981
|
Update Gateway API links
|
2022-06-01 10:42:08 +02:00 |
|
romain
|
521109d3f2
|
Merge current v2.7 into master
|
2022-05-30 12:14:26 +02:00 |
|
romain
|
05f3e60366
|
Merge branch v2.6 into v2.7
|
2022-05-24 17:49:39 +02:00 |
|
Kevin Pollet
|
d5ff301d90
|
Support certificates configuration in TLSStore CRD
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
|
2022-05-19 16:42:09 +02:00 |
|
Ludovic Fernandez
|
d134a993d0
|
docs: fix default priority of the entrypoint redirection
|
2022-05-19 08:56:07 +02:00 |
|
Tom Moulard
|
707d355d4a
|
Merge branch v2.7 into master
|
2022-04-21 11:40:16 +02:00 |
|
Tom Moulard
|
73ba7ed2d2
|
Merge branch v2.6 into v2.7
|
2022-04-21 10:59:46 +02:00 |
|
Ludovic Fernandez
|
7c4bf602f0
|
Add title and description metadata to documentation pages
|
2022-04-15 15:44:08 +02:00 |
|
Tom Moulard
|
8c56d1a338
|
Allow HTTP/2 max concurrent stream configuration
|
2022-04-04 11:46:07 +02:00 |
|
Tom Moulard
|
a4560fa20d
|
Prepare release v2.7.0-rc1
|
2022-03-24 20:54:08 +01:00 |
|
romain
|
8d58f33a28
|
Merge v2.6 into master
|
2022-03-24 17:22:56 +01:00 |
|
Nikolay Stankov
|
ba2d09f6fb
|
Update entrypoint.md to add consistent CLI syntax
|
2022-03-23 10:38:09 +01:00 |
|
Tom Moulard
|
3bf4a8fbe2
|
Merge current v2.6 into master
|
2022-03-22 15:55:44 +01:00 |
|
Romain
|
2da7fa0397
|
Add HostSNIRegexp rule matcher for TCP
|
2022-03-18 16:04:08 +01:00 |
|
Daniel Tomcej
|
dad76e0478
|
Add muxer for TCP Routers
|
2022-03-17 18:02:08 +01:00 |
|
Tom Moulard
|
79aab5aab8
|
Add Failover service
Co-authored-by: Kevin Pollet <pollet.kevin@gmail.com>
|
2022-03-17 12:02:09 +01:00 |
|
Nick Reilingh
|
0617a1b0e0
|
Fix routing overview examples
|
2022-03-16 15:00:08 +01:00 |
|
Romain
|
a59dbc4c79
|
Adjust rule length in routers documentation
|
2022-03-04 11:24:07 +01:00 |
|
Kevin Pollet
|
40deefa868
|
Fix HostRegexp examples
|
2022-03-04 10:50:07 +01:00 |
|
mloiseleur
|
491de0cf64
|
Enhance doc on static vs dynamic configuration
|
2022-03-03 20:18:07 +01:00 |
|
Manuel Zapf
|
390eb9cb61
|
Explain a bit more around enabling HTTP3
|
2022-01-25 10:48:05 +01:00 |
|
Tom Moulard
|
936b6148ff
|
Merge current v2.5 into v2.6
|
2022-01-10 14:43:25 +01:00 |
|
Martin Rauscher
|
a9776ceafc
|
Improve regexp matcher documentation
|
2022-01-10 14:32:04 +01:00 |
|
Tom Moulard
|
da092e653d
|
Prepare release v2.6.0-rc1
|
2021-12-20 17:02:06 +01:00 |
|
Tom Moulard
|
89cd9e8ddd
|
Merge current v2.5 into master
|
2021-12-06 17:39:06 +01:00 |
|
Tom Moulard
|
82fdc569c2
|
docs: removing typo in consul-catalog provider doc
|
2021-12-01 15:58:05 +01:00 |
|
Julien Acroute
|
27ec0912d5
|
docs: health check use readiness probe in k8s
|
2021-11-15 11:14:06 +01:00 |
|
kerrsmith
|
0a31225e65
|
fixed minor spelling error in Regexp Syntax section
|
2021-11-09 16:50:11 +01:00 |
|
Tom Moulard
|
1f17731369
|
feat: add readIdleTimeout and pingTimeout config options to ServersTransport
Co-authored-by: Kevin Pollet <pollet.kevin@gmail.com>
|
2021-11-09 12:16:08 +01:00 |
|
Kevin Pollet
|
8e32d1913b
|
Update gateway api provider to v1alpha2
Co-authored-by: Tom Moulard <tom.moulard@traefik.io>
|
2021-11-09 11:34:06 +01:00 |
|
kevinpollet
|
ce47f200d5
|
Merge branch v2.5 into master
|
2021-11-08 22:41:43 +01:00 |
|
kerrsmith
|
a13b03ef3d
|
docs: add named groups details to Regexp Syntax section
|
2021-11-08 10:06:05 +01:00 |
|
Kevin Pollet
|
56ed45ae70
|
docs: remove non-working kind config in IngressRouteTCP/UDP examples
|
2021-10-26 12:08:12 +02:00 |
|
Romain
|
566b205758
|
Clarify usage for cross provider references in Kubernetes ingress annotations
|
2021-10-26 10:30:13 +02:00 |
|
Pedro López Mareque
|
d9b8435a7d
|
feat: rename networking.k8s.io/v1beta1 to networking.k8s.io/v1
|
2021-10-21 09:44:12 +02:00 |
|
Tom Moulard
|
969dd088a2
|
gateway api: support RouteNamespaces
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2021-10-04 15:46:08 +02:00 |
|
Tom Moulard
|
380514941c
|
Merge current v2.5 into master
|
2021-09-23 16:10:03 +02:00 |
|
Max Baumann
|
61ceb7a32c
|
docs: replace links to French translation of k8s docs with English ones
|
2021-09-21 16:28:11 +02:00 |
|
Kevin Pollet
|
bda0dba131
|
fix: add peerCertURI config to k8s crd provider
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2021-09-17 08:56:07 +02:00 |
|
Romain
|
76867e39ea
|
Fix ServersTransport reference from IngressRoute service definition
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2021-09-16 15:12:13 +02:00 |
|
Simon Stender Boisen
|
6f8e8ea252
|
Ensure disableHTTP2 works with k8s crd
|
2021-09-16 12:18:08 +02:00 |
|
valerauko
|
60ff50a675
|
Add HTTP3Config
|
2021-09-10 14:58:13 +02:00 |
|
Romain
|
2b73860ea5
|
Adds pathType for v1 ingresses examples
|
2021-09-02 10:20:12 +02:00 |
|
Romain
|
234d35f592
|
Fix alpine docker image to version 3.14
|
2021-08-30 11:38:12 +02:00 |
|
Romain
|
2644c1f598
|
Makes ALPN protocols configurable
|
2021-08-20 18:20:06 +02:00 |
|
Per Osbäck
|
e05574af58
|
Adds MiddlewareTCP CRD documentation
|
2021-08-19 17:00:14 +02:00 |
|
romain
|
78180a5fa7
|
Merge current v2.4 into v2.5
|
2021-08-19 11:45:19 +02:00 |
|
Romain
|
3445abe7ac
|
Fix Kubernetes Gateway API documentation links
|
2021-08-19 11:18:11 +02:00 |
|
romain
|
2bd60f9e60
|
Merge current v2.4 into v2.5
|
2021-08-17 10:05:22 +02:00 |
|
Avtion
|
fd4ba585ee
|
fix: an example code error in doc
|
2021-08-16 10:08:08 +02:00 |
|
Mohammad Gufran
|
7e43e5615e
|
Add Support for Consul Connect
Co-authored-by: Florian Apolloner <apollo13@users.noreply.github.com>
|
2021-07-15 14:02:11 +02:00 |
|
Romain
|
8070dfef45
|
Prepare release v2.5.0-rc1
|
2021-06-28 18:00:12 +02:00 |
|
romain
|
fc69f882c5
|
Merge current v2.4 into master
|
2021-06-28 10:07:17 +02:00 |
|
mpl
|
838a8e18d3
|
healthcheck: add support at the load-balancers of services level
Co-authored-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>
Co-authored-by: Julien Salleyron <julien.salleyron@gmail.com>
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
Co-authored-by: Tom Moulard <tom.moulard@traefik.io>
|
2021-06-25 21:08:11 +02:00 |
|
Wei Lun
|
55845c95bb
|
docs: fix invalid subdomain
|
2021-06-24 11:28:05 +02:00 |
|
romain
|
ce2e02b690
|
Merge current v2.4 into master
|
2021-06-22 14:44:56 +02:00 |
|
Tom Moulard
|
c9df233d24
|
Changing default file format for the snippets from TOML to YAML
|
2021-06-19 00:08:08 +02:00 |
|
Maël Valais
|
5ca210fa60
|
gateway-api: fix the "values" field in the example of httproute
|
2021-06-18 18:14:07 +02:00 |
|
Rio Kierkels
|
0a3e40332a
|
Improve CA certificate loading from kubernetes secret
|
2021-06-14 18:06:10 +02:00 |
|
Romain
|
fc9f41b955
|
Add TCP Middlewares support
|
2021-06-11 15:30:05 +02:00 |
|
Tom Moulard
|
679def0151
|
Add routing IP rule matcher
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
|
2021-06-07 18:14:09 +02:00 |
|
Julien Salleyron
|
dd04c432e9
|
Support not in rules definition
|
2021-05-31 18:58:05 +02:00 |
|
Jean-Baptiste Doumenjou
|
b1fd3b8fc7
|
fix for review
|
2021-05-28 17:38:46 +02:00 |
|
Wouter Dullaert
|
456df0fc19
|
feat: Add ServersTransport annotation to k8s ingress provider
|
2021-05-28 17:38:46 +02:00 |
|
Tom Moulard
|
56f845c71a
|
gatewayapi: adding support for TCPRoute and TLSRoute
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2021-05-20 11:50:12 +02:00 |
|
Romain
|
40f21f41e1
|
Fix ingressRouteTCP external name service examples in documentation
|
2021-05-06 12:04:08 +02:00 |
|
Tom Moulard
|
dc8d5ef744
|
Add a mechanism to format the sticky cookie value
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2021-04-29 17:56:03 +02:00 |
|
Jean-Baptiste Doumenjou
|
d3a3aeb0fc
|
Merge current branch v2.4 into master
|
2021-04-14 09:51:12 +02:00 |
|
Jean-Baptiste Doumenjou
|
fe6acdf4d2
|
Fix Kubernetes Gateway API documentation links
|
2021-04-13 18:26:03 +02:00 |
|
Jean-Baptiste Doumenjou
|
702e0a461a
|
Merge current branch v2.4 into master
|
2021-04-13 14:17:39 +02:00 |
|
Clemens Bergmann
|
aa61835b78
|
correct annotation option
|
2021-04-06 17:18:03 +02:00 |
|
Jean-Baptiste Doumenjou
|
cb4fb973b2
|
Merge current branch v2.4 into master
|
2021-03-31 09:43:04 +02:00 |
|
jcuzzi
|
d13d078351
|
Add ability to disable HTTP/2 in dynamic config
|
2021-03-29 14:32:03 +02:00 |
|
Romain
|
a513a05b7a
|
Raise errors for non-ASCII domain names in a router's rules
|
2021-03-22 21:16:04 +01:00 |
|
Manuel Zapf
|
29908098e4
|
Upgrade Ingress Handling to work with networkingv1/Ingress
|
2021-03-15 11:16:04 +01:00 |
|
Jean-Baptiste Doumenjou
|
08e6ae07af
|
Update to gateway-api v0.2.0
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
|
2021-03-15 09:44:03 +01:00 |
|
Jean-Baptiste Doumenjou
|
702e301990
|
Merge current branch v2.4 into master
|
2021-03-09 12:05:08 +01:00 |
|
Romain
|
ec0d03658d
|
Fix ServersTransport documentation
Co-authored-by: mpl <mathieu.lonjaret@gmail.com>
|
2021-03-03 16:48:04 +01:00 |
|
Jean-Baptiste Doumenjou
|
992d4c1b94
|
Upgrade the CRD version from apiextensions.k8s.io/v1beta1 to apiextensions.k8s.io/v1
Co-authored-by: kevinpollet <pollet.kevin@gmail.com>
|
2021-03-03 15:32:04 +01:00 |
|
Mal Curtis
|
e7d3f4316f
|
Fix typo in routing/services/index.md
|
2021-02-22 20:28:05 +01:00 |
|
romain
|
438eec720a
|
Merge v2.4 into master
|
2021-02-22 09:40:24 +01:00 |
|
Kevin Pollet
|
dce6a86900
|
Fix Kubernetes Gateway API documentation links
|
2021-02-19 17:16:03 +01:00 |
|
romain
|
1b21f0723f
|
Merge v2.4 into master
|
2021-02-16 11:12:09 +01:00 |
|
Ludovic Fernandez
|
f81f85cea2
|
Add missing doc about servers transport.
|
2021-02-15 12:04:04 +01:00 |
|
Michael
|
1325cc5cd0
|
Add seo support
|
2021-02-12 19:08:04 +01:00 |
|
Matthew Landauer
|
9e33e23b8b
|
Add HEAD as available option for Method
|
2021-02-04 17:04:04 +01:00 |
|
Jean-Baptiste Doumenjou
|
d211437d6c
|
Merge v2.4 into master
|
2021-02-04 10:40:53 +01:00 |
|
Jean-Baptiste Doumenjou
|
7996a42f76
|
Allow crossprovider service reference
Co-authored-by: Harold Ozouf <harold.ozouf@gmail.com>
|
2021-02-02 19:36:04 +01:00 |
|
Kevin Pollet
|
73cea2d303
|
Fix missing serverstransport documentation
|
2021-02-01 13:58:03 +01:00 |
|
Tim Obezuk
|
5f9a84fc8b
|
Fix typo in server transports documentation
|
2021-01-26 09:20:04 +01:00 |
|
kevinpollet
|
2747e240c1
|
Merge branch v2.4 into master
|
2021-01-20 10:50:21 +01:00 |
|
Kevin Pollet
|
c74918321d
|
Prepare release v2.4.0
|
2021-01-19 16:50:04 +01:00 |
|
Kevin Pollet
|
41d22ef17e
|
Improve kubernetes external name service support for UDP
|
2021-01-19 09:30:05 +01:00 |
|
Cirrith
|
bbee63fcf3
|
Add named port support to Kubernetes IngressRoute CRDs
|
2021-01-15 15:54:04 +01:00 |
|
Linden Krouse
|
fc7ec17905
|
Feature: add udp timeout configuration
|
2021-01-07 17:16:03 +01:00 |
|
Julien Salleyron
|
e5a01c7cc8
|
Add HTTP3 support (experimental)
Co-authored-by: Ludovic Fernandez <ldez@users.noreply.github.com>
|
2021-01-07 14:48:04 +01:00 |
|
kevinpollet
|
0ec0e37532
|
Merge branch v2.3 into v2.4
|
2020-12-22 14:23:56 +01:00 |
|
Kevin Pollet
|
544dc2eaa5
|
docs: fix broken links to docker-compose documentation
|
2020-12-22 14:20:03 +01:00 |
|
Sylvain Rabot
|
a3327c4430
|
Add TLS certs expiration metric
|
2020-12-18 18:44:03 +01:00 |
|
Romain
|
c21597c593
|
Add Kubernetes Gateway Provider
Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
|
2020-12-15 16:40:05 +01:00 |
|
kevinpollet
|
eebbe64b36
|
Merge branch v2.3 into master
|
2020-12-11 10:58:00 +01:00 |
|
Kevin Crawley
|
121eaced49
|
Add example for multiple service per container
|
2020-12-03 09:36:03 +01:00 |
|
Matthias Schneider
|
84b125bdde
|
added support for tcp proxyProtocol v1&v2 to backend
|
2020-11-17 13:04:04 +01:00 |
|
Fernandez Ludovic
|
520fcf82ae
|
Merge branch v2.3 into master.
|
2020-11-09 00:07:28 +01:00 |
|
Kevin Pollet
|
f5b290b093
|
Add ECS menu to dynamic config reference
|
2020-11-03 17:40:04 +01:00 |
|
Fernandez Ludovic
|
699cf71652
|
Merge branch v2.3 into master
|
2020-10-27 18:39:03 +01:00 |
|
Jean-Baptiste Doumenjou
|
ff7b814edc
|
fix documentation
|
2020-10-27 12:46:04 +01:00 |
|
Jean-Baptiste Doumenjou
|
4fccde84bd
|
Merge current v2.3 branch into master
|
2020-10-23 14:29:22 +02:00 |
|
Andrii Dembitskyi
|
2dd5a53db2
|
Add missed tls config for yaml example
|
2020-10-23 11:00:05 +02:00 |
|
Romain
|
2683df7b5b
|
Fix ingress documentation
|
2020-10-20 14:16:04 +02:00 |
|
Fernandez Ludovic
|
cd947ae822
|
Merge branch 'v2.3' into master
|
2020-09-23 15:35:31 +02:00 |
|
Romain
|
118c31eb8d
|
Fix yaml documentation
|
2020-09-23 11:38:03 +02:00 |
|
Fernandez Ludovic
|
86c099d629
|
Merge branch v2.3 into master
|
2020-09-17 12:32:18 +02:00 |
|
Jean-Baptiste Doumenjou
|
c0f1e74bed
|
chore: move to Traefik organization.
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
|
2020-09-16 15:46:04 +02:00 |
|
Jean-Baptiste Doumenjou
|
9df89e66e3
|
Add the ingressclass resource in the ingress RBAC documentation
|
2020-09-15 18:34:04 +02:00 |
|
romain
|
4592626bbb
|
Merge branch v2.2 into v2.3
|
2020-09-15 10:57:20 +02:00 |
|
Julien Salleyron
|
76f42a3013
|
add ServersTransport on services
|
2020-09-11 15:40:03 +02:00 |
|
kosssi
|
5c8b8149eb
|
doc: fix typo in health check options
|
2020-09-08 10:54:04 +02:00 |
|
Fernandez Ludovic
|
8474a61f21
|
Merge branch v2.2 into v2.3
|
2020-09-07 16:30:17 +02:00 |
|
Andrew Savinykh
|
2045b250fd
|
Clarified hostname documentation for load balancer healthcheck
|
2020-09-07 10:30:04 +02:00 |
|
Fernandez Ludovic
|
6e5dd35ee3
|
Merge branch v2.2 into v2.3
|
2020-08-11 17:21:44 +02:00 |
|
NT-florianernst
|
3214904cc7
|
kubernetes-crd: fix whitespace in configuration examples
|
2020-08-03 17:40:07 +02:00 |
|
Fernandez Ludovic
|
675655d437
|
Merge branch v2.2 into v2.3
|
2020-07-28 17:50:35 +02:00 |
|
Romain
|
dafb14ff37
|
Support Kubernetes Ingress pathType
Co-authored-by: jbdoumenjou <jb.doumenjou@gmail.com>
Co-authored-by: kevinpollet <pollet.kevin@gmail.com>
|
2020-07-28 17:50:04 +02:00 |
|
Filip Kszczot
|
a6c6127e33
|
spelling(docs/content/routing/providers/docker.md)
|
2020-07-28 01:02:03 +02:00 |
|
jb doumenjou
|
207d0bec78
|
Merge v2.2 into v2.3
|
2020-07-22 15:49:28 +02:00 |
|
Julien Salleyron
|
0b7aaa3643
|
Fix domain fronting
Co-authored-by: Ludovic Fernandez <ldez@users.noreply.github.com>
|
2020-07-17 15:38:04 +02:00 |
|
Simon Heimberg
|
25b74ce1f3
|
Add example for entrypoint on one ip address
|
2020-07-16 12:38:03 +02:00 |
|
Ludovic Fernandez
|
8f2951b275
|
Prepare release v2.3.0-rc1
|
2020-07-15 20:50:03 +02:00 |
|
Alessandro Chitolina
|
285ded6e49
|
Add AWS ECS provider
* add ecs provider
* add ecs docs
* fix test after rebase
* add provider icon
* add missing addProvider call
* Fix for review
* Fix documentation
* Fix for review
* Fix documentation
* fix ctx usage
* autoDiscoverClusters setDefaults false
* Fix for review
* review: doc.
* Fix for review: add ctx in backoff retry
* review: linter.
Co-authored-by: Michael <michael.matur@gmail.com>
Co-authored-by: romain <romain@containo.us>
Co-authored-by: Fernandez Ludovic <ludovic@containo.us>
|
2020-07-15 16:28:04 +02:00 |
|
Romain
|
0e97a3becd
|
Revert domain fronting fix
* revert domain fronting changes
* reintroduce HostHeader rule
* add doc for removals
|
2020-07-13 17:58:03 +02:00 |
|
Romain
|
2b35397169
|
Disable domain fronting
Co-authored-by: jbdoumenjou <jb.doumenjou@gmail.com>
|
2020-07-08 12:18:03 +02:00 |
|
Romain
|
30e0778ed2
|
Fix sticky cookie ingress annotation doc
|
2020-07-01 12:58:05 +02:00 |
|
Rick Herrick
|
12e462f383
|
Update kubernetes-crd.md
|
2020-06-03 17:24:04 +02:00 |
|
Sergio Maria Matone
|
f874c389bd
|
fixing typo in Provider KubernetesIngress at Routing documentation
|
2020-05-27 17:48:04 +02:00 |
|
Ondřej Bárta
|
8c5846c478
|
Fix healthcheck.interval in docs
|
2020-05-26 21:54:03 +02:00 |
|
Ludovic Fernandez
|
de42fc10b5
|
fix: cookie documentation.
|
2020-04-29 17:10:05 +02:00 |
|
bryfry
|
367e797d5f
|
fix KV service docs for http:url and tcp:address
|
2020-04-27 17:18:04 +02:00 |
|
Manuel Zapf
|
4fcf7bf2de
|
Add sentence about the resource namespace and middleware
|
2020-04-27 11:32:05 +02:00 |
|
Ludovic Fernandez
|
f55a09862e
|
doc: improve CRD documentation.
|
2020-04-15 17:38:05 +02:00 |
|
Felix SOEDJEDE
|
d0b21efd36
|
Added missing text a yaml file in Configuration
|
2020-04-15 17:26:05 +02:00 |
|
Michael
|
6c08d0b20b
|
Fix documentation
|
2020-04-07 18:38:04 +02:00 |
|
Michael
|
148400ae0a
|
Add note about health check in kubernetes
|
2020-04-07 17:16:03 +02:00 |
|
AJ Schmidt
|
aa68cc2e63
|
Doc Fix for 2.2 Redirects
|
2020-03-28 13:02:04 +01:00 |
|
Fernandez Ludovic
|
b54412e82e
|
Merge branch v2.1 into v2.2
|
2020-03-24 14:18:39 +01:00 |
|
Ludovic Fernandez
|
b0c7fad81b
|
doc: fix terminationDelay word case.
|
2020-03-23 11:48:04 +01:00 |
|
Ludovic Fernandez
|
0c28630948
|
Fix sameSite (Traefik v2)
|
2020-03-23 11:24:05 +01:00 |
|
Ludovic Fernandez
|
44221fba49
|
Fix entry point redirect behavior
|
2020-03-18 15:48:04 +01:00 |
|
Ludovic Fernandez
|
9012f2d6b1
|
fix: Ingress TLS support
Co-authored-by: Julien Salleyron <julien@containo.us>
|
2020-03-18 13:30:04 +01:00 |
|
Maxime Veber
|
668e6fd610
|
Fix wrong copy/pasted with service name warning
|
2020-03-18 00:32:04 +01:00 |
|