diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fb717b0a239da0b0a421835102ec8ac1cd302517..3c3134ec21e375c4483a9c2cf8bce5f6065b6b53 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ Please read [Developer documentation] before contribute. 5. Push your branch on the gitlab and create a merge request. Briefly explain the purpose of your contribution in the description of the merge request. -6. Tag a Duniter reviewer so he will review your contribution. If you still have no news after several weeks, tag another reviewer or/and talk about your contribution on [the technical forum]. +6. Tag a Duniter reviewer so they will review your contribution. If you still have no news after several weeks, tag another reviewer or/and talk about your contribution on [the technical forum]. ## List of Duniter's reviewers diff --git a/docs/dev/git-conventions.md b/docs/dev/git-conventions.md index d4d68577c43b4cb2d3b4b996c761546e6f8af0ef..74c4207fd436b10d753b7010e552fea3db7e114d 100644 --- a/docs/dev/git-conventions.md +++ b/docs/dev/git-conventions.md @@ -63,7 +63,7 @@ After complying with the above criteria in your commits, you should check that y git checkout YOU_BRANCH # switch back to your branch git rebase master # rebase you work on master branch -In case of conflict during rebase that you can not solve, contact a lead developer telling him the hash of the commit on which YOUR_BRANCH is currently based so he can reproduce the rebase and see the conflicts. While waiting for his answer, you can cancel the rebase and work on YOUR_BRANCH without updating: +In case of conflict during rebase that you can not solve, contact a lead developer telling them the hash of the commit on which YOUR_BRANCH is currently based so they can reproduce the rebase and see the conflicts. While waiting for their answer, you can cancel the rebase and work on YOUR_BRANCH without updating: git rebase --abort diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs index f4e5707bcff836733f306b70ca8592f066043a01..0e41d6459511c98303f939a179505fcb35b24ace 100644 --- a/pallets/authority-members/src/lib.rs +++ b/pallets/authority-members/src/lib.rs @@ -184,8 +184,8 @@ pub mod pallet { /// A member will enter the set of authorities in 2 sessions. /// [member_id] MemberGoOnline(T::MemberId), - /// A member has lost the right to be part of the authorities, he will be removed from - //// the authority set in 2 sessions. + /// A member has lost the right to be part of the authorities, + /// this member will be removed from the authority set in 2 sessions. /// [member_id] MemberRemoved(T::MemberId), } diff --git a/pallets/authority-members/src/tests.rs b/pallets/authority-members/src/tests.rs index 480ecdb408d4caa4302cafafa9fdb8832f9b7923..d11b98b453d1079cd73916c3e22c9b646e2370f8 100644 --- a/pallets/authority-members/src/tests.rs +++ b/pallets/authority-members/src/tests.rs @@ -183,7 +183,7 @@ fn test_go_online() { new_test_ext(3).execute_with(|| { run_to_block(1); - // Member 12 should be able to set his session keys + // Member 12 should be able to set their session keys assert_ok!(AuthorityMembers::set_session_keys( Origin::signed(12), UintAuthorityId(12).into(), @@ -235,7 +235,7 @@ fn test_too_many_authorities() { new_test_ext(3).execute_with(|| { run_to_block(1); - // Member 12 set his session keys then go online + // Member 12 sets their session keys then go online assert_ok!(AuthorityMembers::set_session_keys( Origin::signed(12), UintAuthorityId(12).into(), @@ -267,7 +267,7 @@ fn test_go_online_then_go_offline_in_same_session() { new_test_ext(3).execute_with(|| { run_to_block(1); - // Member 12 set his session keys & go online + // Member 12 sets their session keys & go online assert_ok!(AuthorityMembers::set_session_keys( Origin::signed(12), UintAuthorityId(12).into(), @@ -276,7 +276,7 @@ fn test_go_online_then_go_offline_in_same_session() { run_to_block(2); - // Member 12 should be able to go offline at the same session to "cancel" his previous + // Member 12 should be able to go offline at the same session to "cancel" their previous // action assert_ok!(AuthorityMembers::go_offline(Origin::signed(12)),); @@ -305,7 +305,7 @@ fn test_go_offline_then_go_online_in_same_session() { run_to_block(7); - // Member 9 should be able to go online at the same session to "cancel" his previous action + // Member 9 should be able to go online at the same session to "cancel" their previous action assert_ok!(AuthorityMembers::go_online(Origin::signed(9)),); // Verify state diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index 90689c4c4d4d9872aa48a2290e81e41db434e7b7..6a716b715cc3732b9bd8b78768828473751f7bed 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -338,7 +338,7 @@ impl<T: Config<I>, I: 'static> pallet_certification::traits::OnRemovedCert<IdtyI if receiver_received_count < T::MinCertForMembership::get() && pallet_membership::Pallet::<T, I>::is_member(&receiver) { - // Revoke receiver membership and disable his identity + // Revoke receiver membership and disable their identity if let Err(e) = pallet_membership::Pallet::<T, I>::revoke_membership( RawOrigin::Root.into(), Some(receiver),