aboutsummaryrefslogtreecommitdiff
path: root/documentation/content/en/articles/committers-guide
diff options
context:
space:
mode:
authorBenedict Reuschling <bcr@FreeBSD.org>2023-05-18 15:46:42 +0000
committerBenedict Reuschling <bcr@FreeBSD.org>2023-05-18 15:53:26 +0000
commitb2f883f5a2d9010820ec194ab709549c3303db6e (patch)
tree2c300b0e0da8d3108abe36135bf78b1b4b5a6344 /documentation/content/en/articles/committers-guide
parentd206f52a928454c12d4dab920337d320765511ec (diff)
Diffstat (limited to 'documentation/content/en/articles/committers-guide')
-rw-r--r--documentation/content/en/articles/committers-guide/_index.adoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 47d7060859..744d3e31ed 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -1876,7 +1876,7 @@ would look at the log for the vendor branch for zlib starting at 1.2.10.
=== Collaborating with others
One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree.
-The FreeBSD project's Git repositories do not, yet, allow user-created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user-generated branch.
+The FreeBSD project's Git repositories do not, yet, allow user-created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, to share changes in a user-generated branch.
The following instructions show how to set up a user-generated branch, based on the FreeBSD `main` branch, and push it to GitHub.
@@ -3698,7 +3698,7 @@ FreeBSD committers can get a free 4-CD or DVD set at conferences from http://www
https://gandi.net[Gandi] provides website hosting, cloud computing, domain registration, and X.509 certificate services.
Gandi offers an E-rate discount to all FreeBSD developers.
-In order to streamline the process of getting the discount first set up a Gandi account, fill in the billing information and select the currency.
+To streamline the process of getting the discount first set up a Gandi account, fill in the billing information and select the currency.
Then send an mail to mailto:non-profit@gandi.net[non-profit@gandi.net] using your `@freebsd.org` mail address, and indicate your Gandi handle.
[[benefits-rsync]]