Skip to content

Commit 03e6d89

Browse files
Merge branch 'develop' into patch-4
2 parents d613561 + 1d1bde4 commit 03e6d89

9 files changed

Lines changed: 55 additions & 56 deletions

File tree

antora-playbook.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
site:
66
title: Decidim Docs
77
url: https://docs.decidim.org
8-
start_page: v0.29@en:ROOT:index.adoc
8+
start_page: v0.30@en:ROOT:index.adoc
99
content:
1010
sources:
1111
- url: &documentation https://github.com/decidim/documentation
1212
start_path: docs/en
13-
branches: [release/0.29-stable, release/0.28-stable, release/0.27-stable, develop]
13+
branches: [release/0.30-stable, release/0.29-stable, release/0.28-stable, release/0.27-stable, develop]
1414
edit_url: "https://github.com/decidim/documentation/edit/{refname}/{path}"
1515
- url: https://github.com/decidim/decidim
1616
start_path: docs
17-
branches: [release/0.29-stable, release/0.28-stable, release/0.27-stable, develop]
17+
branches: [release/0.30-stable, release/0.29-stable, release/0.28-stable, release/0.27-stable, develop]
1818
ui:
1919
bundle:
2020
url: https://github.com/decidim/documentation-antora-ui/releases/download/v0.4/ui-bundle.zip

docs/en/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: en
22
title: "Decidim Documentation"
3-
version: develop
3+
version: v0.30
44
asciidoc:
55
attributes:
66
page-lang: en@

docs/en/modules/ROOT/pages/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You’ve found the documentation for Decidim. Learn about the project at https:/
1010

1111
[NOTE]
1212
====
13-
This is the documentation for the `v0.30` version. You can see this same documentation site for other versions: xref:v0.29@ROOT:index.adoc[v0.29], xref:v0.28@ROOT:index.adoc[v0.28], xref:v0.27@ROOT:index.adoc[v0.27] and xref:develop@ROOT.index.adoc[develop].
13+
This is the documentation for the `develop` branch. You can see this same documentation site for other versions: xref:v0.30@ROOT:index.adoc[v0.30], xref:v0.29@ROOT:index.adoc[v0.29], xref:v0.28@ROOT:index.adoc[v0.28] and xref:v0.27@ROOT:index.adoc[v0.27]
1414
====
1515

1616
// * Read the xref:ROOT:getting-started.adoc[Getting Started guide]

docs/en/modules/admin/pages/components/blog.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
== Understand the basics
44

5-
The Blog component allows administrators to post news about a participatory space, that participants can read to get updates.
5+
The Blog component allows administrators to post news about a participatory space, which participants can read to get updates.
66

77
image::components/blog/example01.png[Example of blog posts list]
88

9-
All blog posts are available in the posts list, and participants can click each blog post to learn more about what's new.
9+
All blog posts are available on the post list, and participants can click each blog post to learn more about what's new.
1010

1111
image::components/blog/example02.png[Example of a blog post]
1212

@@ -24,7 +24,7 @@ Then:
2424
. Fill the component creation form
2525

2626
You can still update this form and the configuration after creating the component, by clicking the
27-
image:icons/action_configure.png[Configure icon] icon in the components list.
27+
image:icons/action_configure.png[Configure icon] icon on the components list.
2828

2929
image::components/blog/component.png[Add component form]
3030

@@ -54,7 +54,7 @@ image::components/blog/component.png[Add component form]
5454

5555
|Comments enabled
5656
|Optional
57-
|Whether you want participants to be able to comment on the blog posts.
57+
|If you want participants to be able to comment on the blog posts.
5858

5959
|Comments max length
6060
|Optional
@@ -69,7 +69,7 @@ image::components/blog/component.png[Add component form]
6969

7070
|Announcement
7171
|Optional
72-
|A general announcement that'll be visible on the general blog landing page.
72+
|A general announcement that will be visible on the general blog landing page.
7373

7474
|Comments blocked
7575
|Optional
@@ -87,7 +87,7 @@ image::components/blog/component.png[Add component form]
8787

8888
== Manage posts
8989

90-
To start creating and managing posts, click in the component title in the navigation bar or in the component list, or click in the
90+
To start creating and managing posts, click on the component title in the navigation bar or on the component list, or click on the
9191
image:icons/action_edit.png[Manage component icon] icon on the components list.
9292

9393
image:components/blog/manage_posts.png[Manage posts table]
@@ -130,33 +130,33 @@ image:components/blog/new_post.png[New post form]
130130

131131
|image:icons/action_edit.png[Edit icon]
132132
|Edit
133-
|To edit this post.
133+
|Edit this post.
134134

135135
|image:icons/action_folder.png[Folder icon]
136136
|Folder
137137
|For classifying attachments.
138138

139139
|image:icons/action_attachments.png[Attachments icon]
140140
|Attachments
141-
|To add documents related to the post.
141+
|Add documents related to the post.
142142

143143
|image:icons/action_preview.png[Preview icon]
144144
|Preview
145-
|To see how it's shown in the frontend to participants.
145+
|See how it's shown in the frontend to participants.
146146

147147
|image:icons/action_permissions.png[Permissions icon]
148148
|Permissions
149-
|To handle the authorizations needed to comment or endorse this specific blog post.
149+
|Handle the authorizations needed to comment or endorse this specific blog post.
150150

151151
|image:icons/action_delete.png[Delete icon]
152152
|Delete
153-
|To delete this post.
153+
|Delete this post.
154154

155155
|===
156156

157157
== Examples
158158

159-
Below, you can find some links to examples blog components:
159+
Below, you can find some links to example blog components:
160160

161161
* https://meta.decidim.org/processes/news/f/1719/posts[Latest news of the Decidim association]
162162
* https://www.decidim.barcelona/processes/volem-decidir/f/6338/posts[News on a participatory process in Barcelona]

docs/en/modules/admin/pages/features/social_features/newsletters.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ for instance a Participatory Budgeting process.
2323

2424
== Configuration
2525

26-
To access the Newsletters panel, go in the administration panel and click the "Newsletters" item in the administration navigation bar.
26+
To access the Newsletters panel, go to the administration panel and click the "Newsletters" item in the administration navigation bar.
2727

2828
image::features/newsletters/newsletter_menu.png[Newsletter administrator menu]
2929

@@ -50,7 +50,7 @@ Click the "Use this template" button below the template you want to use.
5050

5151
=== Write the newsletter
5252

53-
Depending in which template you've chosen, you have to fill a form with different fields.
53+
Depending on which template you've chosen, you have to fill a form with different fields.
5454

5555
NOTE: You can use "%\{name}" anywhere in the body or subject to be automatically replaced by the participant's name.
5656

@@ -104,7 +104,7 @@ Allowed file extensions: JPG JPEG PNG WEBP
104104

105105
|===
106106

107-
Once you wrote the newsletter, click the "Save and preview" button.
107+
Once you have written the newsletter, click the "Save and preview" button.
108108

109109
=== Preview the newsletter
110110

