Merge branch 'mm/readme-markdown'

Fix a few broken links in README.md and also teach rpmbuild
that there is no README.

* mm/readme-markdown:
  README.md: don't take 'commandname' literally
  git.spec.in: use README.md, not README
This commit is contained in:
Junio C Hamano 2016-04-03 10:27:22 -07:00
Родитель 90f7b16b3a c9a014e38e
Коммит f66a5bd923
2 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -17,11 +17,11 @@ including full documentation and Git related tools.
See [Documentation/gittutorial.txt][] to get started, then see See [Documentation/gittutorial.txt][] to get started, then see
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and [Documentation/giteveryday.txt][] for a useful minimum set of commands, and
[Documentation/git-commandname.txt][] for documentation of each command. Documentation/git-*commandname*.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help documentation of each command with "man git-*commandname*" or "git help
commandname". *commandname*".
CVS users may also want to read [Documentation/gitcvs-migration.txt][] CVS users may also want to read [Documentation/gitcvs-migration.txt][]
("man gitcvs-migration" or "git help cvs-migration" if git is ("man gitcvs-migration" or "git help cvs-migration" if git is
@ -57,6 +57,5 @@ and the name as (depending on your mood):
[INSTALL]: INSTALL [INSTALL]: INSTALL
[Documentation/gittutorial.txt]: Documentation/gittutorial.txt [Documentation/gittutorial.txt]: Documentation/gittutorial.txt
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt [Documentation/giteveryday.txt]: Documentation/giteveryday.txt
[Documentation/git-commandname.txt]: Documentation/git-commandname.txt
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt [Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches [Documentation/SubmittingPatches]: Documentation/SubmittingPatches

Просмотреть файл

@ -146,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f bin-man-doc-files %files -f bin-man-doc-files
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/git-core/ %{_datadir}/git-core/
%doc README COPYING Documentation/*.txt %doc README.md COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
%{!?_without_docs: %doc Documentation/technical} %{!?_without_docs: %doc Documentation/technical}
%{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d