Contribute Howto update #168

Merged
meaz merged 12 commits from contribute.howto into master 2022-12-18 08:53:28 +01:00
Owner

How to Contribute howto:

  1. Archived the original version in "archive" directory
  2. Rewrite of the process and procedures
  3. Update, rewrite and expand the Git + Atom howto
  4. Added a Troubleshooting chapter for common issues
How to Contribute howto: 1. Archived the original version in "archive" directory 2. Rewrite of the process and procedures 3. Update, rewrite and expand the Git + Atom howto 4. Added a Troubleshooting chapter for common issues
fede added the
HOWTO
UPDATE
GIT
labels 2022-01-19 17:25:39 +01:00
fede added 1 commit 2022-01-19 17:25:41 +01:00
fede requested review from muppeth 2022-01-19 17:26:02 +01:00
fede requested review from meaz 2022-01-19 17:26:02 +01:00
fede requested review from antilopa 2022-01-19 17:26:03 +01:00
fede requested review from avg_joe 2022-01-19 17:26:03 +01:00
fede added this to the HOWTO project 2022-01-19 17:26:24 +01:00
Owner

In contribute/git/editors/atom/working you wrote this git branch -b your.new.branch.name and then git checkout our.branch. It would make more sense to write git checkout your.new.branch.name. The same after with git push origin our.branch.name. Perhaps be consistent with the decided branch name.

In 01.procedure, English and German aren't the same.

For Use of visual aids (if it's possible) like perhaps add the recommanded framerate as someone asked about that the other day.

In Terminologies, remove hubzilla. And cryptpad and git are missing.

But what an amazing job!

~~In `contribute/git/editors/atom/working` you wrote this `git branch -b your.new.branch.name` and then `git checkout our.branch`. It would make more sense to write `git checkout your.new.branch.name`. The same after with `git push origin our.branch.name`. Perhaps be consistent with the decided branch name.~~ In 01.procedure, English and German aren't the same. For `Use of visual aids (if it's possible) like` perhaps add the recommanded framerate as someone asked about that the other day. In Terminologies, remove hubzilla. And cryptpad and git are missing. But what an amazing job!
Collaborator

For Use of visual aids (if it's possible) like perhaps add the recommanded framerate as someone asked about that the other day.

Yes, I asked about it.

> For Use of visual aids (if it's possible) like perhaps add the recommanded framerate as someone asked about that the other day. Yes, I asked about it.
fede added 2 commits 2022-01-31 20:10:15 +01:00
fede added 1 commit 2022-01-31 20:44:41 +01:00
meaz approved these changes 2022-02-07 11:00:45 +01:00
fede added 3 commits 2022-02-10 19:14:16 +01:00
fede added 1 commit 2022-02-11 04:59:14 +01:00
fede added 1 commit 2022-02-11 20:50:06 +01:00
meaz reviewed 2022-02-12 08:51:18 +01:00
@ -0,0 +32,4 @@
At the bottom is the "status bar" which displays, at the left, the path of the file we are working on and, at the right, information related to the code language, the current branch, some Git actions menu and the number of files we have modified.
![](en/status.bar.png)
Owner

I find this image a bit small, it is hard to see if yu don't have good eyes ;)

I find this image a bit small, it is hard to see if yu don't have good eyes ;)
Author
Owner

Yes, me too, but even if I try to resize it, it looks that "big". But it's the same with all images. I think we should check at the css or something related.

Yes, me too, but even if I try to resize it, it looks that "big". But it's the same with all images. I think we should check at the css or something related.
meaz reviewed 2022-02-12 09:01:14 +01:00
@ -0,0 +44,4 @@
- switch to the **Main Branch**: `git checkout master`;
- update the **Main Branch**: `git pull`;
- switch back to our working branch: `git checkout our.branch`;
- update our working branch from the updated **Main Branch**: `git rebase master`.
Owner

perhaps add a warning than conflicts may arise

perhaps add a warning than conflicts may arise
meaz reviewed 2022-02-12 09:02:42 +01:00
@ -0,0 +39,4 @@
# Pages
There are currently two different templates for the **Howto** pages:
- **docs.md**: these are the most common text files we can find in the Howto site, the pages that made the howtos.
Owner

"the pages that made the howtos" -> the pages that make the howtos

"the pages that made the howtos" -> the pages that make the howtos
Author
Owner

Fixed.

Fixed.
fede marked this conversation as resolved
meaz reviewed 2022-02-12 09:06:51 +01:00
@ -0,0 +35,4 @@
!! **Everyone, no matter the operating system they use, can collaborate by writing how to use a service. Remember that the most important thing is to make the information available to anyone.**
## Second question: Who are the howtos aimed at?
In principle, any person over 16 years of age can use the **Disroot** services. But we can also think about the fact we all have, for example, relatives and acquaintances older that us who we would like to introduce to the use of socially ethical and technically useful tools or maybe they just want to do it by themselves.
Owner

I would remove the "older that us"

I would remove the "older that us"
Author
Owner

Done.

Done.
fede marked this conversation as resolved
meaz reviewed 2022-02-12 09:10:00 +01:00
@ -0,0 +170,4 @@
... you will see this:
![](en/name_of_folder_full_of_media_files/example_1.png)
Owner

I don't see the image

I don't see the image
meaz reviewed 2022-02-12 09:10:30 +01:00
@ -0,0 +178,4 @@
you'll get this:
text before ![](en/name_of_folder_full_of_media_files/example_1.png) text after
Owner

I don't see that image

I don't see that image
meaz reviewed 2022-02-12 09:11:38 +01:00
@ -0,0 +209,4 @@
|Rainloop|**Disroot Webmail**|
|Hubzilla Instance|**DisHub**|
|Private Bin|**Disroot Bin**|
|Polls|**Disroot Polls**|
Owner

Don't forget that Polls and Ethercalc will be dropped at the end of the month. So perhaps remove them now before we forget!

Don't forget that Polls and Ethercalc will be dropped at the end of the month. So perhaps remove them now before we forget!
Author
Owner

Done.

Done.
fede marked this conversation as resolved
Owner

where are we at with that one @fede?

where are we at with that one @fede?
Author
Owner

I think it's done (for now). I'll check it all again and then a PR.

I think it's done (for now). I'll check it all again and then a PR.
fede added 1 commit 2022-05-28 23:30:05 +02:00
meaz approved these changes 2022-05-29 11:31:04 +02:00
Owner

@fede I'm kind of lost with that PR... Should it be merged?

@fede I'm kind of lost with that PR... Should it be merged?
Author
Owner

It was ready to be merged. I'll check it again.

It was ready to be merged. I'll check it again.
Owner

thanks!

thanks!
meaz added 1 commit 2022-12-18 08:49:43 +01:00
meaz added 1 commit 2022-12-18 08:53:04 +01:00
meaz merged commit 56bae9153a into master 2022-12-18 08:53:28 +01:00
meaz referenced this issue from a commit 2022-12-18 08:53:28 +01:00
Sign in to join this conversation.
No reviewers
No Milestone
No project
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Disroot/Howto#168
No description provided.