diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 0c0dfadda6..97d3f73d6f 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
- $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ (or in FreeBSD's case,
$FreeBSD$) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
- the second $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ line, leaving the original
- $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ line intact).
+ the second $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ line, leaving the original
+ $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ line intact).
@@ -1625,20 +1625,20 @@ docs:Documentation Bug:nik:
- Importing a New Port
+ Adding a New Port
- How do I import a new port?
+ How do I add a new port?
First, please read the section about repository
copy.
- The easiest way to import a new port is to use the
+ The easiest way to add a new port is to use the
addport script on
- freefall. It will import a port from the
+ freefall. It will add a port from the
directory you specify, determining the category automatically
from the port Makefile.
It will also add an entry to the
@@ -1652,7 +1652,7 @@ docs:Documentation Bug:nik:
- Any other things I need to know when I import a new
+ Any other things I need to know when I add a new
port?
@@ -1705,7 +1705,7 @@ docs:Documentation Bug:nik:
- When you want to import a port that is related to
+ When you want to add a port that is related to
any port that is already in the tree in a separate
directory, please send mail to the ports manager asking
about it. Here related means
@@ -1731,9 +1731,9 @@ docs:Documentation Bug:nik:
When there is no history to preserve. If a port is
- imported into a wrong category and is moved immediately,
+ added into a wrong category and is moved immediately,
it suffices to simply cvs remove the
- old one and cvs import the new
+ old one and addport the new
one.
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
index 0c0dfadda6..97d3f73d6f 100644
--- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
- $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ (or in FreeBSD's case,
$FreeBSD$) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
- the second $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ line, leaving the original
- $Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $ line intact).
+ the second $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ line, leaving the original
+ $Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $ line intact).
@@ -1625,20 +1625,20 @@ docs:Documentation Bug:nik:
- Importing a New Port
+ Adding a New Port
- How do I import a new port?
+ How do I add a new port?
First, please read the section about repository
copy.
- The easiest way to import a new port is to use the
+ The easiest way to add a new port is to use the
addport script on
- freefall. It will import a port from the
+ freefall. It will add a port from the
directory you specify, determining the category automatically
from the port Makefile.
It will also add an entry to the
@@ -1652,7 +1652,7 @@ docs:Documentation Bug:nik:
- Any other things I need to know when I import a new
+ Any other things I need to know when I add a new
port?
@@ -1705,7 +1705,7 @@ docs:Documentation Bug:nik:
- When you want to import a port that is related to
+ When you want to add a port that is related to
any port that is already in the tree in a separate
directory, please send mail to the ports manager asking
about it. Here related means
@@ -1731,9 +1731,9 @@ docs:Documentation Bug:nik:
When there is no history to preserve. If a port is
- imported into a wrong category and is moved immediately,
+ added into a wrong category and is moved immediately,
it suffices to simply cvs remove the
- old one and cvs import the new
+ old one and addport the new
one.