Rename UTILITIES/ to utils/

.gitignore

@@ -63,7 +63,7 @@ TODO
 .DS_Store
 *#
 .#*
-/UTILITIES/x11idle
+/utils/x11idle
 
 #
 # Local variables:

README_maintainer

@@ -19,7 +19,7 @@ accepting it.
 I have found that the best workflow for this is using the pw script by
 Nate Case, with the modifications for Org-mode made by John Wiegley
 and Carsten Dominik.  The correct version of this script that should
-be used with Org mode is distributed in the UTILITIES directory of the
+be used with Org mode is distributed in the =utils/= directory of the
 Org mode distribution.  Here is the basic workflow for this.
 
 ** Access to the patchwork server
@@ -156,7 +156,7 @@ org-version= will spit ut complete version infor related to git, with
 the nearest commit and tag.  I you ever need to set a special version
 number, use this:
 
-: UTILITIES/set_version 7.02trans
+: utils/set_version 7.02trans
 
 and commit the result.  Note that the above command does not change
 the version string in the file from which Org's homepage is generated.
@@ -213,7 +213,7 @@ So the way I have been doing things with Emacs is this:
 
    For this, I do in the org-mode git repository
 
-   : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02
+   : utils/make_emacs_changelog release_7.02.05..release_7.03.02
 
    This will spit out ChangeLog entries (for the given commit range)
    that need to go into the ChangeLog files in Emacs.  Org-mode
@@ -236,7 +236,7 @@ So the way I have been doing things with Emacs is this:
    second and third command line arguments to =make_emacs_changelog=,
    for example
 
-   : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02 2010-12-11 lisp
+   : utils/make_emacs_changelog release_7.02.05..release_7.03.02 2010-12-11 lisp
 
    These entries need to be added to the ChangeLog files in Emacs.
    You should, in the ChangeLog file, select the inserted region of
@@ -253,7 +253,7 @@ So the way I have been doing things with Emacs is this:
 
   The file /org-configs/org-hooks.org/ contains a list of all hooks in
   Org.  This list has to be updated after hooks have been added or
-  removed.  The perl script /UTILITIES/list-hooks.pl/ creates the
+  removed.  The perl script /utils/list-hooks.pl/ creates the
   entire section "Hooks and Function variables", including its
   level-one headline.  I guess babel code could be used to update this
   automatically, but I have not implemented this - I have been doing

default.mk

@@ -71,7 +71,7 @@ BATCH	= $(EMACS) -batch -Q
 MAKE_LOCAL_MK = $(BATCH) \
 	  --eval '(add-to-list '"'"'load-path "./lisp")' \
 	  --eval '(load "org-compat.el")' \
-	  --eval '(load "../UTILITIES/org-fixup.el")' \
+	  --eval '(load "../utils/org-fixup.el")' \
 	  --eval '(org-make-local-mk)'
 
 # Emacs must be started in lisp directory
@@ -81,13 +81,13 @@ BATCHL	= $(BATCH) \
 # How to generate org-install.el
 MAKE_ORG_INSTALL = $(BATCHL) \
 	  --eval '(load "org-compat.el")' \
-	  --eval '(load "../UTILITIES/org-fixup.el")' \
+	  --eval '(load "../utils/org-fixup.el")' \
 	  --eval '(org-make-org-install)'
 
 # How to generate org-version.el
 MAKE_ORG_VERSION = $(BATCHL) \
 	  --eval '(load "org-compat.el")' \
-	  --eval '(load "../UTILITIES/org-fixup.el")' \
+	  --eval '(load "../utils/org-fixup.el")' \
 	  --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)" "$(datadir)")'
 
 # How to byte-compile the whole source directory

doc/Makefile

@@ -20,10 +20,10 @@ manual guide::
 	$(MKDIR) $@
 manual::	org.texi org-version.inc
 	$(TEXI2HTML) -o $@ $<
-	../UTILITIES/mansplit.pl $@/*
+	../utils/mansplit.pl $@/*
 guide::		orgguide.texi org-version.inc
 	$(TEXI2HTML) -o $@ $<
-	../UTILITIES/guidesplit.pl $@/*
+	../utils/guidesplit.pl $@/*
 
 org-version.inc:	org.texi
 	@echo "org-version: $(ORGVERSION) ($(GITVERSION))"
@@ -61,14 +61,14 @@ clean-install:
 
 %.html:		%.texi org-version.inc
 	$(TEXI2HTML) --no-split -o $@ $<
-	../UTILITIES/manfull.pl $@
+	../utils/manfull.pl $@
 
 %.txt:		%.tex
-	perl ../UTILITIES/orgcard2txt.pl $< > $@
+	perl ../utils/orgcard2txt.pl $< > $@
 
 %_letter.tex:	%.tex
 	$(BATCH) \
 	  --eval '(add-to-list '"'"'load-path "../lisp")' \
 	  --eval '(load "org-compat.el")' \
-	  --eval '(load "../UTILITIES/org-fixup.el")' \
+	  --eval '(load "../utils/org-fixup.el")' \
 	  --eval '(org-make-letterformat "$(<F)" "$(@F)")'

doc/org.texi

@@ -6276,7 +6276,7 @@ as 10 or 15, Emacs can alert you when you get back to your computer after
 being idle for that many minutes@footnote{On computers using Mac OS X,
 idleness is based on actual user idleness, not just Emacs' idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
-UTILITIES directory of the Org git distribution, to get the same general
+@code{utils} directory of the Org git distribution, to get the same general
 treatment of idleness.  On other systems, idle time refers to Emacs idle time
 only.}, and ask what you want to do with the idle time.  There will be a
 question waiting for you when you get back, indicating how much idle time has

lisp/org-compat.el

@@ -446,7 +446,7 @@ With two arguments, return floor and remainder of their quotient."
   "Try very hard to provide sensible version strings."
   (let* ((org-dir        (org-find-library-dir "org"))
 	 (org-version.el (concat org-dir "org-version.el"))
-	 (org-fixup.el   (concat org-dir "../UTILITIES/org-fixup.el")))
+	 (org-fixup.el   (concat org-dir "../utils/org-fixup.el")))
     (if (require 'org-version org-version.el 'noerror)
 	'(progn
 	   (autoload 'org-release     "org-version.el")

targets.mk

@@ -5,7 +5,7 @@ DISTFILES_extra=  Makefile request-assign-future.txt contrib etc
 
 LISPDIRS      = lisp
 OTHERDIRS     = doc etc
-CLEANDIRS     = contrib testing UTILITIES
+CLEANDIRS     = contrib testing utils
 SUBDIRS       = $(OTHERDIRS) $(LISPDIRS)
 INSTSUB       = $(SUBDIRS:%=install-%)
 ORG_MAKE_DOC ?= info html pdf
@@ -146,7 +146,7 @@ cleanaddcontrib:
 	$(RM) $(ORG_TO_LISP)
 endif
 
-cleanutils:	cleanUTILITIES
+cleanutils:	cleanutils
 
 cleanelc:
 	$(MAKE) -C lisp $@

UTILITIES/make_emacs_changelog → utils/make_emacs_changelog

@@ -66,7 +66,7 @@ foreach my $commit (@commits) {
     
     # remove stuff which is not for this output
     if ($kind =~ /\S/) { 
-      remove_parts("contrib/","testing/","xemacs/","UTILITIES/","etc/");
+      remove_parts("contrib/","testing/","xemacs/","utils/","etc/");
       remove_parts(".*Makefile","README",".+\.mk");
     }
     if ($kind eq "lisp") { remove_parts("doc/")                               }