Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-01-14 17:46:49 +01:00
commit 34d1ec4290
1 changed files with 4 additions and 4 deletions

8
README
View File

@ -1,11 +1,11 @@
The is a distribution of Org, a plain text notes and project planning This is a distribution of Org, a plain text notes and project planning
tool for Emacs. tool for Emacs.
The homepage of Org is at: The homepage of Org is at:
http://orgmode.org https://orgmode.org
The installations instructions are at: The installations instructions are at:
http://orgmode.org/org.html#Installation https://orgmode.org/org.html#Installation
This distribution contains: This distribution contains:
@ -18,7 +18,7 @@ COPYING
Makefile Makefile
The makefile to compile and install Org. For installation The makefile to compile and install Org. For installation
instructions, see the manual or the more detailed procedure instructions, see the manual or the more detailed procedure
on Worg: http://orgmode.org/worg/dev/org-build-system.html on Worg: https://orgmode.org/worg/dev/org-build-system.html
mk/ mk/
Files needed for building Org. Files needed for building Org.