mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 01:40:47 +00:00
Merge branch 'master' of git+ssh://cegli@repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
b9c5c1a1ad
|
@ -63,22 +63,26 @@ http://repo.or.cz/w/org-mode.git
|
||||||
these seem to be out of date.
|
these seem to be out of date.
|
||||||
|
|
||||||
* Documentation
|
* Documentation
|
||||||
** Manual and Reference card
|
** The Org manual
|
||||||
- Read the documentation [[file:manual/index.html][online]]. This is a version consisting of many
|
- Read the documentation [[file:manual/index.html][online]]. This is a version consisting of many
|
||||||
small files, to save bandwidth. If you really need it, you can also
|
small files, to save bandwidth.
|
||||||
have the entire manual in a [[file:org.html][single monolithic file]].
|
- If you really need it, you can also have the entire manual in a
|
||||||
|
[[file:org.html][single monolithic file]].
|
||||||
- Download the documentation in other formats: [[file:org.pdf][PDF]], [[file:org][Info]], or [[file:org.texi][TeXInfo]].
|
- Download the documentation in other formats: [[file:org.pdf][PDF]], [[file:org][Info]], or [[file:org.texi][TeXInfo]].
|
||||||
- Download the [[file:orgcard.pdf][Refcard]] for org-mode, and Kyle Sherman hast created a
|
|
||||||
[[file:orgcard.txt][text version]] of the reference card
|
|
||||||
- There is also a [[http://hpcgi1.nifty.com/spen/index.cgi?OrgMode%2fManual][Japanese translation]] of the manual (version 4.60),
|
- There is also a [[http://hpcgi1.nifty.com/spen/index.cgi?OrgMode%2fManual][Japanese translation]] of the manual (version 4.60),
|
||||||
produced by Takeshi Okano.
|
produced by Takeshi Okano.
|
||||||
- The [[http://orgmode.org/worg/org-faq.php][Org Mode FAQ]] is
|
|
||||||
maintained by the Worg project.
|
|
||||||
- The Org manual is a GNU Manual released under the GFDL. If you
|
- The Org manual is a GNU Manual released under the GFDL. If you
|
||||||
want to redistribute Org with a distribution that does not allow
|
want to redistribute Org with a distribution that does not allow
|
||||||
the GFDL to be used, and if you see no other way to resolve this
|
the GFDL to be used, and if you see no other way to resolve this
|
||||||
licensing conflict, you must use the special [[file:org_dual_license.texi][dual-license version]]
|
licensing conflict, you must use the special [[file:org_dual_license.texi][dual-license version]]
|
||||||
of the manual.
|
of the manual.
|
||||||
|
** Reference card
|
||||||
|
- Download the [[file:orgcard.pdf][Refcard]] for org-mode
|
||||||
|
- Kyle Sherman has created a [[file:orgcard.txt][text version]] of the reference card
|
||||||
|
(Org version 4.79).
|
||||||
|
** The FAQ
|
||||||
|
- The [[http://orgmode.org/worg/org-faq.php][Org Mode FAQ]] is user-editable and is maintained by the [[http://orgmode.org/worg/][Worg
|
||||||
|
project]].
|
||||||
|
|
||||||
* Links
|
* Links
|
||||||
|
|
||||||
|
@ -121,11 +125,7 @@ contribute your own setup, screenshots, tutorials etc, please go to
|
||||||
In November 2007, Charles Cave organized a survey among Org-mode
|
In November 2007, Charles Cave organized a survey among Org-mode
|
||||||
users. The answers given in this survey can be found [[file:survey.html][here]].
|
users. The answers given in this survey can be found [[file:survey.html][here]].
|
||||||
|
|
||||||
** Org-mode, GTD and other task management systems
|
** GTD & Co
|
||||||
Org-mode is flexible enough to implement many different ways of
|
|
||||||
organizing your projects. For links and pointers in this area,
|
|
||||||
see the [[http://orgmode.org/worg/org-gtd-etc.php][Worg page dedicated to task management systems]].
|
|
||||||
|
|
||||||
** Contributing to Org-mode
|
** Contributing to Org-mode
|
||||||
|
|
||||||
You can always contribute with ideas and bug reports on the mailing
|
You can always contribute with ideas and bug reports on the mailing
|
||||||
|
@ -150,9 +150,13 @@ contribute your own setup, screenshots, tutorials etc, please go to
|
||||||
|
|
||||||
** Related Software
|
** Related Software
|
||||||
|
|
||||||
|
[[http://www.emacswiki.org/cgi-bin/wiki][The Emacs Wiki]] has extensive lists of related software in the
|
||||||
Make an interesting list here!!!!
|
categories
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/emacs-en/CategoryOutline][Outline]]
|
||||||
[[http://sachachua.com/wp/][Sacha Chua]] about [[http://sachachua.com/wp/2007/12/26/emacs-choosing-between-org-and-planner/][Choosing between Planner and Org]].
|
- [[http://www.emacswiki.org/cgi-bin/wiki/CategoryHypermedia][Hypermedia]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/wiki/CategoryTables][Tables]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/emacs-en/CategoryPersonalInformationManager][Personal Information Manager]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/emacs-en/CategoryCalendar][Calendar]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/wiki/CategoryTodo][Todo]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/wiki/CategoryTimeTracking][Time tracking]]
|
||||||
|
- [[http://www.emacswiki.org/cgi-bin/wiki/CategoryJournaling][Journaling]]
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
#+EMAIL: charles.cave@gmail.com
|
#+EMAIL: charles.cave@gmail.com
|
||||||
#+LANGUAGE: en
|
#+LANGUAGE: en
|
||||||
#+OPTIONS: H:3 num:nil toc:1 \n:nil @:t ::t |:t ^:t -:t f:t *:t TeX:t LaTeX:nil skip:t d:nil tags:not-in-toc
|
#+OPTIONS: H:3 num:nil toc:1 \n:nil @:t ::t |:t ^:t -:t f:t *:t TeX:t LaTeX:nil skip:t d:nil tags:not-in-toc
|
||||||
|
#+INFOJS_OPT: view:info toc:1 path:org-info.js tdepth:1 ftoc:t
|
||||||
|
#+LINK_UP: index.html
|
||||||
|
#+LINK_HOME: http://orgmode.org
|
||||||
|
|
||||||
* Survey introduction
|
* Survey introduction
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
-*- mode:org -*-
|
# -*- mode:org -*-
|
||||||
|
|
||||||
#+STARTUP: align
|
#+STARTUP: align
|
||||||
#+TYP_TODO: TODO IDEA WISH QUESTION INCONSISTENCY BUG | DONE DECLINED
|
#+TYP_TODO: TODO IDEA WISH QUESTION INCONSISTENCY BUG | DONE DECLINED
|
||||||
|
|
Loading…
Reference in a new issue