Skip to content

Commit 912a08a

Browse files
authored
Merge pull request #1260 from plone/installation-backend-pip-mxdev
version one
2 parents 005f3e0 + d796515 commit 912a08a

File tree

10 files changed

+896
-134
lines changed

10 files changed

+896
-134
lines changed

docs/_static/custom.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ div.section {
106106
margin-bottom: 5rem;
107107
}
108108

109+
div.section div.section {
110+
margin-bottom: 5rem;
111+
}
112+
113+
div.section div.section div.section {
114+
margin-bottom: 2rem;
115+
}
116+
109117
/* admonitions */
110118
.admonition {
111119
border-radius: 0;
@@ -155,6 +163,11 @@ div.admonition.admonition-todo>.admonition-title::before {
155163
display: none;
156164
}
157165

166+
/* admonition margin */
167+
.admonition.margin ul,
168+
.admonition.margin ol {
169+
padding-left: 1rem;
170+
}
158171

159172
.topic {
160173
padding: 1.5em 1em .5em 1em;

docs/_static/illustration/pm2.png

127 KB
Loading

docs/contributing/writing-docs-guide.md

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ This is MyST syntax for term ``{term}`React` ``
215215
This is MyST syntax for term ``{term}`React` ``
216216

217217

218-
219218
##### Glossary terms
220219

221220
Add a term to the {ref}`glossary-label`, located at {file}`/glossary.md`.
@@ -235,6 +234,48 @@ Using {term}`React` makes frontends fun again!
235234
Using {term}`React` makes frontends fun again!
236235

237236

237+
#### Toggle paragraph (Exercise solution / FAQ)
238+
239+
Text snippets can be hidden with the option to show. Wrap it in an `admonition` and add the `class` `toggle`.
240+
241+
`````
242+
````{admonition} f-strings can make your life easier
243+
:class: toggle
244+
245+
To use formatted string literals, begin a string with `f` or `F` before the opening quotation mark or triple quotation mark.
246+
Inside this string, you can write a Python expression between `{` and `}` characters that can refer to variables or literal values.
247+
248+
```{code-block} python
249+
:linenos:
250+
:emphasize-lines: 1, 3
251+
252+
a = 2
253+
print("my 1st line")
254+
print(f"my {a}nd line")
255+
```
256+
````
257+
`````
258+
259+
You can [nest directives](https://myst-parser.readthedocs.io/en/latest/syntax/roles-and-directives.html#nesting-directives), such as admonitions and code blocks, by ensuring that the backtick-lines corresponding to the outermost directive are longer than the backtick-lines for the inner directives.
260+
261+
This would be rendered as:
262+
263+
````{admonition} f-strings can make your life easier
264+
:class: toggle
265+
266+
To use formatted string literals, begin a string with `f` or `F` before the opening quotation mark or triple quotation mark.
267+
Inside this string, you can write a Python expression between `{` and `}` characters that can refer to variables or literal values.
268+
269+
```{code-block} python
270+
:linenos:
271+
:emphasize-lines: 1, 3
272+
273+
a = 2
274+
print("my 1st line")
275+
print(f"my {a}nd line")
276+
```
277+
````
278+
238279

239280
## Abridged Plone Documentation Styleguide
240281

docs/glossary.md

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,68 @@ AWS
1717
[Amazon Web Services](https://aws.amazon.com/) offers reliable, scalable, and inexpensive cloud computing services.
1818
Free to join, pay only for what you use.
1919
20-
Linode
21-
[Linode.com](https://www.linode.com/) is an American privately owned virtual private server provider company based in Galloway, New Jersey, United States.
22-
23-
DigitalOcean
24-
[DigitalOcean, Inc.](https://www.digitalocean.com/) is an American cloud infrastructure provider headquartered in New York City with data centers worldwide.
25-
26-
ZODB
27-
[A native object database for Python](https://zodb.org/en/latest/).
28-
2920
Barceloneta
3021
The default theme for Plone 5.
3122
3223
CMS
3324
Content Management System
3425
26+
Cookiecutter
27+
A command-line utility that creates projects from cookiecutters (project templates), e.g. creating a Python package project from a Python package project template.
28+
[See Cookiecutter's documentation](https://cookiecutter.readthedocs.io/en/stable/).
29+
30+
cookiecutter-zope-instance
31+
[cookiecutter-zope-instance](https://github.com/plone/cookiecutter-zope-instance) is a cookiecutter template to create a full and complex configuration of a Zope WSGI instance.
32+
3533
CSS
3634
Cascading Style Sheets (CSS) is a stylesheet language used for describing the (most of the times visual) representation of web pages.
3735
36+
DigitalOcean
37+
[DigitalOcean, Inc.](https://www.digitalocean.com/) is an American cloud infrastructure provider headquartered in New York City with data centers worldwide.
38+
3839
Grunt
3940
The JavaScript Task Runner.
4041
Automates the creation and manipulation of static assets for the theme.
4142
4243
Less
4344
A dynamic stylesheet language that can be compiled into {term}`CSS` (Cascading Style Sheets).
4445
46+
Linode
47+
[Linode.com](https://www.linode.com/) is an American privately owned virtual private server provider company based in Galloway, New Jersey, United States.
48+
49+
mxdev
50+
[mxdev](https://github.com/mxstack/mxdev) [mɪks dɛv] is a utility that makes it easy to work with Python projects containing lots of packages, of which you only want to develop some.
51+
It is designed for developers who use stable version constraints, then layer their customizations on top of that base while using a version control system.
52+
This design allows developers to override their base package constraints with a customized or newer version.
53+
54+
mxmake
55+
mxmake helps create development environments for Python projects based on [make](https://www.gnu.org/software/make) and [mxdev](https://github.com/mxstack/mxdev).
56+
57+
NFS
58+
[Network File System](https://en.wikipedia.org/wiki/Network_File_System).
59+
60+
4561
NPM
4662
npm is a package manager for the JavaScript programming language.
4763
It is the default package manager for the JavaScript runtime environment Node.js.
4864
Also a registry of JavaScript packages, similar to PyPI.
4965
50-
TTW
51-
Through-The-Web, changes in the browser.
66+
pip
67+
pip is the package installer for Python.
68+
See [tool recommendations](https://packaging.python.org/en/latest/guides/tool-recommendations/) for more information.
69+
70+
pm2
71+
[PM2](https://pm2.keymetrics.io/) is a daemon process manager.
72+
73+
REST API
74+
TODO REST API in general. TODO REST API of Plone.
5275
5376
S3
5477
[Amazon Web Services S3](https://aws.amazon.com/s3/).
5578
Object storage built to store and retrieve any amount of data from anywhere.
5679
57-
NFS
58-
[Network File System](https://en.wikipedia.org/wiki/Network_File_System).
80+
TTW
81+
Through-The-Web allows editing or customizing a Plone site through a web browser.
5982
6083
Amazon Opsworks
6184
[AWS OpsWorks](https://aws.amazon.com/opsworks/) is a configuration management service that uses Chef, an automation platform that treats server configurations as code.
@@ -196,7 +219,7 @@ mrs-developer
196219
As a byproduct of its update operations, it also automatically adjusts `jsconfig.json`, which is used by Volto to configure webpack aliases.
197220
198221
Yarn
199-
A popular JavaScript package manager similar to NPM.
222+
[Yarn](https://classic.yarnpkg.com/) is a JavaScript package manager.
200223
201224
Hydration (SSR)
202225
After loading an HTML page generated with SSR in the browser, React can "populate" the existing DOM elements, recreate and attach their coresponding components.
@@ -295,9 +318,6 @@ Docker Compose
295318
RelStorage
296319
[RelStorage](https://relstorage.readthedocs.io/en/latest/) is a storage implementation for ZODB that stores pickles in a relational database.
297320
298-
ZEO
299-
[ZEO](https://zeo.readthedocs.io/en/latest/) is a client-server storage for ZODB for sharing a single storage among many clients.
300-
301321
PostgreSQL
302322
[PostgreSQL](https://www.postgresql.org/) is a powerful, open source object-relational database.
303323
@@ -334,4 +354,15 @@ elementEditor
334354
A generic {term}`volto-slate` plugin architecture that can be used to create other editor interactions that follow the pattern of having a button that toggles a format (an inline element).
335355
It also creates a separate edit form for advanced customization of the data attached to the element.
336356
357+
WSGI
358+
The Web Server Gateway Interface (WSGI, pronounced _WIZ-ghee_) is a simple calling convention for web servers to forward requests to web applications or frameworks written in the Python programming language.
359+
360+
ZEO
361+
[ZEO](https://zeo.readthedocs.io/) is a client-server storage for ZODB for sharing a single storage among many clients.
362+
363+
ZODB
364+
[A native object database for Python](https://zodb.org/).
365+
366+
Zope
367+
[Zope](https://zope.readthedocs.io/) is a Python-based application server for building secure and highly scalable web applications.
337368
```

docs/install/index.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ What do you want to do?
2121
- [Plone 6 with Volto frontend](https://6.demo.plone.org/)
2222
- [Plone 5.2.x with Barceloneta frontend](https://demo.plone.org/)
2323
- [Run Plone in containers](containers/index) (why use containers here.)
24-
- [Install Plone from source](source) (Why? To develop Plone add-ons or contribute to Plone packages, and more details.)
24+
- {doc}`source` (contribute to Plone packages, develop add-ons, or install Plone with full control)
2525

2626

2727
(install-index-choose-installation-method-label)=
2828

2929
## Choose an installation method
3030

31+
% TODO Explanation when to choose which installation method: container vs installation from its packages. Combination for backend and frontend?
32+
3133
Developers may choose to install Plone from either [the official container images](containers/index) or [source](source).
3234

3335
The Plone 6 container images are compliant with the [Open Container Initiative (OCI)](https://opencontainers.org/).
@@ -59,7 +61,7 @@ Perhaps merge the subsequent section into this section?
5961
System requirements depend upon your choice of installation method:
6062

6163
- [Use container images](containers/index)
62-
- [Install from source](source)
64+
- {doc}`source`
6365

6466

6567
```{toctree}
@@ -68,4 +70,5 @@ System requirements depend upon your choice of installation method:
6870
6971
containers/index
7072
source
73+
source-step-by-step
7174
```

0 commit comments

Comments
 (0)