11# Introduction
2+
23There are multiple ways to help make TimescaleDB better, including contributing
34to the documentation. All of our documentation is available to use and review
45with GitHub.
56
67## First contribution
8+
79You can make contributions to the documentation by creating a fork of the
810repository. However, if you have write access to the repository, use a branch
911instead. Some of our automation does not work correctly on forks.
1012
11- <procedure >
13+ <Procedure >
1214
1315### Contributing using a fork
16+
14171 . Make sure you have a [ GitHub] ( https://github.com ) account, and that
1518 you're signed in.
16191 . Navigate to the
@@ -20,73 +23,99 @@ instead. Some of our automation does not work correctly on forks.
20231 . Wait for GitHub to create your fork and redirect you.
21241 . Clone the repository to your local machine. To find this URL, click the green
2225 ` Code ` button and copy the HTTPS URL:
26+
2327 ``` bash
2428 git clone https://github.com/< username> /docs.git
2529 ```
30+
26311. List the current remote branches:
32+
2733 ` ` ` bash
2834 git remote -v
2935 ` ` `
36+
3037 This command should list two remotes, both marked ` origin` , like this:
38+
3139 ` ` ` bash
3240 origin https://github.com/< username> /docs.git (fetch)
3341 origin https://github.com/< username> /docs.git (push)
3442 ` ` `
43+
3544 The ` origin` remotes are your own fork, and you can do whatever you want
3645 here without changing the upstream repository.
37461. Add the docs repo as an upstream:
47+
3848 ` ` ` bash
3949 git remote add upstream https://github.com/timescale/docs.git
4050 ` ` `
51+
41521. Check:
53+
4254 ` ` ` bash
4355 git remote -v
4456 ` ` `
57+
4558 This command should now have the same two ` origin` remotes as before, plus
4659 two more labelled ` upstream` , like this:
60+
4761 ` ` ` bash
4862 origin https://github.com/< username> /docs.git (fetch)
4963 origin https://github.com/< username> /docs.git (push)
5064 upstream https://github.com/timescale/docs.git (fetch)
5165 upstream https://github.com/timescale/docs.git (push)
5266 ` ` `
67+
53681. Fetch the branches in the upstream repository:
69+
5470 ` ` ` bash
5571 git fetch upstream
5672 ` ` `
73+
57741. Merge the changes from the upstream ` latest` branch, into your fork' s
5875 `latest` branch:
76+
5977 ```bash
6078 git merge upstream/latest
6179 ```
62- 1. Create a new branch for the work you want to do. Make sure you give it an
80+
81+ 1. Create a new branch for the work you want to do. Make sure you give it an
6382 appropriate name, and include your username:
83+
6484 ```bash
6585 git checkout -b update-readme-username
6686 ```
6787
68- </procedure >
88+ </Procedure >
6989
70- <procedure >
90+ <Procedure >
7191
7292### Committing changes and creating a pull request
93+
73941. Make your changes.
74951. Add the updated files to your commit:
96+
7597 ```bash
7698 git add .
7799 ```
100+
781011. Commit your changes:
102+
79103 ```bash
80104 git commit -m "Commit message here"
81105 ```
106+
821071. Push your changes:
108+
83109 ```bash
84110 git push
85111 ```
112+
86113 If git prompts you to set an upstream in order to push, use this command:
114+
87115 ```bash
88116 git push --set-upstream origin <branchname>
89117 ```
118+
901191. Create a pull request (PR) by navigating to
91120 <https://github.com/timescale/docs> and clicking
92121 `Compare and Create Pull Request`. Write an informative commit message
@@ -97,70 +126,82 @@ instead. Some of our automation does not work correctly on forks.
97126 transparent about what you are working on, and making sure we all understand
98127 current progress.
99128
100- </procedure >
129+ </Procedure >
101130
102- <highlight type="important">
131+ <Highlight type="important">
103132Choose your reviewers carefully! If you have made changes to the technical
104133detail of the documentation, choose an appropriate subject matter expert (SME)
105134to review those changes. Additionally, every change requires at least one
106135documentation team member to approve. Ask the documentation team for a review by
107136adding the `timescale/documentation` group as a reviewer.
108- </highlight >
137+ </Highlight >
109138
110139## Second contribution
140+
111141When you have checked out the repo, if you want to keep working on things, you
112142need to make sure that your local copy of the repo stays up to date. If you
113143don' t do this, you * will* end up with merge conflicts.
114144
115- < procedure >
145+ < Procedure >
116146
117147# ## Second contribution
148+
1181491. Check out your fork' s `latest` branch:
150+
119151 ```bash
120152 git checkout latest
121153 ```
154+
122155 You get a message like this:
156+
123157 ```bash
124158 Switched to branch ' latest'
125159 Your branch is up to date with ' origin/latest' .
126160 ```
161+
127162 BEWARE! This is usually a lie!
1281631. Fetch the branches in the upstream repository:
164+
129165 ```bash
130166 git fetch upstream
131167 ```
168+
1321691. Merge the changes from the upstream `latest` branch, into your fork' s
133170 ` latest` branch:
171+
134172 ` ` ` bash
135173 git merge upstream/latest
136174 ` ` `
175+
1371761. If you are continuing work you began earlier, check out the branch that
138177 contains your work. For new work, create a new branch. Doing this regularly
139178 as you are working means you keep your local copies up to date and avoid
140179 conflicts. You should do it at least every day before you begin work, and
141180 again whenever you switch branches.
142181
182+ < /Procedure>
143183
144- < /procedure>
145-
146- < highlight type=" warning" >
184+ < Highlight type=" warning" >
147185Never leave branches lying around on your local system. Create your PR as soon
148186as possible, and make good use of the Draft feature. Commit to your feature
149187branch early and often! Update your local copy from latest whenever you switch
150188branches.
151- < /highlight >
189+ < /Highlight >
152190
153191# # Reviewing standards
192+
154193When you create a pull request, a member of the documentation team will review
155194it for accuracy and adherance to our standards. You can see a list of the things
156195that reviewers check for in the pull request template.
157196
158197# # Writing standards
198+
159199Timescale has comprehensive writing and style standards, that are constantly
160200being updated and improved. For the current guidelines, see
161201[contributing to documentation](https://docs.timescale.com/timescaledb/latest/contribute-to-docs/).
162202
163203# # The Timescale documentation team
204+
164205* Lana Brindley < https://github.com/Loquacity>
165206* Rajakavitha Kodhandapani < https://github.com/Rajakavitha1>
166207* Charis Lam < https://github.com/charislam>
0 commit comments