procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge emacs-23

Browse source
This commit is contained in:
Kenichi Handa 2010-10-08 11:23:11 +09:00
commit cee3168b9d
3 changed files with 26 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/misc/ChangeLog
View file

@ -1,3 +1,11 @@
2010-10-07 Glenn Morris <rgm@gnu.org>
* eudc.texi (CCSO PH/QI, LDAP Requirements): Remove old information.
2010-10-06 Glenn Morris <rgm@gnu.org>
* cl.texi (Usage, Installation): Remove outdated information.
2010-08-26 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.1.19.

42
doc/misc/cl.texi
View file

@ -163,19 +163,6 @@ include at the beginning:
@end example
@noindent
If you want to ensure that the new (Gillespie) version of @dfn{CL}
is the one that is present, add an additional @code{(require 'cl-19)}
call:
@example
(require 'cl)
(require 'cl-19)
@end example
@noindent
The second call will fail (with ``@file{cl-19.el} not found'') if
the old @file{cl.el} package was in use.
It is safe to arrange to load @dfn{CL} at all times, e.g.,
in your @file{.emacs} file. But it's a good idea, for portability,
to @code{(require 'cl)} in your code even if you do this.
@ -229,29 +216,14 @@ multiple-values feature. @xref{Old CL Compatibility}.
@section Installation
@noindent
Installation of the @dfn{CL} package is simple: Just put the
byte-compiled files @file{cl.elc}, @file{cl-extra.elc},
@file{cl-seq.elc}, @file{cl-macs.elc}, and @file{cl-compat.elc}
into a directory on your @code{load-path}.
The @dfn{CL} package is distributed with Emacs, so there is no need
to install anything.
There are no special requirements to compile this package:
The files do not have to be loaded before they are compiled,
nor do they need to be compiled in any particular order.
You may choose to put the files into your main @file{lisp/}
directory, replacing the original @file{cl.el} file there. Or,
you could put them into a directory that comes before @file{lisp/}
on your @code{load-path} so that the old @file{cl.el} is
effectively hidden.
Also, format the @file{cl.texinfo} file and put the resulting
Info files in the @file{info/} directory or another suitable place.
You may instead wish to leave this package's components all in
their own directory, and then add this directory to your
@code{load-path} and @code{Info-directory-list}.
Add the directory to the front of the list so the old @dfn{CL}
package and its documentation are hidden.
If you do need to install it, just put the byte-compiled files
@file{cl.elc}, @file{cl-extra.elc}, @file{cl-seq.elc},
@file{cl-macs.elc}, and @file{cl-compat.elc} into a directory on your
@code{load-path}. Also, format the @file{cl.texi} file and put the
resulting Info files into a directory in your @code{Info-directory-list}.
@node Naming Conventions, , Installation, Overview
@section Naming Conventions

36
doc/misc/eudc.texi
View file

@ -137,7 +137,7 @@ complement to the DAP itself.
LDAP servers usually store (but are not limited to) information about
people such as their name, phone number, email address, office
location, etc@enddots{} More information about LDAP can be found at
@url{http://www.openldap.org/}
@url{http://www.openldap.org/}.
EUDC requires external support to access LDAP directory servers
(@pxref{LDAP Requirements})
@ -148,17 +148,15 @@ EUDC requires external support to access LDAP directory servers
@section CCSO PH/QI
The Central Computing Services Office (CCSO) of the University of
Illinois at Urbana Champaign (UIUC) created and freely distributes a
directory system that is currently in use in more than 300 organizations
around the world. The system records information about people such as
their address, phone number, email, academic information or any other
details it was configured to.
Illinois at Urbana Champaign created and freely distributed a
directory system that was used by many organizations in the 1990s.
The system records information about people such as their address,
phone number, email, academic information or any other details it was
configured to. Nowadays this system is not widely used.
The system consists of two parts: a database server traditionally called
@samp{qi} and a command-line client called @samp{ph}.
@url{ftp://uiarchive.cso.uiuc.edu/pub/packages/ph} is the main
distribution site. @url{http://www.uiuc.edu/cgi-bin/ph/lookup?Query=.}
provides a listing of the active @samp{qi} servers.
@samp{qi} and a command-line client called @samp{ph}. As of 2010, the
code can still be downloaded from @url{http://www-dev.cites.uiuc.edu/ph/}.
The original command-line @samp{ph} client that comes with the
@samp{ph/qi} distribution provides additional features like the
@ -225,18 +223,10 @@ email composition buffers (@pxref{Inline Query Expansion})
@comment node-name, next, previous, up
@section LDAP Requirements
LDAP support is added by means of @file{ldap.el} which is part of Emacs.
LDAP support is added by means of @file{ldap.el}, which is part of Emacs.
@file{ldap.el} needs an external command line utility named
@file{ldapsearch} which is available as part of LDAP toolkits:
@itemize @bullet
@item
Open LDAP Libraries
(@url{http://www.openldap.org/})
@item
University of Michigan's LDAP Client software
(@url{http://www.umich.edu/~dirsvcs/ldap/})
@end itemize
@file{ldapsearch}, available as part of Open LDAP
(@url{http://www.openldap.org/}).
@node Usage, Credits, Installation, Top
@ -968,7 +958,3 @@ in testing and proofreading the code and docs of @file{ph.el}.
@printindex vr
@bye
@ignore
arch-tag: 1b79460b-4ea1-441d-ab45-05ddd16ef241
@end ignore