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

Enhanced README: Contribution Guidelines, TOC, and Overview #2504

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 38 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,51 @@
## Matrix.org Website

If you want to contribute to the website, make sure the problem you're trying to
fix or the feature you want to implement has been discussed in our issue tracker
and that we are interested in reviewing and merging such a contribution.
# Table of Contents
- [Overview](#overview)
- [Building the Website](#building-the-website)
- [Contribution Guidelines](#contribution-guidelines)
- [Contact Us](#contact-us)

To discuss maintenance of this site, please come talk to the team in
[#matrix.org-website:matrix.org](https://matrix.to/#/#matrix.org-website:matrix.org).
# Overview

Matrix.org is a decentralized, open standard for real-time communication which allows users to collaborate in public and private rooms over IP. Matrix's purpose is to allow users to text and call without thinking about what app or phone the other user has.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
Matrix.org is a decentralized, open standard for real-time communication which allows users to collaborate in public and private rooms over IP. Matrix's purpose is to allow users to text and call without thinking about what app or phone the other user has.
Matrix.org is an open standard for decentralised, secure communications while also allowing you to bridge to other networks easily.
This Repository covers our main website.
For spec please take a look at https://github.com/matrix-org/matrix-spec
For the conference website take a look at https://github.com/matrix-org/matrix-conf-website


## Building the website

Install the latest version of [Zola](https://www.getzola.org), clone the repo, and from the root of the
repo type

## Building the website
To contribute or run the website locally, follow the instructions below:
1. '''
git clone https://github.com/matrix-org/matrix.org.git
cd matrix.org
Comment on lines +17 to +19
Copy link
Collaborator

Choose a reason for hiding this comment

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

This seems to not be working with Github Markdown. Could you fix that please? Have a look at the rich diff button on the top right of this file to see how it is being rendered

'''
2. Ensure Zola is installed, otherwise install the latest version of [Zola](https://www.getzola.org)
From the root repo run the following command
```
zola serve
```

Zola will build the website and start a web server, usually at
http://127.0.0.1:1111

3. To build the website for production, run the command:
'''
zola build
'''
Comment on lines +31 to +33
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same as the other comment


## Contribution Guidelines
1. Fork the reposity (https://github.com/matrix-org/matrix.org.git)
2. Clone your fork to your local computer
3. Create a new branch and implement changes using
'''
git checkout -b <yourBranchName>
Comment on lines +39 to +40
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same as the other comment

4. Submit a pull request (PR)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
4. Submit a pull request (PR)
4. Submit a pull request



# Contact Us

## Community
If you have any questions about the project or your contribution, you may join the various community chats on https://matrix.to/#/#matrix.org-website:matrix.org
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
If you have any questions about the project or your contribution, you may join the various community chats on https://matrix.to/#/#matrix.org-website:matrix.org
If you have any questions about the project or your contribution, you may join our room https://matrix.to/#/#matrix.org-website:matrix.org


Before contributing, make sure the feature or bug you intend to address has already been discussed in our issue tracker
and that we are interested in reviewing and merging such a contribution.