8000 [IMP] odoo_sh: improve spelling · jubodoo/documentation-user@20d242e · GitHub
[go: up one dir, main page]

Skip to content

Commit 20d242e

Browse files
Yenthe666beledouxdenis
authored andcommitted
[IMP] odoo_sh: improve spelling
1 parent 1466403 commit 20d242e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

odoo_sh/getting_started/branches.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ After that, they can be garbage collected automatically.
7474
If you make configuration changes or view changes in these branches, make sure to document them or write them directly
7575
in the modules of the branch, using XML data files overriding the default configuration or views.
7676

77-
The unit tests are not performed as, in Odoo, they currently relies on the demo data, which are not loaded in the
77+
The unit tests are not performed as, in Odoo, they currently rely on the demo data, which is not loaded in the
7878
production database. In the future, if Odoo supports to run the unit tests without the demo data,
7979
Odoo.sh will then consider running the tests on staging databases.
8080

8181

8282
Development
8383
-----------
84-
Development branches creates new databases using the demo data and running the unit tests.
84+
Development branches create new databases using the demo data and to run the unit tests.
8585
The modules installed and tested by default are the ones included in your branches.
8686
You can change this list of modules to install in your projects settings.
8787

@@ -121,7 +121,7 @@ It just means you skip the validation of your changes with the production data t
121121
You can merge your development branches into each other, and your staging branches into each other.
122122

123123
Of course, you can also use :code:`git merge` directly to merge your branches.
124-
Odoo.sh will be notified new revisions have been pushed in your branches.
124+
Odoo.sh will be notified when new revisions have been pushed in your branches.
125125

126126
Merging a staging branch in the production branch only merges the source code: Any configuration changes you made in the
127127
staging databases are not passed to the production database.
@@ -132,7 +132,7 @@ If you test configuration changes in staging branches, and want them to be appli
132132
overriding the default configuration or views in your branches,
133133
and then increase the version of your module in its manifest (*__manifest__.py*) to trigger the update of the module
134134
when you merge your staging branch in your production branch.
135-
This is the best practice for a better scalability of your developments as you will use the Git versionning features
135+
This is the best practice for a better scalability of your developments as you will use the Git versioning features
136136
for all your configuration changes, and therefore have a traceability for your changes.
137137
* pass them manually from your staging to your production database, by copy/pasting them.
138138

0 commit comments

Comments
 (0)
0