Merge remote-tracking branch 'origin/master' into core-updates

1 files changed, 7 insertions, 2 deletions

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 3baedb0654..58c4dafb9b 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -432,7 +432,7 @@ upstream source.
 @subsection Package Naming
 
 @cindex package name
-A package has actually two names associated with it:
+A package actually has two names associated with it.
 First, there is the name of the @emph{Scheme variable}, the one following
 @code{define-public}.  By this name, the package can be made known in the
 Scheme code, for instance as input to another package.  Second, there is
@@ -1016,7 +1016,6 @@ your @code{operating-system} configuration:
 (service qemu-binfmt-service-type
  (qemu-binfmt-configuration
    (platforms (lookup-qemu-platforms "arm" "aarch64"))
-   (guix-support? #t)))
 @end lisp
 
 Then reconfigure your system.
@@ -1374,6 +1373,12 @@ you're confident, it's OK to commit.
 That last part is subject to being adjusted, allowing individuals to commit
 directly on non-controversial changes on parts they’re familiar with.
 
+In order to reduce the possibility of mistakes, committers will have
+their Savannah account removed from the Guix Savannah project and their
+key removed from @file{.guix-authorizations} after 12 months of
+inactivity; they can ask to regain commit access by emailing the
+maintainers, without going through the vouching process.
+
 One last thing: the project keeps moving forward because committers not
 only push their own awesome changes, but also offer some of their time
 @emph{reviewing} and pushing other people's changes.  As a committer,