Skip to content

Updating contribution guides for docs. #325

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

Merged
merged 30 commits into from
May 21, 2019

Conversation

dobooth
Copy link
Contributor

@dobooth dobooth commented Apr 1, 2019

This PR adds a DOCUMENTATION_TEMPLATE that describes how to contribute docs and gives a few markdown examples.
I updated the CONTRIBUTORS file to link to the new doc.

@okolesnyk okolesnyk requested review from dshevtsov and okolesnyk April 1, 2019 19:17
@coveralls
Copy link

coveralls commented Apr 1, 2019

Coverage Status

Coverage increased (+1.6%) to 55.958% when pulling eaa1d0e on magento-devdocs:db_contributions into 958e9c3 on magento:develop.

@@ -40,7 +40,7 @@ All contributors are required to submit a click-through form to agree to the ter

- Unit/integration test coverage
- Proposed documentation update.
For the documentation contribution guidelines, see [DevDocs Contributing][devdocs].
For the documentation contribution guidelines, see [DOCUMENTATION_TEMPLATE][].
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
For the documentation contribution guidelines, see [DOCUMENTATION_TEMPLATE][].
For the documentation contribution guidelines, see [documentation template][].

No need to use code-like letter case because it is not related to a file name or any other entity unless it is intended to be a reference for DOCUMENTATION_TEMPLATE.md.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is a ref to it.

Copy link
Contributor

@dshevtsov dshevtsov Apr 2, 2019

Choose a reason for hiding this comment

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

no, it refers to .../.github/CONTRIBUTING.md in link definitions

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

@@ -160,7 +160,7 @@ Label| Description
[create issue]: https://help.github.com/articles/creating-an-issue/
[create pr]: https://help.github.com/articles/creating-a-pull-request/
[Definition of Done]: https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing_dod.html
[devdocs]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.html
[DOCUMENTATION_TEMPLATE]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.html
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
[DOCUMENTATION_TEMPLATE]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.html
[DOCUMENTATION_TEMPLATE]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

This page describes the process for submitting docs and serves as a template so that docs are written properly.

The contribution workflow for docs is the same as submitting code.
To contribute to MFTF docs:
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
To contribute to MFTF docs:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

- One space after the dash.
- Blank line before and after list.

## Code Samples
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
## Code Samples
## Code samples

You're breaking your own rule above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ugh!

## Code Samples

For formatting and code coloring, wrap code samples in the following format.
Replace the `xml` with the file extension of the code sample type. Use `bash` for command-line text.
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
Replace the `xml` with the file extension of the code sample type. Use `bash` for command-line text.
Replace the `xml` with the corresponding language (tupe) of the code sample. Use `bash` for shell commands and `terminal` for terminal output.

Copy link
Contributor

Choose a reason for hiding this comment

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

move this line after the example code block

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

| Colume 1 text | Column 2 text|
| Column 1 text | Column 2 text|

Markdown tables work for simple tables. If you need lists or other complex features within a cell, you may have to use a HTML table.
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
Markdown tables work for simple tables. If you need lists or other complex features within a cell, you may have to use a HTML table.
Markdown formatting works for simple tables. It does not support multiline content within a cell, or split/merged cells within a row or column.

We don't want to use complex tables. The content that requires a complex table should be restructured to avoid it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks.

## Other tips

- Use spaces instead of tabs.
- One empty line between content. No duplicate empty lines.
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
- One empty line between content. No duplicate empty lines.
- Do not duplicate blank lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it.

Copy link
Contributor

@dshevtsov dshevtsov left a comment

Choose a reason for hiding this comment

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

Review the suggested changes


Any changes to the Table of Contents will need to be made in the regular [devdocs repo][].

## Ordered lists - all heading have a blank line before and after, capitalize the first word only
Copy link
Contributor

Choose a reason for hiding this comment

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

Move the rule all heading have a blank line before and after, capitalize the first word only to a section content from the heading to be consistent throughout the document.

Copy link
Contributor

Choose a reason for hiding this comment

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

@dobooth Any updates on this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

We will inform you if it needs any additional processing.

The documentation in this repository is used as the source for the [MFTF documentation][].
Any changes to the Table of Contents will need to be made via a separate PR in the regular [devdocs repo][].
Copy link
Contributor

@dshevtsov dshevtsov Apr 15, 2019

Choose a reason for hiding this comment

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

  1. As a developer who is contributing to this repository, how do I know what Table of Contents is this sentence about? There is no Table of Contents here.

  2. Change "repo" to "repository", "PR" to "pull request". Avoid abbreviations.

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 code contributor, I do not know what is devdocs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.


The contribution workflow for the Magento functional testing framework (MFTF) documentation is the same as submitting code.

1. Create a branch from the `develop` branch in the [MFTF repo][].
Copy link
Contributor

Choose a reason for hiding this comment

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

Change "repo" to "repository". Avoid abbreviations.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am slowly learning.

@@ -0,0 +1,66 @@
# How to contribute to MFTF docs
Copy link
Contributor

Choose a reason for hiding this comment

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

The "documentation" word is used 8 times in this section.
Rephrase to avoid the unneeded repetition. For example:
We welcome contributions to the MFTF documentation, which is kept within the /docs/ folder in this repository.
This page describes the submitting process and serves as a template for a properly written content.
The contribution workflow is the same as submitting code.
The content in this repository is also a source for the [MFTF guide topics][].

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see the changes.

We will inform you if it needs any additional processing.

The documentation in this repository is used as the source for the [MFTF documentation][].
Any changes to the Table of Contents will need to be made via a separate PR in the regular [Magento Developer documentation repository][].
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. Replace via with other word.

    See DevDocs style guide:

    Non-English words and weak phrases
    Some non-English words and abbreviations are difficult to translate, and some users might be unfamiliar with them.

    Avoid the following common words and phrases

    Info
    Etc. or etcetera
    e.g.
    Misc. or miscellaneous
    Via
    Make sure

  2. It is not clear why Table of Contents is capitalized.

  3. Replace PR with pull request. Avoid abbreviations. GitHub interface doesn't use this abbreviation, so it can be not clear (GitHub article About pull requests)

    See DevDocs style guide:

    Acronyms
    Use only the most obvious acronyms. For instance, use PHP, HTML, XML for the names of those computer languages, not an unknown acronym. Try to avoid acronyms in your text when possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see the changes.

Copy link
Contributor

@dshevtsov dshevtsov left a comment

Choose a reason for hiding this comment

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

When I read the DOCUMENTATION_TEMPLETE topic, I don't see initial Markdown formatting.
Wrap examples in code blocks to show their implementation like:

```
your example
```

Refer to the DevDocs basic template for more examples.

Copy link
Contributor

@dshevtsov dshevtsov left a comment

Choose a reason for hiding this comment

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

Suggested minor changes

@tomreece tomreece merged commit 291bad3 into magento:develop May 21, 2019
@dobooth dobooth deleted the db_contributions branch July 18, 2019 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants