tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity
12,943 Commits 5 Branches 424 Tags 196 MiB
Commit Graph

77 Commits

Author SHA1 Message Date
Bastien Guerry e102289e08 orgguide.texi (Capture, Capture templates, Archiving): Remove references to org-remember.el 
* orgguide.texi (Capture, Capture templates, Archiving):
Remove references to org-remember.el.
 2013-02-22 11:53:07 +01:00
Bastien Guerry 006bbe6e62 orgguide.texi: Small updates 
* orgguide.texi (@LaTeX{} and PDF export): Fix option's name.
Update maintainer contact information.
 2013-02-15 19:52:23 +01:00
Bastien Guerry a77d3f0bcd Merge branch 'maint' 2013-02-09 11:51:56 +01:00
Gregory Benjamin 57b893a4db Fix typos in orgguide.texi. 2013-02-09 11:51:27 +01:00
Bastien Guerry 6c3ef62266 Merge branch 'maint' 
Conflicts:
	doc/orgguide.texi
 2013-01-08 12:11:08 +01:00
Bastien Guerry 2d81219147 doc/orgguide.texi: Update menu 2013-01-08 12:09:39 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint' 
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
 2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years. 
Happy new year!
 2013-01-01 16:04:24 +01:00
Bastien Guerry b6eede54b2 Merge branch 'maint' 2012-12-23 00:34:42 +01:00
Bastien Guerry 6b9d77eb8c orgguide.texi (Multi-state workflows, Agenda commands): Fix missing dashes 
* orgguide.texi (Multi-state workflows, Agenda commands): Fix
missing dashes.
 2012-12-22 23:30:59 +01:00
Bastien Guerry 6e1521f13b org.texi and orgguide.texi: Hyphen and dash fixes. 
See revno 111060 by Paul Eggert from the emacs-24 bzr branch.
 2012-12-22 21:30:27 +01:00
Bastien Guerry beea46fab5 Merge branch 'maint' 2012-12-15 06:39:42 +01:00
Bastien Guerry 0b44eb6961 Add doclicense.texi to include the GNU FDL license and fix the copyright notice. 
The GNU FDLv1.3 is now included in both the manual and the guide.
The Back-Cover Texts does not mention that you can buy copies from
the FSF as this is not true.
 2012-12-15 06:39:33 +01:00
Bastien Guerry 2dbd84ecaa Merge branch 'maint' 2012-12-14 11:48:08 +01:00
Bastien Guerry 6f5b4a8b73 orgguide.texi: Fix the copyright notice. 
See http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=cd2496
for explanations on the same change for org.texi.
 2012-12-14 11:48:02 +01:00
Bastien Guerry 4f0b3bfe0c Merge branch 'maint' 2012-10-02 13:07:09 +02:00
Bastien Guerry c7d6970864 Fix manuals: don't mention (require 'org-install) anymore. 
* org.texi (Installation): Don't mention org-install.el
anymore as the replacement file org-loaddefs.el is now loaded
by org.el.

* orgguide.texi (Installation): Ditto.
 2012-10-02 12:17:30 +02:00
