Skip to content

Commit 946b194

Browse files
authored
Merge pull request #1985 from ThomasWaldmann/typos-grammar-docs
docs: fix typos and grammar
2 parents 3d79fcc + 7c4aa4d commit 946b194

40 files changed

+529
-519
lines changed

CONTRIBUTING.md

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

33
Thank you for your interest in contributing to MoinMoin! We welcome contributions
44
and appreciate your support in improving this project. This guide outlines how
5-
you can contribute, whether through bug reports, code contributions or help with
5+
you can contribute, whether through bug reports, code contributions, or help with
66
documentation.
77

88

9-
## How to contribute
9+
## How to Contribute
1010

11-
Find out how you can start reporting bugs, fixing bugs, adding new features or
11+
Find out how you can start reporting bugs, fixing bugs, adding new features, or
1212
improving the documentation.
1313

14-
### Reporting bugs
14+
### Reporting Bugs
1515

1616
If you've encountered a bug, please report it by following these steps:
1717

@@ -20,21 +20,21 @@ If you've encountered a bug, please report it by following these steps:
2020
3. Provide as much detail as possible, including:
2121
- A description of the bug
2222
- Steps to reproduce the issue
23-
- Any relevant logs or error messages
23+
- Any relevant logs or error messages.
2424

25-
### Suggesting enhancements
25+
### Suggesting Enhancements
2626

2727
If you have an idea for a new feature or improvement:
2828

2929
1. Check the issue tracker to see if the enhancement has already been suggested.
3030
2. Open a new issue with a detailed description of the suggested enhancement.
3131
3. Include a rough idea of how the enhancement could be implemented if possible.
3232

33-
### Submitting code or documentation enhancements
33+
### Submitting Code or Documentation Enhancements
3434

3535
To submit code or documentation updates, follow these steps:
3636

