Skip to content

Commit f8d4e17

Browse files
zonuexezonuexe
committed
Move contributors to Wiki page
Keep the README simple for first-time users.
1 parent f26ccad commit f8d4e17

File tree

2 files changed

+68
-128
lines changed

2 files changed

+68
-128
lines changed

‎README.ja.md‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)
1010

1111
GNU EmacsでのPHPコーディングを支援するメジャーモードの開発プロジェクトです。
12-
これまで、以下の人々の作業をもとにフォークされました。
13-
14-
1. Turadg Aleahmad (Original Author)
15-
2. Aaron S. Hawley
16-
3. Lennart Borgman
17-
4. Eric James Michael Ritz
18-
5. Syohei Yoshida
19-
20-
リストアップされたすべての貢献者たちも同様にPHPモードを改善しました。
21-
22-
現在のメンテナ：
23-
24-
1. USAMI Kenta (@zonuexe)
2512

2613
[PHP ModeのGitHubプロジェクト][php-mode]にissueを作成してバグ報告や機能リクエストを送ってください。あるいは[PHP suite][php-suite]の[FeatHubページ][feathub]に機能リクエストを送っても構いません。
2714

@@ -356,17 +343,41 @@ Wiki
356343

357344
GitHubのプロジェクトページには[wiki][]があり、自由に編集して構いません。このWikiには今後追加する計画のある機能やバグが掲載されています。また、PHPモードをより使いやすくするためのTipsを追加できます。
358345