Bastien Guerry f155f5458e Merge branch 'maint' 2012-09-29 08:28:34 +02:00
Bastien Guerry 8e15063364 Small fixes to the guide and the manual 
* org.texi (Installation, Feedback, Batch execution):
Use (add-to-list 'load-path ... t) for the contrib dir.

* orgguide.texi (Activation): No need to add org-mode to
auto-mode-alist since Emacs 22.2.
 2012-09-29 07:27:51 +02:00
Bastien Guerry a65b5bd36c New command `org-copy' to copy a subtree/region 
* org.el (org-refile-keep): New variable.
(org-copy): New command to copy notes.
(org-refile): New parameter msg to override the "Refile"
string in the default prompt.
(org-mode-map): Bind "C-c M-w" to `org-copy'.

* org.texi (Refile and copy): Document the new command `org-copy'.

* orgguide.texi (Refile and copy): Ditto.

Thanks to Kalev Takkis who triggered this change.
 2012-09-23 11:42:41 +02:00
Bastien Guerry 79ac009b58 Update the manual wrt comments. 
* org.texi (Comment lines): Update wrt comments.

* orgguide.texi (Comment lines): Update wrt comments.
 2012-08-01 14:35:13 +02:00
Achim Gratz a0a344bff1 inject version strings into orgguide 
* doc/orgguide.texi: Include version strings from "org-version.inc".

* doc/Makefile: Make "org-version.inc" a dependency of "guide".
 2012-05-18 07:45:46 +02:00
Bastien Guerry 9212ff07de Merge branch 'maint' 
Conflicts:
	doc/org.texi
	lisp/org.el
 2012-05-16 19:21:33 +02:00
Bastien Guerry 429e6aafa6 Bump to version 7.8.10. 2012-05-16 19:20:07 +02:00
Brian van den Broek 8f3dc945b2 Change example timestamps to not occur in headlines. 
* org.texi: Alter several examples of headings with timestamps
in them to include the timestamps in the body instead of the heading.

* orgguide.texi: Alter the same examples in the same way as for
org.texi.

The Org-mode manual explicitly discourages the inclusion of timestamps
in headlines, yet examples do just that. These changes make the manual
consistent with its own advice.

TINYCHANGE
 2012-04-21 00:43:24 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry c187c512af Merge branch 'hotfix-7.8.06' 2012-04-02 17:58:01 +02:00
Bastien Guerry 60b6f60dfe Bump to version number 7.8.08. 2012-04-02 17:57:49 +02:00
Bastien Guerry 61106491b3 Merge branch 'hotfix-7.8.06' 2012-03-31 11:25:28 +02:00
Bastien Guerry a3ca0e43e5 Update version to 7.8.07 from hotfix. 2012-03-31 11:24:57 +02:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry ecd0562c5f Fix the master branch. 
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
 2012-03-19 22:01:29 +01:00
Bastien Guerry 218e8e444a Update version 7.8.05 2012-03-17 16:41:44 +01:00
Bastien Guerry 560624fcc7 Set version 7.8.04 in maint. 2012-03-17 16:32:53 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080. 
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
 2012-03-17 16:28:46 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080. 
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
 2012-03-17 14:34:01 +01:00
Bastien Guerry d254b05500 Revert "Release 7.8.04" 
This reverts commit 78ec8e21b8.
 2012-03-17 14:24:27 +01:00
Bastien Guerry 78ec8e21b8 Release 7.8.04 2012-03-16 19:04:04 +00:00
Carsten Dominik 58479692be Modify the doc to give better appreciation for MobileOrg Android 
* doc/org.texi (MobileOrg): Change the wording to reflect that the
Android Version is no longer just the little brother of the iOS version.
* doc/orgguide.texi (MobileOrg): Change the wording to reflect that the
Android Version is no longer just the little brother of the iOS version.
 2012-02-08 06:22:22 +00:00
Bastien Guerry 8a7799473c orgguide.texi: Fix small typo. 
Thanks to Guido Arnold for spotting this.
 2012-01-23 16:14:34 +01:00
Bastien Guerry 53eb6088a2 orgguide.texi: Use uppercase for env/options keywords. 
Also rename #+srcname to #+NAME.
 2012-01-11 16:31:58 +01:00
Bastien Guerry 6a6274706f Fix copyright in orgguide.texi. 2012-01-05 11:25:57 +01:00
Bastien Guerry e44d2975ff Fix copyright (to 2012) year and Org version (to 7.8.03). 2012-01-03 18:47:01 +01:00
Bastien Guerry 2a6c549ecb Normalize the use of @LaTeX{} in the Org compact guide. 2011-12-25 09:42:08 +01:00
Bastien Guerry 490d6ace10 Update website to show 7.8.02 as current release 2011-12-13 00:34:34 +00:00
Bastien Guerry 4ecf626ee7 Update website to show 7.8.01 as current release 2011-12-12 23:24:11 +00:00
Bastien Guerry f30ade0151 Update website to show 7.8 as current release 2011-12-12 17:08:28 +00:00
Bastien Guerry 3e4e91322d Remove arch-tag at the bottom of documentation files. 2011-08-15 20:04:55 +02:00