Skip to content

Commit 967366e

Browse files
committed
auto merge of #14164 : alexcrichton/rust/rollup, r=alexcrichton
2 parents 1ee5e7f + 5001a66 commit 967366e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+277
-216
lines changed

man/rustc.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Set lint forbidden
9797
Set internal debugging options. Use "-Z help" to print available options.
9898
.TP
9999
\fB\-C\fR FLAG[=VAL], \fB\-\-codegen\fR FLAG[=VAL]
100-
Set a codegen-related flag to the value specifie.d Use "-C help" to print
100+
Set a codegen-related flag to the value specified. Use "-C help" to print
101101
available flags. See CODEGEN OPTIONS below
102102
.TP
103103
\fB\-v\fR, \fB\-\-version\fR
@@ -119,7 +119,7 @@ is invoked.
119119
.TP
120120
\fBtarget-cpu\fR=help
121121
Selects a target processor. If the value is 'help', then a list of available
122-
cpus is printed.
122+
CPUs is printed.
123123
.TP
124124
\fBtarget-feature\fR='+feature1 -feature2'
125125
A space-separated list of features to enable or disable for the target. A
@@ -132,7 +132,7 @@ cause rustc to print all known passes and exit. The passes specified are
132132
appended at the end of the normal pass manager.
133133
.TP
134134
\fBllvm-args\fR='-arg1 -arg2'
135-
A space-separted list of argument to pass through to LLVM.
135+
A space-separated list of arguments to pass through to LLVM.
136136
.TP
137137
\fBsave-temps\fR
138138
If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated

mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=0.11
16+
CFG_RELEASE_NUM=0.11.0
1717
CFG_RELEASE_LABEL=-pre
1818

1919
ifndef CFG_ENABLE_NIGHTLY

src/doc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ To generate .pot and .po files, do something like:
5353
~~~~
5454
po4a --copyright-holder="The Rust Project Developers" \
5555
--package-name="Rust" \
56-
--package-version="0.11-pre" \
56+
--package-version="0.11.0-pre" \
5757
-M UTF-8 -L UTF-8 \
5858
src/doc/po4a.conf
5959
~~~~
6060

61-
(the version number must be changed if it is not 0.11-pre now.)
61+
(the version number must be changed if it is not 0.11.0-pre now.)
6262

6363
Now you can translate documents with .po files, commonly used with gettext. If
6464
you are not familiar with gettext-based translation, please read the online

src/doc/po/ja/complement-cheatsheet.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-lang-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-project-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-usage-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-02-03 08:13+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-conditions.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-container.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

0 commit comments

Comments
 (0)