359-
ライセンス
360-
-------
361-
362-
PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl.html).
363-
364-
Contributors
365-
------------
366-
367-
PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/emacs-php/php-mode/blob/master/README.md#contributors)に掲載されています。
368-
346+
## 著作権
347+
348+
PHP Modeは[GNU General Public License Version 3][gpl-v3] (GPLv3) でライセンスされています。
349+
350+
このプロジェクトは1999年に[Turadg Aleahmad][@turadg]が書いた`php-mode.el`に起源を持ちます。2013年に[Daniel Hackney][@haxney]がEmacs組み込みのCC Modeをもとに書き直し始めました。PHPモードの改善に協力した貢献者のリストは[Authors]と[Contributors]に掲載されています。
351+
352+
このプロジェクトは2017年まで[Eric James Michael Ritz][@ejmr]によりメンテナンスされていました。現在は[Friends of Emacs-PHP Development][@emacs-php]コミュニティが引き継いで開発しています。
353+
354+
> ```
355+
> Copyright (C) 2018-2020 Friends of Emacs-PHP development
356+
> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
357+
> 2008 Aaron S. Hawley
358+
> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael Ritz
359+
> ```
360+
>
361+
> This program is free software; you can redistribute it and/or modify
362+
> it under the terms of the GNU General Public License as published by
363+
> the Free Software Foundation, either version 3 of the License, or
364+
> (at your option) any later version.
365+
>
366+
> This program is distributed in the hope that it will be useful,
367+
> but WITHOUT ANY WARRANTY; without even the implied warranty of
368+
> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
369+
> GNU General Public License for more details.
370+
>
371+
> You should have received a copy of the GNU General Public License
372+
> along with this program. If not, see <https://www.gnu.org/licenses/>.
373+
374+
[@ejmr]: https://github.com/ejmr
375+
[@emacs-php]: https://github.com/emacs-php
376+
[@haxney]: https://github.com/haxney
377+
[@turadg]: https://github.com/turadg
378+
[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors
369379
[Cask]: https://github.com/cask/cask
380+
[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors
370381
[MELPA Stable]: https://stable.melpa.org/
371382
[MELPA]: https://melpa.org/
372383
[Marmalade]: http://marmalade-repo.org/
@@ -389,6 +400,4 @@ PHPモードの改善に協力したすべての貢献者のリストは[README.
389400
[php-mode-packages]: https://repology.org/project/emacs:php-mode/versions
390401
[php-mode]: https://github.com/emacs-php/php-mode
391402
[php-suite]: https://github.com/emacs-php/php-suite
392-
[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg
393-
[travis-link]: https://travis-ci.org/emacs-php/php-mode
394403
[wiki]: https://github.com/emacs-php/php-mode/wiki

‎README.md‎

Lines changed: 34 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)
1010

1111
This is a major mode development project to support PHP coding in GNU Emacs.
12-
This fork builds on the work of:
13-
14-
1. Turadg Aleahmad (Original Author)
15-
2. Aaron S. Hawley
16-
3. Lennart Borgman
17-
4. Eric James Michael Ritz
18-
5. Syohei Yoshida
19-
20-
All contributors listed below improved PHP Mode as well.
21-
22-
The current maintainer is:
23-
24-
1. USAMI Kenta (@zonuexe)
2512

2613
Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode][php-mode]. Alternatively you may also request features via [the FeatHub page][feathub] for the entire [PHP suite for GNU Emacs][php-suite].
2714

@@ -337,97 +324,41 @@ The Wiki
337324

338325
The GitHub project page has a [wiki][] that you should feel free to edit. The wiki lists the features and bugs that are on plan to include in upcoming versions of PHP Mode. It is also a place to add any tips to make the mode more useful.
339326

340-
License
341-
-------
342-
343-
PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl.html).
344-
345-
346-
Contributors
347-
------------
348-
349-
[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/0)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/0)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/1)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/1)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/2)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/2)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/3)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/3)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/4)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/4)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/5)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/5)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/6)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/6)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/7)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/7)
350-
351-
In chronological order:
352-
353-
1. Juanjo
354-
2. Torsten Martinsen
355-
3. Vinai Kopp
356-
4. Sean Champ
357-
5. Doug Marcey
358-
6. Kevin Blake
359-
7. Rex McMaster
360-
8. Mathias Meyer
361-
9. Boris Folgmann
362-
10. Roland
363-
11. Rosenfeld
364-
12. Fred Yankowski
365-
13. Craig Andrews
366-
14. John Keller
367-
15. Ryan
368-
16. Sammartino
369-
17. ppercot
370-
18. Valentin Funk
371-
19. Stig Bakken
372-
20. Gregory Stark
373-
21. Chris Morris
374-
22. Nils Rennebarth
375-
23. Gerrit Riessen
376-
24. Eric Mc Sween
377-
25. Ville Skytta
378-
26. Giacomo Tesio
379-
27. Urban Müller
380-
28. [Engelke Eschner](https://github.com/tekai)
381-
29. Lennart Borgman
382-
30. Stefan Monnier
383-
31. Aaron S. Hawley
384-
32. [Ian Eure](https://github.com/ieure)
385-
33. [Bill Lovett](https://github.com/lovett)
386-
34. Dias Badekas
387-
35. David House
388-
36. [Tom Willemse](https://github.com/ryuslash)
389-
37. [Olaf the Viking](https://github.com/olavTHEviking)
390-
38. [Maël Nison](https://github.com/arcanis)
391-
39. [flack](https://github.com/flack)
392-
40. [Michele Bini](https://github.com/rev22)
393-
41. Emanuele Tomasi
394-
42. [David Maus](https://github.com/dmj)
395-
43. [Jakub Jankiewicz](https://github.com/jcubic)
396-
44. [Marcin Antczak](https://github.com/marcinant)
397-
45. [顾伟刚](https://github.com/guweigang)
398-
46. [zapad](https://github.com/zargener)
399-
47. [Carl Groner](https://github.com/cgroner)
400-
48. [Michael Dwyer](https://github.com/kalifg)
401-
49. [Daniel Hackney](https://github.com/haxney)
402-
50. [Nate Eagleson](https://github.com/NateEag)
403-
51. [Steve Purcell](https://github.com/purcell)
404-
52. TatriX
405-
53. [François-Xavier Bois](https://github.com/fxbois)
406-
54. [James Laver](https://github.com/jjl)
407-
55. [Jacek Wysocki](https://github.com/exu)
408-
56. [Jon Dufrense](https://github.com/jdufresne)
409-
57. [Andrei Chițu](https://github.com/achitu)
410-
58. [phil-s](https://github.com/phil-s)
411-
59. [Bence Kalmar](https://github.com/brkalmar)
412-
60. [Elis Axelsson](https://github.com/etu)
413-
61. [Alan Pearce](https://github.com/alanpearce)
414-
62. Syohei Yoshida
415-
63. Joris Steyn
416-
64. l3msh0
417-
65. [Hernawan Fa'iz Abdillah](https://github.com/Abdillah)
418-
66. [Sebastian Wiesner](https://github.com/lunaryorn)
419-
67. [Michael Stolovitzsky](https://github.com/emestee)
420-
68. [David Arroyo Menéndez](https://github.com/davidam)
421-
69. [USAMI Kenta](https://tadsan.github.io/) (@zonuexe)
422-
70. [Tim Landscheidt](http://www.tim-landscheidt.de)
423-
71. [Fabian Wiget](https://github.com/fabacino)
424-
72. tangxifan
425-
73. [Serghei Iakovlev](https://github.com/sergeyklay)
426-
74. [Christian Albrecht](https://github.com/calbrecht)
427-
75. [Sebastian Fieber](https://github.com/fallchildren)
428-
76. [Mark A. Hershberger](https://github.com/hexmode)
429-
327+
## Copyright
328+
329+
PHP Mode is licensed under [GNU General Public License Version 3][gpl-v3] (GPLv3).
330+
331+
This project originated in `php-mode.el` written by [Turadg Aleahmad][@turadg] in 1999. In 2013 [Daniel Hackney][@haxney] began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. Other contributors are listed in [Authors] and [Contributors].
332+
333+
This project was maintained by [Eric James Michael Ritz][@ejmr] until 2017. Currently, the [Friends of Emacs-PHP Development][@emacs-php] community inherits PHP Mode.
334+
335+
> ```
336+
> Copyright (C) 2018-2020 Friends of Emacs-PHP development
337+
> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
338+
> 2008 Aaron S. Hawley
339+
> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael Ritz
340+
> ```
341+
>
342+
> This program is free software; you can redistribute it and/or modify
343+
> it under the terms of the GNU General Public License as published by
344+
> the Free Software Foundation, either version 3 of the License, or
345+
> (at your option) any later version.
346+
>
347+
> This program is distributed in the hope that it will be useful,
348+
> but WITHOUT ANY WARRANTY; without even the implied warranty of
349+
> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
350+
> GNU General Public License for more details.
351+
>
352+
> You should have received a copy of the GNU General Public License
353+
> along with this program. If not, see <https://www.gnu.org/licenses/>.
354+
355+
[@ejmr]: https://github.com/ejmr
356+
[@emacs-php]: https://github.com/emacs-php
357+
[@haxney]: https://github.com/haxney
358+
[@turadg]: https://github.com/turadg
359+
[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors
430360
[Cask]: https://github.com/cask/cask
361+
[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors
431362
[MELPA Stable]: https://stable.melpa.org/
432363
[MELPA]: https://melpa.org/
433364
[Marmalade]: http://marmalade-repo.org/

0 commit comments

Comments
 (0)