From 4928ed437ce535bc4ba0e91af9fa100ec51c9f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Mon, 11 Jul 2016 23:12:54 +0200 Subject: [PATCH 1/3] Minor formal updates of README - slight rst formatting improvements - Mac OSX -> Mac OS - punctuation --- README | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README b/README index cfa66bb9e5..da48d5d8c5 100644 --- a/README +++ b/README @@ -38,10 +38,10 @@ Packages are available for most distributions including Debian, Fedora, Ubuntu and many more. -Installation on Mac OSX and Windows ------------------------------------ -Prebuilt binary packages for Mac OSX and Windows can be found on -http://www.geany.org +Installation on Mac OS and Windows +---------------------------------- +Prebuilt binary packages for Mac OS and Windows can be found on +http://www.geany.org. Installation from sources @@ -70,7 +70,7 @@ and open the online version instead when requested. .. note:: - Building Geany from source on Mac OSX and Windows is more complicated + Building Geany from source on Mac OS and Windows is more complicated and is out of scope of this document. For more information on building instructions for these platforms, please check the wiki at http://wiki.geany.org/howtos/. @@ -94,7 +94,7 @@ Run the the following three commands:: (as root, or using sudo) % make install -For more configuration details run ``./configure --help`` +For more configuration details run ``./configure --help``. If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one of @@ -133,16 +133,17 @@ included with the source code of this program. Ideas, questions, patches and bug reports ----------------------------------------- -See http://www.geany.org/ +See http://www.geany.org/. If you add something, or fix a bug, please send a patch (in Git or ``diff -u`` format) to the mailing list or one of the authors. Also see the HACKING file. --- -2005-2016 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz -enrico(dot)troeger(at)uvena(dot)de -nick(dot)treleaven(at)btinternet(dot)com -lists(dot)ban(at)herbesfolles(dot)org -mbrush(at)codebrainz(dot)ca -frank(at)frank(dot)uvena(dot)de +---- + +| 2005-2016 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz +| enrico(dot)troeger(at)uvena(dot)de +| nick(dot)treleaven(at)btinternet(dot)com +| lists(dot)ban(at)herbesfolles(dot)org +| mbrush(at)codebrainz(dot)ca +| frank(at)frank(dot)uvena(dot)de From 88ee4983f9f590a8d61ed6ba26d969b09af1badc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Mon, 11 Jul 2016 22:35:22 +0200 Subject: [PATCH 2/3] README: Update part regarding patch submission --- README | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README b/README index da48d5d8c5..37f6a3c6a1 100644 --- a/README +++ b/README @@ -134,9 +134,8 @@ included with the source code of this program. Ideas, questions, patches and bug reports ----------------------------------------- See http://www.geany.org/. -If you add something, or fix a bug, please send a patch (in Git or -``diff -u`` format) to the mailing list or one of the authors. Also see -the HACKING file. +If you add something, or fix a bug, please create a pull request at +https://github.com/geany/geany/. Also see the HACKING file. ---- From b7f47f29328b0c5a32893674da91fc271a830cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Mon, 25 Jul 2016 01:02:59 +0200 Subject: [PATCH 3/3] Update Colomban's email address --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 37f6a3c6a1..52003a64a4 100644 --- a/README +++ b/README @@ -143,6 +143,6 @@ https://github.com/geany/geany/. Also see the HACKING file. | 2005-2016 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz | enrico(dot)troeger(at)uvena(dot)de | nick(dot)treleaven(at)btinternet(dot)com -| lists(dot)ban(at)herbesfolles(dot)org +| ban(at)herbesfolles(dot)org | mbrush(at)codebrainz(dot)ca | frank(at)frank(dot)uvena(dot)de