diff README @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents 0ef278ff2894
children 10dd81a27d91
line wrap: on
line diff
--- a/README	Wed Apr 23 22:22:37 2014 +0100
+++ b/README	Thu Feb 05 17:19:05 2015 +0000
@@ -1,15 +1,15 @@
-This directory tree holds version 21.5 of XEmacs.
-
-The information in this file has been superseded by the XEmacs FAQ.
-
-The easiest way to read the FAQ is to go to
-
-http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html
-
-You can also the local copy of the FAQ inside XEmacs by using
-use Help->XEmacs FAQ from the menu, or `C-h F'.
-
-If you don't have XEmacs running and can't access the web,
-look directly at `man/xemacs-faq.texi' or `info/xemacs-faq.info'.
-
-
+This directory tree holds version 21.5 of XEmacs.
+
+Note: new changesets should be pushed to [the "xemacs" repository](https://bitbucket.org/xemacs/xemacs), not "xemacs-beta".
+
+The information in this file has been superseded by the XEmacs FAQ.
+
+The easiest way to read the FAQ is to go to
+
+http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html
+
+You can also the local copy of the FAQ inside XEmacs by using
+use Help->XEmacs FAQ from the menu, or `C-h F'.
+
+If you don't have XEmacs running and can't access the web,
+look directly at `man/xemacs-faq.texi' or `info/xemacs-faq.info'.
\ No newline at end of file