[101259] branches/release_2_1

[jmr at macports.org]

Revision: 101259
          https://trac.macports.org/changeset/101259
Author:   jmr at macports.org
Date:     2013-01-07 05:43:52 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r98190 from trunk:
 remove references to ed action from port.1

Revision Links:
--------------
    https://trac.macports.org/changeset/98190

Modified Paths:
--------------
    branches/release_2_1/base/doc/port.1

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,100129,100217-100220
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,100129,100217-100220
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_1/base/doc/port.1
===================================================================
--- branches/release_2_1/base/doc/port.1	2013-01-07 13:41:37 UTC (rev 101258)
+++ branches/release_2_1/base/doc/port.1	2013-01-07 13:43:52 UTC (rev 101259)
@@ -636,18 +636,13 @@
 .Ss edit
 Opens
 .Ar Portfile 
-with your default editor specified in your shell's environment variable. Alias
-.Ar ed
-also invokes this command.
+with your default editor specified in your shell's environment variable.
 .Pp
 You can also use the
 .Fl -editor
 flag on the command line to specify an alternative editor. For example:
 .Dl port edit --editor nano apache2
 .Pp
-.Ss ed
-An alias for
-.Ic edit .
 .Ss fetch
 Fetches the distribution files required to build
 .Ar portname .
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/7329a467/attachment.html>