Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic email system: Big overhaul of grammar and formatting (Revision 2) #1864

Closed
wants to merge 4 commits into from

Conversation

neelchauhan
Copy link
Contributor

@neelchauhan neelchauhan commented Mar 3, 2024

It seemed my previous PR #1854 got prematurely merged and subsequently reverted in #1863, so here is a revised version.

Author checklist (Completed by original Author)

  • Good fit for the Rocky Linux project? Title and Author Metatags inserted ?
  • If applicable, steps and instructions have been tested to work
  • Initial self-review to fix basic typos and grammar completed

Rocky Documentation checklist (Completed by Rocky team)

  • 1st Pass (Document is good fit for project and author checklist completed)
  • 2nd Pass (Technical Review - check for technical correctness)
  • 3rd Pass (Detailed Editorial Review and Peer Review)
  • Final approval (Final Review)

@sspencerwire
Copy link
Contributor

@jimcat8 Please review these changes. @wsoyinka I'm not going to approve or merge this PR until I know that it is in its final state. @neelchauhan Thank you for your work!

@@ -210,32 +232,30 @@ Mysql > insert into virtual_aliases(id,domain_id,source,destination) values(1,1,
Mysql > insert into virtual_aliases(id,domain_id,source,destination) values(2,1,'[email protected]','[email protected]');
```

Here I have not inserted the ciphertext password for the relevant email users, which requires the use of `doveadm pw -s SHA512-crypt -p twotestandtwo` command. See [here](#ap1)
The password entries for the relevant email users are not shown here, as it requires the use of `doveadm pw -s SHA512-crypt -p twotestandtwo` command. See [here](#ap1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a translator, I would prefer to put the command in a separate line, e.g., something similar to:

The password entries for the relevant email users are not shown here, as it requires the use of the following command:

doveadm pw -s SHA512-crypt -p twotestandtwo

See here.

What is the meaning of the other translators?

Copy link
Contributor

@SergeCroise SergeCroise left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(feel free to modify or revert my suggestions)

docs/guides/email/02-basic-email-system.md Outdated Show resolved Hide resolved

```bash
Shell(192.168.100.7) > systemctl enable --now dovecot
```

!!! info
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
!!! info
!!! info "Info"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have discussed this before @SergeCroise, but adding the "Info" and "Warning" to custom titles isn't required. In fact, I think we discussed that translators could decide if they wanted to add the translated title to the admonition themselves. If I recall, that was the consensus decision, wasn't it?

@sspencerwire
Copy link
Contributor

@jimcat8: What is it that you don't like about the fenced code-block changes? The title of the fenced code block is a required markdown element (```bash) so I'm guessing that this is not what you are arguing about? Please clarify for @neelchauhan what you don't want.

!include auth-sql.conf.ext
```

```bash
Shell(192.168.100.6) > vim /etc/dovecot/conf.d/10-master.conf
...
Shell(192.168.100.7) > vim /etc/dovecot/conf.d/10-master.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 and @neelchauhan

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link

github-actions bot commented Mar 4, 2024

Test results for a9c1da2:

Number of broken URLs: 3

URL,RESULT,FILENAME
 https://www.linode.com/docs/guides/beginners-guide-to-lxd-reverse-proxy,failed,guides/containers/lxd_web_servers.md
 https://docs.rockylinux.org/gemstones/docker/,failed,guides/containers/rancher_and_kubernetes.md
 https://csrc.nist.gov/projects/security-content-automation-protocol,failed,books/disa_stig/disa_stig_part2.md


Don't write the above grammar on one line, such as this--"userdb {driver = sql args = uid=vmail gid=vmail home=/var/mail/vhosts/%d/%n}". Otherwise, it won't work.
```bash
Shell(192.168.100.7) > vim /etc/dovecot/dovecot-sql.conf.ext
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 and @neelchauhan

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 and @neelchauhan

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

The beginning of the document already indicates that this is an email system composed of three machines.

@jimcat8
Copy link
Contributor

jimcat8 commented Mar 4, 2024

My idea is not to adjust the basic style or format, but only to change the wording of the text, because the content of this document (02-Basic-Email-Syst.md) is relatively complete.
Just like this “PR” (# 1865)

Copy link
Member

@wsoyinka wsoyinka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 :

  • Please review and confirm that specific IP address changes at the prompt are correct throughout the document(s).

192.168.100.5 Vs 192.168.100.6 Vs. 192.168.100.7

Next, edit the mail storage configuration:

```bash
Shell(192.168.100.7) > vim /etc/dovecot/conf.d/10-mail.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 and @neelchauhan

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.6

First, edit the Dovecot configuration:

```bash
Shell(192.168.100.7) > vim /etc/dovecot/dovecot.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 and @neelchauhan . Especially @jimcat8

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.6


```bash
Shell(192.168.100.6) > tree /etc/dovecot/
Shell(192.168.100.7) > tree /etc/dovecot/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 :

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.6

Shell(192.168.100.6) > systemctl start postfix.service
Shell(192.168.100.6) > postfix check
Shell(192.168.100.6) > postfix status
Shell(192.168.100.7) > systemctl start postfix.service
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 :

  • what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.6

ENCRYPT_METHOD SHA512
```

We can see its structure in the /etc/shadow file:

```bash
Shell(192.168.100.5) > grep -i root /etc/shadow | cut -f 2 -d ":"
Shell(192.168.100.7) > grep -i root /etc/shadow | cut -f 2 -d ":"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 :

  • what is the correct IP that should appear here - 192.168.100.5 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.5


```bash
Shell(192.168.100.5) > grep -i method /etc/login.defs
Shell(192.168.100.7) > grep -i method /etc/login.defs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jimcat8 :

  • what is the correct IP that should appear here - 192.168.100.5 (original) OR 192.168.100.7 (new) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

192.168.100.5

@sspencerwire
Copy link
Contributor

@neelchauhan @jimcat8 Because of the errors made in the IP addresses of the prompts, and because this PR now conflicts with a grammar PR pushed and merged yesterday (which did not deal with the technical aspects of this document), I'm going to have to elect to close this PR yet again. @neelchauhan If you see any wording changes that still need to be dealt with, without messing with the technical aspects of the document, I'm more than willing to merge those. Thanks to all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants