Rearrange page to give more prominence to GitLab

1 files changed, 24 insertions, 19 deletions

diff --git a/index.mdwn b/index.mdwn
index aabf6cb..a2e1076 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -28,29 +28,32 @@ The releases are OpenPGP signed with the key of the current maintainer
 
 ## Development
 
-The code under development can be cloned from git:
-
-    git clone https://anongit.freedesktop.org/git/libbsd.git
-
-And browsed in either:
-
-* [gitlab](https://gitlab.freedesktop.org/libbsd/libbsd), or
-* [cgit](https://cgit.freedesktop.org/libbsd/).
+The code is developed on the FreeDesktop.Org
+[GitLab libbsd](https://gitlab.freedesktop.org/libbsd/libbsd) project.
 
 [![CI Status](https://gitlab.freedesktop.org/libbsd/libbsd/badges/master/pipeline.svg)](https://gitlab.freedesktop.org/libbsd/libbsd/commits/master)
 [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/7836.svg)](https://scan.coverity.com/projects/guillemj-libbsd")
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1883/badge)](https://bestpractices.coreinfrastructure.org/projects/1883)
 
-## Contact
+### Code
+
+The code under development can be browsed from the GitLab project or
+cloned from git with:
+
+    git clone https://gitlab.freedesktop.org/libbsd/libbsd.git
+
+It is currently still also accessible from:
+
+* (for cloning) https://anongit.freedesktop.org/git/libbsd.git
+* (for browsing) <https://cgit.freedesktop.org/libbsd/>
 
-[Mailing list](https://lists.freedesktop.org/mailman/listinfo/libbsd).
+### Issues
 
-The project has been switched to the
-[FreeDesktop.Org GitLab](https://gitlab.freedesktop.org/) instance, and
-filing new bugs in Bugzilla has been disabled. We are using the GitLab
-[issues](https://gitlab.freedesktop.org/libbsd/libbsd/issues) now. Historic
-bugs can be accessed from
-[Bugzilla](https://bugs.freedesktop.org/buglist.cgi?query_format=specific&bug_status=__closed__&product=libbsd).
+Bug reports and issues can be filed using the GitLab
+[issues](https://gitlab.freedesktop.org/libbsd/libbsd/issues).
+Historic bugs can be accessed from
+[Bugzilla](https://bugs.freedesktop.org/buglist.cgi?query_format=specific&bug_status=__closed__&product=libbsd)
+but filing new bugs there has been disabled.
 
 ### Security issues
 
@@ -58,10 +61,12 @@ In case of a security issue that needs to be reported privately, please
 send encrypted mail to [Guillem Jover](https://www.hadrons.org/~guillem/),
 the current maintainer.
 
-## Contributing
+### Contributing
 
-Changes can be sent either as patches to the mailing list, or as
-[merge requests](https://gitlab.freedesktop.org/libbsd/libbsd/merge_requests).
+Changes can be sent either as
+[merge requests](https://gitlab.freedesktop.org/libbsd/libbsd/merge_requests)
+or as patches to the
+[mailing list](https://lists.freedesktop.org/mailman/listinfo/libbsd).
 
 New interfaces can be added, depending on their portability, and on their
 presence on at least one of the BSDs. The preferred form is by importing the