[Chinese-commits] [manpages-zh] 22/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 012e7c47a3c96b1d205e94b2810e4ae5e42d7d97
Merge: 2615bb7 fdff703
Author: Boyuan Yang <073plan at gmail.com>
Date:   Thu Dec 22 17:07:46 2016 +0800

    Merge branch 'upstream'

 ChangeLog                             |  57 ++++++-
 src/man1/arch.1                       |   2 +-
 src/man1/{sha512sum.1 => b2sum.1}     |  31 ++--
 src/man1/base32.1                     |   3 +-
 src/man1/base64.1                     |   3 +-
 src/man1/basename.1                   |   2 +-
 src/man1/cat.1                        |   3 +-
 src/man1/chgrp.1                      |   3 +-
 src/man1/cksum.1                      |  77 +++++----
 src/man1/dirname.1                    |   3 +-
 src/man1/echo.1                       |   3 +-
 src/man1/env.1                        |  89 +++++------
 src/man1/expand.1                     | 100 ++++++------
 src/man1/expr.1                       |   3 +-
 src/man1/factor.1                     |   3 +-
 src/man1/false.1                      |   3 +-
 src/man1/groups.1                     |   1 -
 src/man1/gvim.1                       | 170 +++++++++++---------
 src/man1/head.1                       | 119 +++++++-------
 src/man1/hostid.1                     | 146 +++++------------
 src/man1/install.1                    | 292 +++++++++++++---------------------
 src/man1/{arch.1 => link.1}           |  20 +--
 src/man1/logname.1                    |   3 +-
 src/man1/manpages                     |  21 +--
 src/man1/nice.1                       |  88 +++++-----
 src/man1/paste.1                      |  93 ++++++-----
 src/man1/{logname.1 => pathchk.1}     |  26 +--
 src/man1/{dirname.1 => printenv.1}    |  35 ++--
 src/man1/printf.1                     | 171 ++++++++++----------
 src/man1/pwd.1                        |   3 +-
 src/man1/rm.1                         |   3 +-
 src/man1/rmdir.1                      |   3 +-
 src/man1/seq.1                        |   7 +-
 src/man1/{sha512sum.1 => sha1sum.1}   |  26 ++-
 src/man1/{sha512sum.1 => sha224sum.1} |  23 ++-
 src/man1/{sha512sum.1 => sha256sum.1} |  22 ++-
 src/man1/{sha512sum.1 => sha384sum.1} |  21 ++-
 src/man1/sha512sum.1                  |   3 +-
 src/man1/sleep.1                      |   3 +-
 src/man1/sum.1                        |   3 +-
 src/man1/sync.1                       |  86 +++++-----
 src/man1/tac.1                        |   3 +-
 src/man1/test.1                       |   6 +-
 src/man1/timeout.1                    |  77 +++++++++
 src/man1/touch.1                      | 261 +++++++++---------------------
 src/man1/true.1                       |   3 +-
 src/man1/tty.1                        |  84 +++++-----
 src/man1/uname.1                      | 117 +++++++-------
 src/man1/unexpand.1                   |  57 +++++++
 src/man1/{arch.1 => unlink.1}         |  20 +--
 src/man1/{arch.1 => users.1}          |  19 +--
 src/man1/wc.1                         | 108 +++++++------
 src/man1/who.1                        |   3 +-
 src/man1/{arch.1 => whoami.1}         |  19 +--
 src/man1/yes.1                        |   3 +-
 src/man8/rpm.8                        | 160 ++++++++++++-------
 56 files changed, 1342 insertions(+), 1371 deletions(-)

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