Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream

Choose the git version when conflicts happen.
This commit is contained in:
Benjamin Cama 2012-02-02 00:34:35 +01:00
commit 6b36bc85b2
30 changed files with 123 additions and 224 deletions

View file

@ -2,7 +2,7 @@
.de Id
.ds Dt \\$4 \\$5
..
.Id $Id: l2tpns.8,v 1.4 2005/06/12 06:09:35 bodea Exp $
.Id $Id: l2tpns.8,v 1.4 2005-06-12 06:09:35 bodea Exp $
.TH L2TPNS 8 "\*(Dt" L2TPNS "System Management Commands"
.SH NAME
l2tpns \- Layer 2 tunneling protocol network server (LNS)

View file

@ -2,7 +2,7 @@
.de Id
.ds Dt \\$4 \\$5
..
.Id $Id: nsctl.8,v 1.2 2004/11/17 15:08:19 bodea Exp $
.Id $Id: nsctl.8,v 1.2 2004-11-17 15:08:19 bodea Exp $
.TH NSCTL 8 "\*(Dt" L2TPNS "System Management Commands"
.SH NAME
nsctl \- manage running l2tpns instance

View file

@ -2,7 +2,7 @@
.de Id
.ds Dt \\$4 \\$5
..
.Id $Id: startup-config.5,v 1.18 2006/07/01 12:40:17 bodea Exp $
.Id $Id: startup-config.5,v 1.18 2006-07-01 12:40:17 bodea Exp $
.TH STARTUP-CONFIG 5 "\*(Dt" L2TPNS "File Formats and Conventions"
.SH NAME
startup\-config \- configuration file for l2tpns