merge emacs-24
merge emacs-24
merge emacs-24
merge emacs-24
merge emacs-24
Merge upstream Org (from commit 488eea)
Import srecode manual from CEDET trunk

Ref
http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00419.html
and preceding discussion

Imported from
bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/trunk
doc/texi/srecode.texi

bzr log shows (very) tiny changes from authors with assignments:
Alex Ott <ottalex@users.sourceforge.net>
David Engster <dengste@eml.cc>
Vincent Belaïche <vincentb1@users.sourceforge.net>

and from:
emacsman@users.sourceforge.net
scymtym@users.sourceforge.net
Add srecode manual to build process

* doc/misc/srecode.texi: Small edits.  Set copyright to FSF, add explicit
GFDL 1.3+ license, fix up index.

* doc/misc/Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add srecode.
(srecode, $(buildinfodir)/srecode$(INFO_EXT), srecode.dvi)
(srecode.pdf): New targets.

* doc/misc/makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add srecode.
($(infodir)/srecode$(INFO_EXT), srecode.dvi): New targets.

* info/dir: Add srecode.
* Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
(uninstall): Likewise.
flymake.texi fix for flymake-buildfile-dirs (bug#13148)

* doc/misc/flymake.texi (Customizable variables, Locating the buildfile):
Remove refs to flymake-buildfile-dirs, removed 2007-07-20.
Import bovine manual from CEDET trunk

Ref
http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00419.html
and preceding discussion

Imported from
bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/trunk
doc/texi/semantic/bovine.texi
Add bovine manual to build process

* doc/misc/bovine.texi: Small edits.  Set copyright to FSF, update license to
GFDL 1.3+, remove empty index.

* doc/misc/Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add bovine.
(bovine, $(buildinfodir)/bovine$(INFO_EXT), bovine.dvi, bovine.pdf):
New targets.

* doc/misc/makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add bovine.
($(infodir)/bovine$(INFO_EXT), bovine.dvi): New targets.

* info/dir: Add bovine.
Import wisent manual from CEDET trunk

Ref
http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00419.html
and preceding discussion

Imported from
bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/trunk
doc/texi/semantic/wisent.texi

bzr log shows (very) tiny change from authors with assignments:
David Engster <dengste@eml.cc>

and from:
emacsman@users.sourceforge.net
Add wisent manual to build process

* doc/misc/wisent.texi: Small edits.  Set copyright to FSF, update license to
GFDL 1.3+.

* doc/misc/Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add wisent.
(wisent, $(buildinfodir)/wisent$(INFO_EXT), wisent.dvi, wisent.pdf):
New targets.

* doc/misc/makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add wisent.
($(infodir)/wisent$(INFO_EXT), wisent.dvi): New targets.

* info/dir: wisent.
Fix typos in documentation.  (Sync with Org maint commit 82db0a.)

Also fix bzg@gnu.org email address in the ChangeLog.
merge emacs-24
Fix bug #12621 with crashes on MS-Windows in LookupAccountSid.

 src/w32.c (get_name_and_id): Always pass NULL as the first argument
 of lookup_account_sid.  Avoids crashes with UNC file names that
 refer to DFS domains, not to specific machine names.  (Bug#12621)
 Remove now unused argument FNAME; all callers changed.
 (get_file_owner_and_group): Remove now unused argument FNAME; all
 callers changed.
merge emacs-24
Include GFDL in org.texi

* org.texi (copying): Include a copy of the GFDL.
The old text said that it contained one (which was untrue), and
that one should be added if the manual was distributed separately,
which was logically inconsistent.
(GNU Free Documentation License): New section.
org.texi: Don't suggest to buy copies of the Org manual from the FSF

The FSF does not sell copies of the Org manual.  Suggesting that you
can buy copies of the Org manual to support the FSF is misleading.