[Emacs-diffs] /srv/bzr/emacs/trunk r110676: Fix overwritten typos and Org version number.

[Bastien Guerry]

------------------------------------------------------------
revno: 110676
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-26 17:27:29 +0200
message:
  Fix overwritten typos and Org version number.
modified:
  doc/misc/org.texi
  lisp/org/org-version.el

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-10-26 14:42:05 +0000
+++ b/doc/misc/org.texi 2012-10-26 15:27:29 +0000
@@ -947,7 +947,7 @@
 Installing Info files is system dependent, because of differences in the
 @file{install-info} program.  The Info documentation is installed together
 with the rest of Org mode.  If you don't install Org mode, it is possible to
-install the Info documentation seperately (you need to have
+install the Info documentation separately (you need to have
 address@hidden output from install-info (if any) is system
 dependent.  In particular Debian and its derivatives use two different
 versions of install-info and you may see the message:
@@ -16693,7 +16693,7 @@
 opened the doors for many new ideas and features.
 
 @item Jambunathan K
-Jambunathan contributed the ODT exporter, definitly a killer feature of
+Jambunathan contributed the ODT exporter, definitely a killer feature of
 Org mode.  He also contributed the new HTML exporter, which is another core
 feature of Org.  Here too, I knew I could rely on him to fix bugs in these
 areas and to patiently explain the users what was the problems and solutions.
@@ -16701,7 +16701,7 @@
 @item Achim Gratz
 Achim rewrote the building process of Org, turning some @emph{ad hoc} tools
 into a flexible and conceptually clean process.  He patiently coped with the
-many hicups that such a change can create for users.
+many hiccups that such a change can create for users.
 
 @item Nick Dokos
 The Org mode mailing list would not be such a nice place without Nick, who

=== modified file 'lisp/org/org-version.el'
--- a/lisp/org/org-version.el   2012-10-26 14:42:05 +0000
+++ b/lisp/org/org-version.el   2012-10-26 15:27:29 +0000
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-release "7.9.2"))
+   (let ((org-release "7.9.2+"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "release_7.9.2-68-g7a9d34"))
+   (let ((org-git-version "7.9.2+-GNU-Emacs-24-3"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"