@@ -116,23 +116,23 @@ image::features/newsletters/newsletter_preview_basic_example.png[Newsletter new
116116
=== Send a test email
117117

118118
If you want to review the newsletter directly in your mailbox, click the "Send me a test email" button at the top right of the page.
119-
You receive the newsletter directly at the email address registered for your participant account.
119+
You will receive the newsletter directly on the email address registered for your participant account.
120120

121121
=== Select recipients to deliver
122122

123-
If you want to only communicate about a given space or neighborhood, you can choose the which participants you're sending the newsletter to.
123+
If you want to only communicate about a given space or neighborhood, you can choose which participants you're sending the newsletter to.
124124
To do so, click the "Select recipients to deliver" button.
125125

126126
NOTE: If you don't want to send your newsletter to a specific segment, select "Send to all users"
127127

128128
There, you can choose between sending the newsletter to:
129129

130130
* All confirmed users
131-
* All confirmed users that have participated in any of the selected participatory spaces in the list
132-
* All confirmed users that have followed any of the selected participatory spaces in the list
133-
* All the participants that have selected an scope in their "My interests" settings in their account.
131+
* All confirmed users that have participated in any of the selected participatory spaces on the list
132+
* All confirmed users that have followed any of the selected participatory spaces on the list
133+
* All the participants that have selected an scope in their "My interests" settings on their account.
134134

135-
NOTE: Even if a participant has a confirmed account and is following a space, the system don't send them a newsletter email if they
135+
NOTE: Even if a participant has a confirmed account and is following a space, the system won't send them a newsletter email if they
136136
haven't accepted it in their xref:admin:features/participant_actions/my_account#_notifications_settings.adoc[notifications] settings.
137137

138138
image::features/newsletters/newsletter_select_recipients.png[Newsletter select recipients]
@@ -149,7 +149,7 @@ Before sending it, a pop-up appears to make sure you reviewed everything and are
149149

150150
image::features/newsletters/newsletter_deliver_modal.png[Newsletter deliver modal]
151151

152-
NOTE: Once a newsletter is sent it can't be undone nor edited. If you have multiple languages active,
152+
NOTE: Once a newsletter is sent it can't be undone or edited. If you have multiple languages active,
153153
be careful with reviewing all the languages well before sending.
154154

155155
== Manage newsletters

docs/en/modules/admin/pages/features/transparency/fingerprint.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ yourself, you can use a http://www.md5calc.com/sha256[MD5 calculator online] and
1818
. Click in the "Check fingerprint" link at the bottom of the page
1919
. Copy the source field value
2020
. Go to a MD5 calculator online (External link) and copy-paste the source data
21-
. Check that fingerprint are the same
21+
. Check that the fingerprints are the same
2222

2323
image:features/fingerprint/content.png[Check fingerprint link in page bottom]
2424

docs/en/modules/admin/pages/spaces/assemblies/assembly_creation.adoc

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
== Understand the basics
44

5-
Assemblies allows administrators to configure components inside a long-lasting space, with defined members.
6-
To start creating an assembly, when on the assembly list, click the "New assembly" button at the top right of the page.
5+
Assemblies allow administrators to configure components inside a long-lasting space, with defined members. To start creating an assembly, when on the link:https://docs.decidim.org/en/develop/admin/spaces/assemblies#_manage_assemblies[assembly list], click the "New assembly" button at the top right of the page.
76

87
The assembly creation form is divided into different sections that are detailed in the sections below.
98

10-
Once you created an assembly, in the secondary navigation panel, you can see all the assembly configurations available:
9+
Once you create an assembly, you can see all the assembly configurations available in the secondary navigation panel:
1110

12-
* xref:admin:spaces/assemblies/assembly_creation.adoc[About this assembly]: here you can access and edit all the fields from the creation form.
11+
* xref:admin:spaces/assemblies/assembly_creation.adoc[About this assembly] (Here you can access and edit all the fields from the creation form.)
1312
* xref:admin:spaces/assemblies/landing_page.adoc[Landing page]
1413
* xref:admin:spaces/assemblies/components.adoc[Components]
1514
* xref:admin:spaces/assemblies/categories.adoc[Categories]
@@ -21,7 +20,7 @@ Once you created an assembly, in the secondary navigation panel, you can see all
2120

2221
== General information
2322

24-
This section allows to provide a general description about the assembly, mainly a title, URL, and description.
23+
This section allows an admin to provide general information about the assembly: title, URL, and description.
2524

2625
image::spaces/assemblies/assemblies_new_form_general_info.png[New assembly form general info section]
2726

@@ -32,7 +31,7 @@ image::spaces/assemblies/assemblies_new_form_general_info.png[New assembly form
3231

3332
|Title
3433
|Required
35-
|Title of the assembly, "General Committee" or "neighborhood city council" for example.
34+
|Title of the assembly: "General Committee" or "neighborhood city council" for example.
3635
|Visible in the card of the assembly on the homepage, the assemblies index, the navigation, and the "Hero image and CTA" landing page block.
3736

3837
|Subtitle
@@ -58,12 +57,12 @@ start with a letter.
5857

5958
|Short description
6059
|Required
61-
|A short explanation of what's your participatory process about.
60+
|A short explanation of what your assembly is about.
6261
|Visible in the "Main data" landing page block.
6362

6463
|Description
6564
|Required
66-
|A long explanation of what's your assembly about.
65+
|A long explanation of what your assembly is about.
6766
|Visible in the "Main data" landing page block.
6867

6968
|Purpose of action
@@ -90,7 +89,7 @@ start with a letter.
9089

9190
== Duration
9291

93-
This section allows to provide information about the assembly important dates.
92+
This section allows to provide information about the assembly's important dates.
9493

9594
image::spaces/assemblies/assemblies_new_form_duration.png[New assembly form duration section]
9695

@@ -138,11 +137,11 @@ image::spaces/assemblies/assemblies_new_form_images.png[New assembly form images
138137
|Home image
139138
|Optional
140139
|Image used in presentation cards of this process. Guidance for file: Has to be an image or a document.
141-
For images, use preferably landscape images, the service crops the image. Maximum file size: 10 MB
140+
For images, landscape images are preferred, as the service crops the image. Maximum file size: 10 MB
142141

143142
|Banner image
144-
|Optional
145-
|Deprecated, isn't used anywhere. Use "Hero image and CTA" content block on the landing page instead.
143+
|Deprecated
144+
|Use link:https://docs.decidim.org/en/develop/admin/spaces/assemblies/landing_page.html#_hero_image_and_cta[Hero image and CTA] content block on the landing page instead.
146145

147146
|===
148147

@@ -164,11 +163,11 @@ image::spaces/assemblies/assemblies_new_form_filters.png[New assembly form filte
164163

165164
|Scope
166165
|Optional
167-
|Which xref:admin:settings/scopes.adoc[Scopes] does this assembly belongs to.
166+
|Which xref:admin:settings/scopes.adoc[Scopes] this assembly belongs to.
168167

169168
|Area
170169
|Optional
171-
|Which xref:admin:settings/areas.adoc[Area] does this assembly belongs to.
170+
|Which xref:admin:settings/areas.adoc[Areas] this assembly belongs to.
172171

173172
|===
174173

@@ -185,33 +184,33 @@ image::spaces/assemblies/assemblies_new_form_metadata.png[New assembly form meta
185184

186185
|What is decided
187186
|Optional
188-
|The issue of the assembly, the object of what is decided.
187+
|The issue of the assembly; the object of what is decided.
189188

190189
|How is it decided
191190
|Optional
192191
|The decision making process inside the assembly.
193192

194193
|Scope metadata
195194
|Optional
196-
|Metadata on the assembly scope, if it's relevant.
195+
|Metadata on the assembly scope, if relevant.
197196

198197
|Promoter group
199198
|Optional
200199
|If a specific group is at the origin of the assembly, like a city direction, an association committee, etc.
201200

202201
|Organization area
203202
|Optional
204-
|The organization domain or category, if it's relevant.
203+
|The organization domain or category, if relevant.
205204

206205
|Who participates
207206
|Optional
208-
|Who are the authorized participants, who can participate to the assembly.
207+
|Who are the authorized participants that can participate to the assembly.
209208

210209
|===
211210

212211
== Visibility
213212

214-
This section allows administrators to configure the process placement in the different pages and its publicity or no.
213+
This section allows administrators to configure the process placement in the different pages and its publicity.
215214

216215
image::spaces/assemblies/assemblies_new_form_visibility.png[New assembly form visibility section]
217216

@@ -222,7 +221,7 @@ image::spaces/assemblies/assemblies_new_form_visibility.png[New assembly form vi
222221

223222
|Parent assembly
224223
|Optional
225-
|To what other assemblies this assembly belongs. Assemblies can be nested inside one another.
224+
|To which other assemblies this assembly belongs. Assemblies can be nested inside one another.
226225

227226
|Highlighted
228227
|Optional
@@ -251,7 +250,7 @@ image::spaces/assemblies/assemblies_new_form_other.png[New assembly form other s
251250

252251
|Created by
253252
|Optional
254-
|Choose "City Council" "Public" or "Other" in case you want to specify the name of the organization that created
253+
|Choose "City Council", "Public", or "Other" if you want to specify the name of the organization that created
255254
this assembly.
256255

257256
|Assembly type
@@ -264,6 +263,6 @@ this assembly.
264263

265264
|Social
266265
|Optional
267-
|Which social networks profile does this assembly has. Can be X, Facebook, Instagram, YouTube, and/or GitHub.
266+
|Which social networks profile this assembly has. Can be X, Facebook, Instagram, YouTube, and/or GitHub.
268267

269268
|===

docs/en/modules/admin/pages/spaces/conferences/registrations/invites.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
== Understand the basics
44

55
Administrators can invite participants to join the conference.
6-
They can invite already existing participants, with an account on the platform, but also people without an account.
7-
Inviting a participant sends an email to the account email address, to encourage the participant to register to the conference.
6+
They can invite already existing participants, with an account on the platform, but also people without an account.
7+
Inviting a participant sends an email to the account email address, encouraging the participant to register for the conference.
88

99
== Manage invites
1010

@@ -27,14 +27,14 @@ image::spaces/conferences/invite_participant_form.png[Invite a participant form]
2727

2828
|Attendee type
2929
|Required
30-
|Wether this invited person already has an account or not.
30+
|Whether or not this invited person already has an account.
3131

3232
|Name
33-
|Required if it's a non-existing participant.
33+
|Required if the invitee is not already a participant.
3434
|Name of the invited person.
3535

3636
|Email
37-
|Required if it's a non-existing participant.
37+
|Required if the invitee is not already a participant.
3838
|Email of the invited person.
3939

4040
|User

docs/en/modules/contribute/pages/translations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If your language isn't created yet, then we need to do it as it's necessary to m
2121

2222
== How it works
2323

24-
If you're curios, in the technical level we have a bot (the great decidim-bot) that periodically makes a PR to the relevant branches (last releases and develop).
24+
If you're curious, in the technical level we have a bot (the great decidim-bot) that periodically makes a PR to the relevant branches (last releases and develop).
2525

2626
image::translation-bot.png[Decidim Bot in GitHub]
2727

0 commit comments

Comments
 (0)