]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Merge r260524,r260540
authormelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 8 May 2014 19:35:12 +0000 (19:35 +0000)
committermelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 8 May 2014 19:35:12 +0000 (19:35 +0000)
commit83374831b8454eff6d9d6a14434cd8446473af19
tree24a4db7a7d8960d039590cfdfd373acba8a7db28
parent88203b1140961bf9dbf1c167717dd2fc5f4fde81
Merge r260524,r260540

r260524:
  Add -4/-6 shorthand for -finet/-finet6 in route(8) and netstat(8).

r260540:
  Bump dates in nestat(1) and route(8) man pages.
  Fix several small errors introduced by r260524.

  Suggested by: glebius

git-svn-id: svn://svn.freebsd.org/base/stable/10@265701 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sbin/route/keywords
sbin/route/route.8
sbin/route/route.c
usr.bin/netstat/main.c
usr.bin/netstat/netstat.1