37-
* Setup your development environment, see next chapter.
37+
* Set up your development environment; see the next chapter.
3838
* Create a new branch for your changes:
3939
```
4040
git checkout -b feature-branch
@@ -51,17 +51,17 @@ To submit code or documentation updates, follow these steps:
5151
We encourage you to split complex changes into smaller, focused pull requests.
5252
This makes it easier to review and merge your contributions.
5353

54-
## Development setup
54+
## Development Setup
5555

5656
To begin contributing, you need to set up your development environment. Follow
5757
the steps below to get started:
5858

59-
* Fork the main moin repository from GitHub
60-
* Clone your repo to your local development system
61-
* Create a virtualenv and download Python packages
62-
* Activate the virtualenv
63-
* Create a wiki instance with help data and a welcome page
64-
* Start the built-in server
59+
* Fork the main Moin repository on GitHub.
60+
* Clone your fork (repository) to your local development system.
61+
* Create a virtual environment and install the required Python packages.
62+
* Activate the virtual environment.
63+
* Create a wiki instance with help data and a welcome page.
64+
* Start the built-in server.
6565

6666
For details on setting up your environment, please refer to the MoinMoin
6767
development documentation at
@@ -70,8 +70,8 @@ development documentation at
7070

7171
## Code Style and Best Practices
7272

73-
MoinMoin follows some common coding standards to ensure the consistency of the
74-
code base. Here are some major things to keep in mind:
73+
MoinMoin follows common coding standards to ensure the consistency of the
74+
codebase. Here are some major things to keep in mind:
7575

7676
* Python Version: MoinMoin is based on Python 3. Make sure your changes work
7777
with the versions specified in pyproject.toml.
@@ -81,8 +81,8 @@ code base. Here are some major things to keep in mind:
8181
* Documentation: Ensure that your changes are well-documented. Add docstrings
8282
to your functions and classes where appropriate.
8383

84-
We have added Git pre-commit hooks to ensure a consistent code quality.
85-
The checks include the use of the tools black, ruff and bandit. For details please see
84+
We use Git pre-commit hooks to help ensure consistent code quality.
85+
The checks include the tools Black, Ruff, and Bandit. For details, please see
8686
[moin-20.readthedocs.io](https://moin-20.readthedocs.io/en/latest/devel/development.html#install-pre-commit-hooks)
8787

8888

README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
MoinMoin - a lightweight open source wiki engine
1+
MoinMoin a lightweight open-source wiki engine
22
================================================
33

44
<img src="https://github.com/moinwiki/moin/blob/master/src/moin/static/logos/moinmoin.svg?raw=true" alt="MoinMoin Logo" width="120" align="right">
55

6-
MoinMoin is an easy to use, full-featured and extensible wiki software package
6+
MoinMoin is an easy-to-use, full-featured, and extensible wiki software package
77
written in Python. You can run it on all common operating systems (Windows,
88
macOS, Linux, etc.).
99

1010
This wiki software can fulfill a wide range of roles, such as a personal notes
1111
organizer deployed on a laptop or home web server, a company knowledge base
1212
deployed on an intranet, or an Internet server open to individuals sharing the
13-
same interests, goals or projects.
13+
same interests, goals, or projects.
1414

1515

1616
Documentation and Support
1717
=========================
1818

1919
> [!NOTE]
20-
moin2 is not released yet.
20+
> Moin2 is not released yet.
2121
22-
You will find the latest docs at https://moin-20.readthedocs.io/en/latest.
22+
You will find the latest documentation at https://moin-20.readthedocs.io/en/latest.
2323

24-
There is a wiki page collecting all moin2 specific information, links to
25-
support resources and info about MoinMoin development status and plans:
24+
There is a wiki page collecting all Moin2-specific information, links to
25+
support resources, and information about MoinMoin’s development status and plans:
2626
https://moinmo.in/MoinMoin2.0
2727

28-
In general, you should make sure that the documentation you are reading
29-
is written for the moin version you are using. Much of the information
30-
you find in the wiki refers to moin 1.9 and does not apply to moin2.
28+
In general, ensure that the documentation you are reading
29+
is written for the Moin version you are using. Much of the information
30+
you find in the wiki refers to Moin 1.9 and does not apply to Moin2.
3131

32-
For support, please try the documentation, the homepage, the irc channel,
33-
the mailing lists and the github issues before contacting the MoinMoin
32+
For support, please try the documentation, the home page, the IRC channel,
33+
the mailing lists, and GitHub issues before contacting the MoinMoin
3434
authors directly.
3535

3636
If you have trouble with any web server configuration, please try reading
37-
the web server's documentation. Same thing applies for any other 3rd party
38-
software usually used with moin, but not written by the MoinMoin developers.
37+
the web server's documentation. The same applies to any other third-party
38+
software commonly used with Moin but not written by the MoinMoin developers.
3939

4040

4141
Contributing
4242
============
4343

4444
You're welcome to help us make MoinMoin even better! Whether you have experience
45-
with Python, HTML or CSS or are just starting out, there are many ways you
46-
can contribute - please see [CONTRIBUTING](https://github.com/moinwiki/moin/blob/master/CONTRIBUTING.md).
45+
with Python, HTML, or CSS, or are just starting out, there are many ways you
46+
can contribute please see [CONTRIBUTING](https://github.com/moinwiki/moin/blob/master/CONTRIBUTING.md).
4747

4848

49-
Acknowledgements
49+
Acknowledgments
5050
================
5151

52-
We have to thank a lot of people for their valuable ideas, time and
53-
contributions - please see [contributors](https://github.com/moinwiki/moin/graphs/contributors).
52+
We thank the many people who have contributed their valuable ideas, time, and
53+
code — please see the [contributors](https://github.com/moinwiki/moin/graphs/contributors) page.

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Reporting a Vulnerability
1010

11-
Please report vulnerabilities privately via Github:
11+
Please report vulnerabilities privately via GitHub:
1212

1313
https://github.com/moinwiki/moin/security
1414

docs/admin/backup.rst

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,36 @@ Full Backup / Restore
88
The best way to recover from data loss is to have a **full** backup of your machine.
99
With this backup you can easily restore your machine to a working condition.
1010

11-
The procedure below explains how to selectively backup only the files
11+
The procedure below explains how to selectively back up only the files
1212
essential to your MoinMoin installation. While there is no need to maintain both a full
1313
and a selective backup, having at least one of the two is strongly recommended.
1414

1515
Selective Backup
1616
================
17-
If you want a backup of MoinMoin and your data, then backup the following:
17+
If you want a backup of MoinMoin and your data, then back up the following:
1818

1919
* your data, usually everything under wiki/
20-
* moin configuration, e.g. wikiconfig.py
21-
* logging configuration, e.g. logging.conf
22-
* moin deployment script, e.g. moin.wsgi
23-
* web server configuration, e.g. apache virtualhost config
24-
* optional: moin code + dependencies; you should at least know which version
20+
* Moin configuration, e.g., wikiconfig.py
21+
* logging configuration, e.g., logging.conf
22+
* Moin deployment script, e.g., moin.wsgi
23+
* web server configuration, e.g., Apache VirtualHost config
24+
* optional: Moin code + dependencies; you should at least know which version
2525
you ran, so you can reinstall that version when you need to restore
2626

27-
To create a dump of all data stored in moinmoin (wiki items, user profiles), run the
27+
To create a dump of all data stored in MoinMoin (wiki items, user profiles), run the
2828
following command::
2929

3030
moin save --all-backends --file backup.moin
3131

32-
Please note that this file contains sensitive data like user profiles, wiki
32+
Please note that this file contains sensitive data like user profiles and wiki
3333
contents, so store your backups in a safe place that no unauthorized
3434
individual can access.
3535

36-
Backups require valid metadata to produce files which can be loaded
36+
Backups require valid metadata to produce files that can be loaded;
3737
in particular, the size attribute must be correct for each revision.
38-
if bad metadata is found during the backup,
39-
there will be a warning logged and it is recommended
40-
to run ``moin validate-metadata -a -f``
41-
see :ref:`validate-metadata`
38+
If bad metadata is found during the backup, a warning will be logged and it is recommended
39+
to run ``moin maint-validate-metadata --all-backends --fix``.
40+
See :ref:`validate-metadata`.
4241

4342
Selective Restore
4443
=================

docs/admin/changes.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
:tocdepth: 2
21

32
.. _changes:
43

docs/admin/configure.rst

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Introduction into MoinMoin Configuration
33
========================================
44
Kinds of configuration files
55
============================
6-
To change how moinmoin behaves and looks, you may customize it by editing
6+
To change how MoinMoin behaves and looks, you may customize it by editing
77
its configuration files:
88

99
* Wiki Engine Configuration
@@ -21,7 +21,7 @@ its configuration files:
2121

2222
* Logging Configuration
2323

24-
- optional; if you don't configure this, it will use the builtin defaults
24+
- optional; if you don't configure this, it will use the built-in defaults
2525
- this is a separate file, often called logging.conf
2626
- it has an .ini-like file format
2727

@@ -70,11 +70,11 @@ The directories and files shown are referenced in this section of documentation
7070
wiki/ # the wiki instance; created by running "./m new-wiki" or "moin create-instance" commands
7171
data/ # wiki data and metadata
7272
index/ # wiki indexes
73-
wiki_local/ # a convenient location to store custom CSS, Javascript, templates, logos, etc.
73+
wiki_local/ # a convenient location to store custom CSS, JavaScript, templates, logos, etc.
7474
wikiconfig.py # main configuration file, modify this to add or change features
7575
intermap.txt # interwiki map: copied by quickinstall.py, updated by "./m interwiki"
7676

77-
After installing moin from pypi or unpacking using a package manager, the directory structure will
77+
After installing Moin from PyPI or unpacking using a package manager, the directory structure will
7878
look like this::
7979

8080
myvenv/ # virtualenv root
@@ -93,8 +93,8 @@ and execute `moin run`.::
9393
data/ # wiki data and metadata
9494
index/ # wiki indexes
9595
preview/ # text item backups are created when user clicks edit Preview button
96-
sql/ # sqlite database used for edit locking
97-
wiki_local/ # store custom CSS, Javascript, templates, logos, etc. here
96+
sql/ # SQLite database used for edit locking
97+
wiki_local/ # store custom CSS, JavaScript, templates, logos, etc. here
9898
wikiconfig.py # main configuration file, modify this to add or change features
9999
intermap.txt # list of external wikis used in wikilinks: [[MeatBall:InterWiki]]
100100

@@ -270,7 +270,7 @@ Adding scripts
270270
~~~~~~~~~~~~~~
271271
You can add scripts like this::
272272

273-
{# Additional Javascript #}
273+
{# Additional JavaScript #}
274274
{% macro scripts() -%}
275275
<script type="text/javascript" src="{{ url_for('serve.files', name='wiki_local', filename='MyScript.js') }}"></script>
276276
{% endmacro %}
@@ -401,7 +401,7 @@ That way they are easily usable on all operating systems, whether it has a packa
401401
system or not.
402402

403403
In many cases, those external static files are maintained by someone else (like jQuery
404-
javascript library or larger js libraries) and we definitely do not want to merge
404+
JavaScript library or larger JS libraries) and we definitely do not want to merge
405405
them into our project.
406406

407407
For MoinMoin we require the following XStatic Packages in pyproject.toml:
@@ -426,7 +426,7 @@ For MoinMoin we require the following XStatic Packages in pyproject.toml:
426426
used by basic theme to adjust textarea on modify view.
427427

428428
* `svgedit_moin <https://pypi.org/project/XStatic-svg-edit-moin>`_
429-
is loaded at template modify_svg-edit. It is a fast, web-based, Javascript-driven
429+
is loaded at template modify_svg-edit. It is a fast, web-based, JavaScript-driven
430430
SVG editor.
431431

