Merge branch 'master' of vampire:~mdw/etc/profile

* 'master' of vampire:~mdw/etc/profile:
  dot/bash*: Reformat.
  mc: Store configuration and arrange for linkage.

diff --git a/mdw.conf b/mdw.conf
index 9c78fbf76f99faad4b775fda6036b584f4e2f7b7..ec63e827b9b8bfc329906193dd78f6894d3505e4 100644 (file)
--- a/mdw.conf
+++ b/mdw.conf
@@ -3,11 +3,11 @@
 email = mdw@distorted.org.uk
 mailbox = ~/Mailbox
 rootly = become -g0 root
-http-proxy = metalzone.distorted.org.uk:3128
-nntp-server = metalzone.distorted.org.uk
+http-proxy = www-cache.distorted.org.uk:3128
+nntp-server = www-cache.distorted.org.uk
 cvs-root = metalzone.distorted.org.uk:/home/cvs/cvs
 svn-root = svn+ssh://metalzone.distorted.org.uk/home/cvs/svn
-cltl-url = http://metalzone.distorted.org.uk/doc/cltl/
-hyperspec-url = http://metalzone.distorted.org.uk/doc/hyperspec/
+cltl-url = http://www.distorted.org.uk/doc/cltl/
+hyperspec-url = http://www.distorted.org.uk/doc/hyperspec/
 console-ctype = en_GB.iso885915
 x-ctype = en_GB.utf8

diff --git a/setup b/setup
index 79f452df967bae9e5cef0c347d2d6933a08f73d4..6e1cfed8f38f76c82c28d6cb35bfcc670e2abbca 100755 (executable)
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/ftp/pub/mdw/profile}
+: ${REPO=http://ftp.distorted.org.uk/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin