Merge branch 'eread/followup-of-repetition-fixes' into 'master'

Refine some recently modified text

See merge request gitlab-org/gitlab!29101

doc/development/testing_guide/end_to_end/best_practices.md

@@ -74,7 +74,10 @@ point of failure and so the screenshot would not be captured at the right moment
 
 All QA tests expect to be able to log in at the start of the test.
 
-That's not possible if a test leaves the browser logged in when it finishes. Normally this isn't a problem because [Capybara resets the session after each test](https://github.com/teamcapybara/capybara/blob/9ebc5033282d40c73b0286e60217515fd1bb0b5d/lib/capybara/rspec.rb#L18). But Capybara does that in an `after` block, so when a test logs in an `after(:context)` block, the browser returns to a logged in state *after* Capybara had logged it out. And so the next test will fail.
+That's not possible if a test leaves the browser logged in when it finishes. Normally this isn't a
+problem because [Capybara resets the session after each test](https://github.com/teamcapybara/capybara/blob/9ebc5033282d40c73b0286e60217515fd1bb0b5d/lib/capybara/rspec.rb#L18).
+But Capybara does that in an `after` block, so when a test logs in within an `after(:context)` block,
+the browser returns to a logged in state *after* Capybara had logged it out. And so the next test will fail.
 
 For an example see: <https://gitlab.com/gitlab-org/gitlab/issues/34736>
 

doc/integration/gmail_action_buttons_for_gitlab.md

@@ -6,16 +6,18 @@ If correctly set up, emails that require an action will be marked in Gmail.
 
 ![gmail_actions_button.png](img/gmail_action_buttons_for_gitlab.png)
 
-To get this functioning, you need to be registered with Google.
-[See how to register with Google in this document.](https://developers.google.com/gmail/markup/registering-with-google)
+To get this functioning, you need to be registered with Google. For instructions, see
+[Register with Google](https://developers.google.com/gmail/markup/registering-with-google).
 
 *This process has a lot of steps so make sure that you fulfill all requirements set by Google.*
 *Your application will be rejected by Google if you fail to do so.*
 
-Pay close attention to:
+In particular, note:
 
-- Email account used by GitLab to send notification emails needs to have "Consistent history of sending a high volume of mail from your domain (order of hundred emails a day minimum to Gmail) for a few weeks at least".
-- A very low rate of spam complaints from users.
+- The email account used by GitLab to send notification emails must:
+  - Have a "Consistent history of sending a high volume of mail from your domain
+    (order of hundred emails a day minimum to Gmail) for a few weeks at least".
+  - Have a very low rate of spam complaints from users.
 - Emails must be authenticated via DKIM or SPF.
 - Before sending the final form ("Gmail Schema Whitelist Request"), you must send a real email from your production server. This means that you will have to find a way to send this email from the email address you are registering. You can do this by, for example, forwarding the real email from the email address you are registering or going into the rails console on the GitLab server and triggering the email sending from there.