432432
* `jquery_tablesorter <https://pypi.org/project/XStatic-JQuery.TableSorter/2.14.5.1>`_
@@ -723,7 +723,7 @@ Password strength
723723
As you might know, many users are bad at choosing reasonable passwords and some
724724
are tempted to use easily crackable passwords.
725725

726-
To help users choose reasonable passwords, moin has a simple builtin
726+
To help users choose reasonable passwords, Moin has a simple built-in
727727
password checker that is enabled by default and does some sanity checks,
728728
so users don't choose easily crackable passwords.
729729

@@ -1305,7 +1305,7 @@ Features:
13051305
* uses slqalchemy (without the ORM) for database abstraction
13061306
* supports multiple types of databases, for example:
13071307

1308-
- sqlite (default, comes built-into Python)
1308+
- SQLite (default, comes built into Python)
13091309
- postgresql
13101310
- mysql
13111311
- and others, see sqlalchemy docs.
@@ -1326,12 +1326,12 @@ Please see the sqlalchemy docs about the DBURI part.
13261326
Grant 'myuser' (his password: 'mypassword') full access to these databases.
13271327

13281328

1329-
sqlite store
1329+
SQLite store
13301330
------------
13311331
Features:
13321332

1333-
* directly talks to sqlite, without using sqlalchemy
1334-
* stores data into an sqlite database, which is a single file
1333+
* directly talks to SQLite, without using SQLAlchemy
1334+
* stores data into a SQLite database, which is a single file
13351335
* can either use 1 database per store or 1 table per store and you need to
13361336
give different table names then
13371337
* can optionally compress/decompress the data using zlib: default compression
@@ -1343,11 +1343,11 @@ Features:
13431343
stores:sqlite:/srv/mywiki/data/mywiki_%(nsname)s.db::%(kind)s
13441344
stores:sqlite:/srv/mywiki/data/mywiki_%(nsname)s.db::%(kind)s::1
13451345

