[65842] branches/new-help-system/base/doc

raimue at macports.org raimue at macports.org
Thu Apr 1 18:29:01 PDT 2010


Revision: 65842
          http://trac.macports.org/changeset/65842
Author:   raimue at macports.org
Date:     2010-04-01 18:29:00 -0700 (Thu, 01 Apr 2010)
Log Message:
-----------
port-activate/deactivate in the same man page

Modified Paths:
--------------
    branches/new-help-system/base/doc/port-activate.1
    branches/new-help-system/base/doc/port-activate.1.txt
    branches/new-help-system/base/doc/port-deactivate.1

Removed Paths:
-------------
    branches/new-help-system/base/doc/port-deactivate.1.txt

Modified: branches/new-help-system/base/doc/port-activate.1
===================================================================
--- branches/new-help-system/base/doc/port-activate.1	2010-04-02 01:18:13 UTC (rev 65841)
+++ branches/new-help-system/base/doc/port-activate.1	2010-04-02 01:29:00 UTC (rev 65842)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: port-activate
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 05/09/2009
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/02/2010
 .\"    Manual: MacPorts Manual
-.\"    Source: MacPorts 1.8.0
+.\"    Source: MacPorts 1.8.99
 .\"  Language: English
 .\"
-.TH "PORT\-ACTIVATE" "1" "05/09/2009" "MacPorts 1\&.8\&.0" "MacPorts Manual"
+.TH "PORT\-ACTIVATE" "1" "04/02/2010" "MacPorts 1\&.8\&.99" "MacPorts Manual"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,7 +19,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-port-activate \- Activate a previously installed version of a port
+port-activate, port-deactivate \- Change active version of an installed port
 .SH "SYNOPSIS"
 .sp
 .nf
@@ -27,19 +27,27 @@
      [[\fIportname\fR | \fIpseudo\-portname\fR | \fIport\-expressions\fR | \fIport\-url\fR]]
      [\fI at version\fR]
 .fi
+.sp
+.nf
+\fBport\fR [\fB\-vdf\fR] [\fB\-D\fR \fIportdir\fR] \fBdeactivate\fR
+     [[\fIportname\fR | \fIpseudo\-portname\fR | \fIport\-expressions\fR | \fIport\-url\fR]]
+.fi
 .SH "DESCRIPTION"
 .sp
-\fBport activate\fR will set the status of an previously installed version of a port to active\&. The passed ports have to reference to already installed versions\&.
+\fBport activate\fR will set the status of an previously installed version of a port to active\&. The passed ports have to reference already installed versions\&.
 .sp
+\fBport deactivate\fR will set the status of a port to inactive\&. The passed ports have to be active at the moment\&. You will be warned if this port has active dependents\&.
+.sp
+If any version is active at the time of using \fBport activate\fR, it will be deactivated first\&. This can be used to switch from one version to another\&.
+.sp
 MacPorts has the ability to install multiple versions or different variant selections of the same port\&. The files will be stored in an intermediate location as \fIimages\fR, which allows to switch between the versions\&. Only one version can be active at a time\&. On activation, files will be hardlinked to their intended place in \fIprefix\fR\&.
 .sp
-There cannot be another version active at the time of using \fBport activate\fR, you would have to use \fBport deactivate\fR first to deactivate the current active port first\&.
 .SH "GLOBAL OPTIONS"
 .sp
-Please see the section \fBGLOBAL OPTIONS\fR in the port(1) man page for a description of global port options\&.
+Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a description of global port options\&.
 .SH "SEE ALSO"
 .sp
