Skip to content

Commit

Permalink
Fix po4a conf file
Browse files Browse the repository at this point in the history 
This line was declared twice, which causes the build of i10n docs to
fail.
  • Loading branch information
@steveklabnik
steveklabnik committed Dec 10, 2014
1 parent bc486dc commit a9fdd16
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/doc/po4a.conf
View file
Expand Up @@ -26,4 +26,3 @@
[type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md
[type: text] src/doc/rust.md $lang:doc/l10n/$lang/rust.md
[type: text] src/doc/rustdoc.md $lang:doc/l10n/$lang/rustdoc.md
[type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md

20 comments on commit a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at steveklabnik@a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/po4a_fix = a9fdd16 into auto

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/po4a_fix = a9fdd16 merged ok, testing candidate = dacab78c

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2670
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2675
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2674
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2678
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2670
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2335
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2332
exception: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/1174

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at steveklabnik@a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging 41 batched pull requests into batch

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing rollup candidate = ab5760d

Successful merges:

  • steveklabnik/po4a_fix = a9fdd16: Fix po4a conf file
  • nikomatsakis/unsafe-trait = 7855893: Implement unsafe trait and unsafe impl from the OIBIT RFC
  • vhbit/copy-for-bitflags = 319c379: Add Copy to bitflags-generated structures
  • murarth/rusti-support = 04b4b50: Implement LLVM ExecutionEngine API
  • aochagavia/ice = 8788cb0: Fix Unexpected compiler panic #19734
  • jakub-/e-needstest = e62dc6b: Add tests for E-needstest issues
  • gereeter/cleanup-btree-node = 808eeff: Make BTree's internals safer and do more checks at compile time instead of run time
  • alexcrichton/stop-panicking = 9a47d65: rustc: Don't panic on corrupt metadata
  • sfackler/core-hash = 2c4effd: Move hash module from collections to core
  • emk/regex_at_name_opt = c2b0d7d: Modify regex::Captures::{at,name} to return Option
  • vadimcn/fix-demangle = 317d912: Fix symbol demangling on Windows.
  • luqmana/deriving-where = ab1bdde: libsyntax: Make deriving also respect where bounds.
  • steveklabnik/gh15449 = 6780031: Fix inappropriate ## headings
  • steveklabnik/gh16219 = 3c9d898: Fix up some {ignore} and {notrust}s
  • csouth3/vecmap-newtypes = 81f9a31: Change VecMap's iterators to use wrapper structs instead of typedefs.
  • vhbit/ios-oibit-fix = 069a203: Fixed iOS build after oibit
  • sethpollack/patch-1 = 7676d01: remove semicolon from ruby example
  • steveklabnik/gh19717 = f473aee: gdb < RUST_BACKTRACE
  • steveklabnik/gh9266 = 38d2909: reference: type definition -> type alias
  • brson/rust-installer = e92e8ac: Use rust-installer for installation
  • steveklabnik/remove_sundown = 3cb10ef: Remove sundown
  • csouth3/remove-featuregates = cd3bdeb: Remove feature gate directives for if_let, while_let, and tuple_indexing.
  • lifthrasiir/that-stray-nul = 577f742: serialize: Avoid stray nul characters when auto-serializing char.
  • nick29581/coerce-raw = 19eb4bf: Add coercions from *mut to *const and from &mut to *const.
  • csouth3/iterator-wrapperstructs = e38de8a: Use wrapper structs for iterators in BTreeMap/Set and HashMap/Set
  • jbranchaud/add-btreeset-iter-doctests = 47b071a: Add doctests for iter and into_iter for BTreeSet.
  • tomjakubowski/rustdoc-consts-statics = 25223c8: rustdoc: Properly inline const items
  • SimonSapin/gedit-new-unicode-escape = 0c60115: gedit language spec: add new-style Unicode escapes
  • Noctune/master = 3cc730e: Add Ord impl to raw pointers
  • csouth3/vim-syntax-iter = 0a015f2: Update vim syntax highlighting for ExactSizeIterator
  • akiss77/fix-i8-c_char = a28d16a: libc::c_char is not necessarily i8
  • tomjakubowski/metadata-const-attrs = 31f75ac: metadata: Encode attributes for const items
  • jbranchaud/add-btreeset-new-doctest = 58125e5: Add a doctest for BTreeSet::new.
  • kballard/vim-new-unicode-escapes = d333a91: vim: Support the new \u{1234} unicode escapes
  • frewsxcv/expansion-include-enum = 3fc6dc9: Expansion should explicitly include enum
  • jbranchaud/fix-a-typo-in-ownership-guide = 1567c94: Fix a typo in ownership guide, aquire to acquire.
  • mchaput/patch-1 = f053f29: Fix mispelling in char.rs error message
  • shepmaster/invariant-lifetime-copy = 5966815: InvariantLifetime is Copy-able

Failed merges:

  • alexcrichton/slice-one-trait = 7f3983956e1f466910e5cf93b3d536de3e6c9a32: std: Collapse SlicePrelude traits
  • tbu-/pr_fp_name = 89af108: Rename FPCategory, FP* to FpCategory, Fp* to adhere to the naming convention
  • nikomatsakis/warn-on-shadowing = 6b7a38d574f78c8b48379d83ebf492296a26f0bf: Report an error when lifetime parameters are shadowed.

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at steveklabnik@a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/po4a_fix = a9fdd16 into auto

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/po4a_fix = a9fdd16 merged ok, testing candidate = d9eca938

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2682
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2679
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2674
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2674
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2339

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at steveklabnik@a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/po4a_fix = a9fdd16 into auto

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/po4a_fix = a9fdd16 merged ok, testing candidate = d66931e7

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at steveklabnik@a9fdd16

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging steveklabnik/rust/po4a_fix = a9fdd16 into auto

@bors
Copy link
Contributor

@bors bors commented on a9fdd16 Dec 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

steveklabnik/rust/po4a_fix = a9fdd16 merged ok, testing candidate = 60b8e0e4

Please sign in to comment.