1346-
The uri part after "sqlite:" is like::
1346+
The URI part after "sqlite:" is like::
13471347

13481348
PATH::TABLENAME::COMPRESSION
13491349

1350-
It uses "::" as separator to support windows pathes which may have ":" after
1350+
It uses "::" as a separator to support Windows paths, which may have ":" after
13511351
the drive letter.
13521352

13531353

@@ -1471,15 +1471,15 @@ to convert a moin 1.9 wiki to moin 2.0, then an item `foo` would be renamed to `
14711471
Mail configuration
14721472
==================
14731473

1474-
Sending E-Mail
1474+
Sending Email
14751475
--------------
1476-
Moin can optionally send E-Mail. Possible uses:
1476+
Moin can optionally send email. Possible uses:
14771477

14781478
* send out item change notifications
14791479
* enable users to reset forgotten passwords
14801480
* inform admins about runtime exceptions
14811481

1482-
You need to configure some settings before sending E-Mail can be supported::
1482+
You need to configure some settings before sending email can be supported::
14831483

14841484
# the "from:" address [Unicode]
14851485
mail_from = "wiki <[email protected]>"
@@ -1500,7 +1500,7 @@ You need to configure some settings before sending E-Mail can be supported::
15001500

15011501
describe more moin configuration
15021502

1503-
Admin Traceback E-Mails
1503+
Admin Traceback Emails
15041504
-----------------------
15051505
If you want to enable admins to receive Python tracebacks, you need to configure
15061506
the following::
@@ -1514,13 +1514,13 @@ the following::
15141514

15151515
Please also check the logging configuration example in `contrib/logging/email`.
15161516

1517-
User E-Mail Address Verification
1517+
User Email Address Verification
15181518
--------------------------------
15191519

1520-
At account creation time, Moin can require new users to verify their E-Mail
1520+
At account creation time, Moin can require new users to verify their email
15211521
address by clicking a link that is sent to them.
15221522

1523-
Make sure that Moin is able to send E-Mails (see previous section) and add the
1523+
Make sure that Moin is able to send emails (see previous section) and add the
15241524
following line to your configuration file to enable this feature::
15251525

15261526
user_email_verification = True

0 commit comments

Comments
 (0)