-port(1), port\-install(1), port\-installed(1), port\-deactivate(1)
+\fBport\fR(1), \fBport-install\fR(1), \fBport-installed\fR(1), \fBport-deactivate\fR(1)
 .SH "AUTHORS"
 .sp
 .if n \{\

Modified: branches/new-help-system/base/doc/port-activate.1.txt
===================================================================
--- branches/new-help-system/base/doc/port-activate.1.txt	2010-04-02 01:18:13 UTC (rev 65841)
+++ branches/new-help-system/base/doc/port-activate.1.txt	2010-04-02 01:29:00 UTC (rev 65842)
@@ -5,7 +5,7 @@
 
 NAME
 ----
-port-activate - Activate a previously installed version of a port
+port-activate, port-deactivate - Change active version of an installed port
 
 SYNOPSIS
 --------
@@ -14,19 +14,26 @@
      [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
      ['@version']
 
+[verse]
+*port* [*-vdf*] [*-D* 'portdir'] *deactivate*
+     [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
+
 DESCRIPTION
 -----------
 *port activate* will set the status of an previously installed version of a port
-to active. The passed ports have to reference to already installed versions.
+to active. The passed ports have to reference already installed versions.
 
-include::images.txt[]
- 
+*port deactivate* will set the status of a port to inactive. The passed ports
+have to be active at the moment. You will be warned if this port has active
+dependents.
+
 // [NOTE]
-There cannot be another version active at the time of using *port activate*, you
-would have to use *port deactivate* first to deactivate the current active port
-first.
+If any version is active at the time of using *port activate*, it will be
+deactivated first. This can be used to switch from one version to another.
 
+include::images.txt[]
 
+
 include::global-flags.txt[]
 
 

Modified: branches/new-help-system/base/doc/port-deactivate.1
===================================================================
--- branches/new-help-system/base/doc/port-deactivate.1	2010-04-02 01:18:13 UTC (rev 65841)
+++ branches/new-help-system/base/doc/port-deactivate.1	2010-04-02 01:29:00 UTC (rev 65842)
@@ -1,52 +1 @@
-'\" t
-.\"     Title: port-deactivate
-.\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 05/09/2009
-.\"    Manual: MacPorts Manual
-.\"    Source: MacPorts 1.8.0
-.\"  Language: English
-.\"
-.TH "PORT\-DEACTIVATE" "1" "05/09/2009" "MacPorts 1\&.8\&.0" "MacPorts Manual"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-port-deactivate \- Deactivate the currently active version of a port
-.SH "SYNOPSIS"
-.sp
-.nf
-\fBport\fR [\fB\-vd\fR] [\fB\-D\fR \fIportdir\fR] \fBdeactivate\fR
-     [[\fIportname\fR | \fIpseudo\-portname\fR | \fIport\-expressions\fR | \fIport\-url\fR]]
-.fi
-.SH "DESCRIPTION"
-.sp
-\fBport deactivate\fR will set the status of a port to inactive\&. The passed ports have to be active at the moment\&.
-.sp
-MacPorts has the ability to install multiple versions or different variant selections of the same port\&. The files will be stored in an intermediate location as \fIimages\fR, which allows to switch between the versions\&. Only one version can be active at a time\&. On activation, files will be hardlinked to their intended place in \fIprefix\fR\&.
-.sp
-.SH "GLOBAL OPTIONS"
-.sp
-Please see the section \fBGLOBAL OPTIONS\fR in the port(1) man page for a description of global port options\&.
-.SH "SEE ALSO"
-.sp
-port(1), port\-install(1), port\-installed(1), port\-activate(1)
-.SH "AUTHORS"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-(C) 2009 The MacPorts Project
-(C) 2009 Rainer Mueller <raimue at macports\&.org>
-.fi
-.if n \{\
-.RE
-.\}
+.so man1/port-activate.1

Deleted: branches/new-help-system/base/doc/port-deactivate.1.txt
===================================================================
--- branches/new-help-system/base/doc/port-deactivate.1.txt	2010-04-02 01:18:13 UTC (rev 65841)
+++ branches/new-help-system/base/doc/port-deactivate.1.txt	2010-04-02 01:29:00 UTC (rev 65842)
@@ -1,35 +0,0 @@
-// $Id$
-// vim: set et sw=4 ts=8 ft=asciidoc tw=80:
-port-deactivate(1)
-==================
-
-NAME
-----
-port-deactivate - Deactivate the currently active version of a port
-
-SYNOPSIS
---------
-[verse]
-*port* [*-vd*] [*-D* 'portdir'] *deactivate*
-     [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
-
-DESCRIPTION
------------
-*port deactivate* will set the status of a port to inactive. The passed ports
-have to be active at the moment.
-
-include::images.txt[]
-
-
-include::global-flags.txt[]
-
-
-SEE ALSO
---------
-linkman:port[1], linkman:port-install[1], linkman:port-installed[1],
-linkman:port-activate[1]
-
-AUTHORS
--------
- (C) 2009 The MacPorts Project
- (C) 2009 Rainer Mueller <raimue at macports.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100401/af69e31c/attachment-0001.html>


More information about the macports-changes mailing list