Auto merge of #6553 - ehuss:doc-publish-features, r=alexcrichton

Add documentation for new package/publish feature flags.

Added in #6453.

src/doc/man/cargo-package.adoc

@@ -59,6 +59,8 @@ include::options-target-triple.adoc[]
 
 include::options-target-dir.adoc[]
 
+include::options-features.adoc[]
+
 === Manifest Options
 
 include::options-manifest-path.adoc[]

src/doc/man/cargo-publish.adoc

@@ -57,6 +57,8 @@ include::options-target-triple.adoc[]
 
 include::options-target-dir.adoc[]
 
+include::options-features.adoc[]
+
 === Manifest Options
 
 include::options-manifest-path.adoc[]

src/doc/man/generated/cargo-package.html

@@ -119,6 +119,32 @@ <h3 id="cargo_package_compilation_options">Compilation Options</h3>
 </div>
 </div>
 <div class="sect2">
+<h3 id="cargo_package_feature_selection">Feature Selection</h3>
+<div class="paragraph">
+<p>When no feature options are given, the <code>default</code> feature is activated for
+every selected package.</p>
+</div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><strong>--features</strong> <em>FEATURES</em></dt>
+<dd>
+<p>Space or comma separated list of features to activate. These features only
+apply to the current directory&#8217;s package. Features of direct dependencies
+may be enabled with <code>&lt;dep-name&gt;/&lt;feature-name&gt;</code> syntax.</p>
+</dd>
+<dt class="hdlist1"><strong>--all-features</strong></dt>
+<dd>
+<p>Activate all available features of all selected packages.</p>
+</dd>
+<dt class="hdlist1"><strong>--no-default-features</strong></dt>
+<dd>
+<p>Do not activate the <code>default</code> feature of the current directory&#8217;s
+package.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
 <h3 id="cargo_package_manifest_options">Manifest Options</h3>
 <div class="dlist">
 <dl>

src/doc/man/generated/cargo-publish.html

@@ -118,6 +118,32 @@ <h3 id="cargo_publish_compilation_options">Compilation Options</h3>
 </div>
 </div>
 <div class="sect2">
+<h3 id="cargo_publish_feature_selection">Feature Selection</h3>
+<div class="paragraph">
+<p>When no feature options are given, the <code>default</code> feature is activated for
+every selected package.</p>
+</div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><strong>--features</strong> <em>FEATURES</em></dt>
+<dd>
+<p>Space or comma separated list of features to activate. These features only
+apply to the current directory&#8217;s package. Features of direct dependencies
+may be enabled with <code>&lt;dep-name&gt;/&lt;feature-name&gt;</code> syntax.</p>
+</dd>
+<dt class="hdlist1"><strong>--all-features</strong></dt>
+<dd>
+<p>Activate all available features of all selected packages.</p>
+</dd>
+<dt class="hdlist1"><strong>--no-default-features</strong></dt>
+<dd>
+<p>Do not activate the <code>default</code> feature of the current directory&#8217;s
+package.</p>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect2">
 <h3 id="cargo_publish_manifest_options">Manifest Options</h3>
 <div class="dlist">
 <dl>

src/etc/man/cargo-package.1

@@ -2,12 +2,12 @@
 .\"     Title: cargo-package
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 1.5.8
-.\"      Date: 2018-12-20
+.\"      Date: 2019-01-14
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "CARGO\-PACKAGE" "1" "2018-12-20" "\ \&" "\ \&"
+.TH "CARGO\-PACKAGE" "1" "2019-01-14" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -171,6 +171,28 @@ specified with the \fBCARGO_TARGET_DIR\fP environment variable, or the
 Defaults
 to \fBtarget\fP in the root of the workspace.
 .RE
+.SS "Feature Selection"
+.sp
+When no feature options are given, the \fBdefault\fP feature is activated for
+every selected package.
+.sp
+\fB\-\-features\fP \fIFEATURES\fP
+.RS 4
+Space or comma separated list of features to activate. These features only
+apply to the current directory\(cqs package. Features of direct dependencies
+may be enabled with \fB<dep\-name>/<feature\-name>\fP syntax.
+.RE
+.sp
+\fB\-\-all\-features\fP
+.RS 4
+Activate all available features of all selected packages.
+.RE
+.sp
+\fB\-\-no\-default\-features\fP
+.RS 4
+Do not activate the \fBdefault\fP feature of the current directory\(cqs
+package.
+.RE
 .SS "Manifest Options"
 .sp
 \fB\-\-manifest\-path\fP \fIPATH\fP

src/etc/man/cargo-publish.1

@@ -2,12 +2,12 @@
 .\"     Title: cargo-publish
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 1.5.8
-.\"      Date: 2018-12-20
+.\"      Date: 2019-01-14
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "CARGO\-PUBLISH" "1" "2018-12-20" "\ \&" "\ \&"
+.TH "CARGO\-PUBLISH" "1" "2019-01-14" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -162,6 +162,28 @@ specified with the \fBCARGO_TARGET_DIR\fP environment variable, or the
 Defaults
 to \fBtarget\fP in the root of the workspace.
 .RE
+.SS "Feature Selection"
+.sp
+When no feature options are given, the \fBdefault\fP feature is activated for
+every selected package.
+.sp
+\fB\-\-features\fP \fIFEATURES\fP
+.RS 4
+Space or comma separated list of features to activate. These features only
+apply to the current directory\(cqs package. Features of direct dependencies
+may be enabled with \fB<dep\-name>/<feature\-name>\fP syntax.
+.RE
+.sp
+\fB\-\-all\-features\fP
+.RS 4
+Activate all available features of all selected packages.
+.RE
+.sp
+\fB\-\-no\-default\-features\fP
+.RS 4
+Do not activate the \fBdefault\fP feature of the current directory\(cqs
+package.
+.RE
 .SS "Manifest Options"
 .sp
 \fB\-\-manifest\-path\fP \fIPATH\fP