[Erc-commit] [commit][master] Release ERC 5.3.

[mwolson]

commit abd8ce6237825e640bdea8d85c37dd831e1174da
Author: Michael W. Olson <address@hidden>
Date:   Sat Jan 26 16:39:59 2008 -0500

    Release ERC 5.3.

diff --git a/ChangeLog b/ChangeLog
index 3fb174c..23057fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-01-26  Michael Olson  <address@hidden>
+
+       * erc.el (erc-version-string): Release ERC 5.3.
+
+       * Makefile (VERSION): Update.
+       (EXTRAS): Remove erc-list.el after all, because this is mainly for
+       users of the version that comes with Emacs, and they will have
+       erc-list.el by Emacs 23.
+       (MISC): Add ChangeLog.07.
+
+       * README.extras: Mention Emacs 23.
+
+       * erc.texi (Obtaining ERC): Update extras URLs for 5.3.
+       (Development): Write instructions for git, and remove those for
+       Arch.
+       (History): Mention the switch to git.
+
 2008-01-25  Michael Olson  <address@hidden>
 
        * NEWS: Update.
diff --git a/Makefile b/Makefile
index d35c60d..72c39ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.2
+VERSION=5.3
 SNAPDIR=erc-$(VERSION)
 LASTUPLOAD = 5.1.4-4
 BUILDOPTS  =
@@ -7,17 +7,17 @@ SPECIAL = erc-auto.el
 UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
                erc-speedbar.el erc-compat.el
 
-# Files to include in the extras pack for Emacs 22
-EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-list-old.el \
-               erc-nicklist.el erc-speak.el README.extras COPYING
+# Files to include in the extras pack for Emacs 23
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list-old.el erc-nicklist.el \
+               erc-speak.el README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
 SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))
 TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
 MISC   = AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
-               ChangeLog.06 ChangeLog.05 ChangeLog.04 ChangeLog.03 \
-               ChangeLog.02 ChangeLog.01 \
+               ChangeLog.07 ChangeLog.06 ChangeLog.05 ChangeLog.04 \
+               ChangeLog.03 ChangeLog.02 ChangeLog.01 \
                servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
diff --git a/README.extras b/README.extras
index a610e46..6b6fe1c 100644
--- a/README.extras
+++ b/README.extras
@@ -7,7 +7,7 @@ About
 -----
 
 The files included here are those which could not be distributed with
-the version of ERC that comes with Emacs 22.  The reasons might include:
+the version of ERC that comes with Emacs 23.  The reasons might include:
 
  - No copyright disclaimer was completed for an author of the file.
  - Depends on files which are not distibuted with Emacs.
diff --git a/erc.el b/erc.el
index cab895c..8b289a8 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.3 (RC 1)"
+(defconst erc-version-string "Version 5.3"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/erc.texi b/erc.texi
index 8dfc0db..7013a61 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.2.
+This manual is for ERC version 5.3.
 
 Copyright @copyright{} 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
@@ -65,7 +65,7 @@ and modified without restriction.
                                   permission to redistribute ERC on
                                   certain terms; it also explains that
                                   there is no warranty.
-* GNU Free Documentation License:: The license for this documentation.
+* GNU Free Documentation License::  The license for this documentation.
 * Concept Index::               Search for terms.
 
 @detailmenu
@@ -128,8 +128,8 @@ dependency issues.  If desired, they may be found at the 
following
 locations, or from your local GNU mirror.
 
 @itemize @bullet
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.zip}
 @end itemize
 
 The rest of this chapter may be skipped if you are using the version of
@@ -162,67 +162,100 @@ Alternatively, you can download the latest release from
 Choose the development version if you want to live on the bleeding edge
 of ERC development or try out new features before release.
 
address@hidden GNU Arch
address@hidden git version control system, using
+The git version control system allows you to keep up-to-date with the
+latest changes to the development version of ERC.  It also allows you
+to contribute changes (via commits, if you are have developer access to
+the repository, or via patches, otherwise).  If you would like to
+contribute to ERC development, it is highly recommended that you use
+git.
 
-ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
-up-to-date involves the following steps.
+If you are new to git, you might find this tutorial helpful:
address@hidden://www.kernel.org/pub/software/scm/git/docs/tutorial.html}.
+
+Downloading ERC with git and staying up-to-date involves the following
+steps.
 
 @enumerate
address@hidden GNU Arch, installing
address@hidden Install arch
address@hidden Install git.
 
 @itemize @bullet
address@hidden Debian: @kbd{apt-get install tla}.
address@hidden Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
address@hidden Debian and Ubuntu: @kbd{apt-get install git-core}.
address@hidden Windows: @uref{http://git.or.cz/gitwiki/WindowsInstall}.
address@hidden Other operating systems: download, compile, and install the 
source
+from @uref{http://www.kernel.org/pub/software/scm/git/}, or find a git
+package for your operating system.
 @end itemize
 
address@hidden GNU Arch, downloading ERC
address@hidden Register the archive.
address@hidden Download the ERC development branch.
+
+If you have developer access to ERC, do:
+
address@hidden
+git clone ssh://loginname@@git.sv.gnu.org/srv/git/erc.git
address@hidden example
+
+otherwise, do:
+
 @example
-tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
+git clone git://git.sv.gnu.org/erc.git
 @end example
 
address@hidden Download the ERC source code.
+If you are behind a restrictive firewall, and do not have developer
+access, then do the following instead:
+
 @example
-# Download ERC into the @file{erc} directory.
-tla get erc@@sv.gnu.org/erc--main--0 erc
+git clone http://git.sv.gnu.org/r/erc.git
 @end example
 
 @item List upstream changes that are missing from your local copy.
 Do this whenever you want to see whether new changes have been committed
-to ERC.
+to ERC.  If you wish, you may skip this step and proceed directly to
+the ``update'' step.
 
 @example
 # Change to the source directory you are interested in.
-cd erc/
+cd erc
+
+# Fetch new changes from the repository, but don't apply them yet
+git fetch origin
 
-# Display the summary of changes
-tla missing --summary
+# Display log messages for the new changes
+git log HEAD..origin
 @end example
 
address@hidden GNU Arch, updating ERC
address@hidden Update to the latest version by replaying missing changes.
+``origin'' is git's name for the location where you originally got ERC
+from.  You can change this location at any time by editing the
address@hidden/config} file in the directory where the ERC source was
+placed.
+
address@hidden updating ERC with git
address@hidden Update to the latest version by pulling in any missing changes.
+
 @example
 cd erc
-tla update
+git pull origin
 @end example
 
+git will show how many files changed, and will provide a visual display
+for how many lines were changed in each file.
+
 @end enumerate
 
-If you are new to Arch and want to learn more about developing ERC with
-it, visit @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment} for
-full instructions.
+There are other ways to interact with the ERC repository.
 
address@hidden Development snapshots
address@hidden
address@hidden Browse git repo: @uref{http://git.sv.gnu.org/gitweb/?p=erc.git}
address@hidden Latest development snapshot: 
@uref{http://mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden Latest development snapshot (zip file): 
@uref{http://mwolson.org/static/dist/erc-latest.zip}
address@hidden itemize
 
address@hidden development snapshot
-Alternatively, the latest development snapshot may be downloaded in both
-``.tar.gz'' and ``.zip'' forms.
+The latest development snapshot can lag behind the git repo by as much
+as 20 minutes, but never more than that.
 
address@hidden @bullet
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.zip}
address@hidden itemize
+For further information on committing changes to ERC and performing
+development, please consult
address@hidden://emacswiki.org/cgi-bin/wiki/ErcDevelopment}.
 
 
 @node Installation, Getting Started, Obtaining ERC, Top
@@ -1006,6 +1039,10 @@ ERC became an official GNU project, and development 
moved to
 @uref{http://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
 our revision control system.  Our mailing list address changed as well.
 
address@hidden 2007
+
+We switched to using git for our version control system.
+
 @end itemize
 
 @node Copying, GNU Free Documentation License, History, Top