Skip to content

Commit 7cd057d

Browse files
authored
Merge branch '5.x' into feyijimi-wth-new-stages
2 parents 987890a + 39488c0 commit 7cd057d

File tree

4 files changed

+43
-12
lines changed

4 files changed

+43
-12
lines changed

.devcontainer/devcontainer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"features": {
3+
"ghcr.io/devcontainers/features/python:1": {
4+
"version": "3.11",
5+
"installTools": true
6+
}
7+
},
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"ms-python.python",
12+
"swyddfa.esbonio",
13+
"lextudio.restructuredtext",
14+
"eamodio.gitlens",
15+
"trond-snekvik.simple-rst"
16+
]
17+
}
18+
},
19+
"postCreateCommand": "chmod +x .devcontainer/setup-project.sh && .devcontainer/setup-project.sh"
20+
}

.devcontainer/setup-project.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
set -ex
3+
4+
VALE_VERSION=3.7.1
5+
6+
# Install required packages
7+
pip install -r docs/requirements.txt
8+
9+
# Required for Vale
10+
pip install rst2html rstcheck
11+
12+
# Install Vale
13+
mkdir -p /tmp/vale
14+
curl -sSL https://github.com/errata-ai/vale/releases/download/v${VALE_VERSION}/vale_${VALE_VERSION}_Linux_64-bit.tar.gz | tar -xz -C /tmp/vale
15+
sudo install -o root -g root -m 0755 /tmp/vale/vale /usr/local/bin/vale
16+
rm -rf /tmp/vale

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
[![Documentation Status][RTD badge URL]][RTD URL]
2-
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3-
[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-)
4-
<!-- ALL-CONTRIBUTORS-BADGE:END -->
5-
6-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/mautic/developer-documentation-new)
1+
[![Documentation Status][RTD badge URL]][RTD URL] [![All Contributors](https://img.shields.io/github/all-contributors/mautic/developer-documentation-new?color=ee8449&style=flat-square)](#contributors)
72

83
# Mautic developer documentation (new)
94

docs/components/cache.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Delivered adapters
8888

8989
.. code-block:: php
9090
91-
'memcached' => [
91+
'cache_adapter_memcached' => [
9292
'servers' => ['memcached://localhost'],
9393
'options' => [
9494
'compression' => true,
@@ -101,17 +101,17 @@ Delivered adapters
101101

102102
Redis configuration in ``local.php``:
103103

104-
.. code-block:: php
105-
106-
'redis' => [
107-
'dsn' => 'redis://localhost',
104+
.. code-block:: PHP
105+
106+
'cache_adapter_redis' => [
107+
'dsn' => 'redis://localhost:6379/0',
108108
'options' => [
109109
'lazy' => false,
110110
'persistent' => 0,
111111
'persistent_id' => null,
112112
'timeout' => 30,
113113
'read_timeout' => 0,
114-
'retry_interval' => 0,
114+
'retry_interval' => 0
115115
],
116116
],
117117

0 commit comments

Comments
 (0)