aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGlenn Morris2013-05-08 19:44:12 -0700
committerGlenn Morris2013-05-08 19:44:12 -0700
commit2d809ffafd3e1bde360c08f3be4b7d9a43ff5f0e (patch)
treeab0dbc4327f2dd4e6f8675e3f41cd2981b348c5b /etc
parent56cd351d2b3fc858ce6cf82a68a99d2c2e24d157 (diff)
parentb01682fbbe6b48fe34cb3d26932fd03e4b0669e5 (diff)
downloademacs-2d809ffafd3e1bde360c08f3be4b7d9a43ff5f0e.tar.gz
emacs-2d809ffafd3e1bde360c08f3be4b7d9a43ff5f0e.zip
Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org
Diffstat (limited to 'etc')
-rw-r--r--etc/MORE.STUFF3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 671d8a06755..aeefe031359 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -41,6 +41,9 @@ a web search is often the best way to find results.
41 The Emacs Wiki has an area for storing elisp files 41 The Emacs Wiki has an area for storing elisp files
42 <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>. 42 <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
43 43
44* WikEmacs
45 <URL:http://wikemacs.org> is an alternative wiki for Emacs.
46
44* Emacs slides and tutorials can be found here: 47* Emacs slides and tutorials can be found here:
45 <URL:http://web.psung.name/emacs/> 48 <URL:http://web.psung.name/emacs/>
46 49