summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-16 22:09:24 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-16 22:09:24 -0800
commite52d06b541ff5509694e923d94c9856d8bf645d1 (patch)
tree91d1c48229270627e79b4b92265bcb869b539550
parent0e2a061b910102cfe858da1807061ace2918c527 (diff)
Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am2
-rw-r--r--README25
-rw-r--r--README.md17
3 files changed, 18 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am
index dfb21a4..376e297 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
+EXTRA_DIST += ChangeLog README.md
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
diff --git a/README b/README
deleted file mode 100644
index e27c327..0000000
--- a/README
+++ /dev/null
@@ -1,25 +0,0 @@
-xfwp proxies X11 protocol connections, such as through a firewall.
-
-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
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xfwp
-
- http://cgit.freedesktop.org/xorg/app/xfwp
-
-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
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8965be4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+xfwp proxies X11 protocol connections, such as through a firewall.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/app/xfwp
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+