summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-16 19:45:13 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-16 19:45:13 -0800
commit90a95d3f6a661b76b0768b454c00468eb65e47fc (patch)
treeaf6123e9a392a54d58a75fbe84039e67ab4e6b3f
parent9644bfe7f56eb8c1cc795b724a6fc95ae4172d43 (diff)
Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am2
-rw-r--r--README.md (renamed from README)20
2 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 5fbc484..874e0f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,3 +59,5 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = README.md
diff --git a/README b/README.md
index b55ce10..cbdc6c3 100644
--- a/README
+++ b/README.md
@@ -8,7 +8,7 @@ string to the user's X Resources file.
For more information on editres usage, see:
- http://www.rahul.net/kenton/editres.html
+ http://www.rahul.net/kenton/editres.html
Editres depends on the _EresInsert<something> and
_EresRetrieve<something> routines that are are implemented and used by
@@ -18,28 +18,20 @@ module, but if you have not included that module into your library you
will need to edit the makefile to make sure that editres links in this
file.
- ------------------------------------------------------------
+ ------------------------------------------------------------
All questions regarding this software should be directed at the
Xorg mailing list:
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ https://lists.x.org/mailman/listinfo/xorg
The master development code repository can be found at:
- git://anongit.freedesktop.org/git/xorg/app/editres
+ https://gitlab.freedesktop.org/xorg/app/editres
- http://cgit.freedesktop.org/xorg/app/editres
+Please submit bug reports and requests to merge patches there.
For patch submission instructions, see:
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches