[Chinese-commits] [manpages-zh] 16/31: Merge branch 'upstream'

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository manpages-zh.

commit e334263af6cced894636733712647f5cf0cf8ede
Merge: 8f7604c 97f616e
Author: Boyuan Yang <073plan at gmail.com>
Date:   Sun Dec 18 11:14:34 2016 +0800

    Merge branch 'upstream'

 ChangeLog                  |  15 ++-
 README                     |  77 +------------
 README => README.md        | 118 +++++++++++++++++---
 TODO                       |   4 +
 configure.ac               |  32 +++++-
 src/man1/[.1               | 168 +---------------------------
 src/man1/groups.1          |  76 +++++++------
 src/man1/manpages          |   2 +-
 src/man1/sh.1              |   1 -
 src/man1/sq.1              |  90 +++++++++------
 src/man1/zh_CN/Makefile.am |  10 +-
 src/man1/zh_TW/Makefile.am |  10 +-
 src/man2/zh_CN/Makefile.am |  10 +-
 src/man2/zh_TW/Makefile.am |  10 +-
 src/man3/zh_CN/Makefile.am |  10 +-
 src/man3/zh_TW/Makefile.am |  10 +-
 src/man4/fifo.4            |  55 ----------
 src/man4/manpages          |   2 +-
 src/man4/zh_CN/Makefile.am |  10 +-
 src/man4/zh_TW/Makefile.am |  10 +-
 src/man5/fs.5              | 266 ++++++++++++++++++++++++++-------------------
 src/man5/zh_CN/Makefile.am |  10 +-
 src/man5/zh_TW/Makefile.am |  10 +-
 src/man6/zh_CN/Makefile.am |  10 +-
 src/man6/zh_TW/Makefile.am |  10 +-
 src/man7/fifo.7            |  66 +++++++++++
 src/man7/manpages          |   2 +-
 src/man7/zh_CN/Makefile.am |  10 +-
 src/man7/zh_TW/Makefile.am |  10 +-
 src/man8/zh_CN/Makefile.am |  10 +-
 src/man8/zh_TW/Makefile.am |  10 +-
 src/mann/zh_CN/Makefile.am |  15 ++-
 src/mann/zh_TW/Makefile.am |  14 ++-
 utils/append-colophon      |  83 ++++++++++++++
 utils/bi2fbfi.pl           |  12 --
 utils/html2man             |   9 --
 utils/man2html             |   5 +-
 utils/pre-trans.pl         |  24 ----
 utils/release-manpages     |  16 ---
 39 files changed, 701 insertions(+), 611 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/manpages-zh.git