Merge branch 'signer-rpc' into signer-signing

Conflicts:
	parity/signer.rs

ethcore/src/blooms/group_position.rs

@@ -17,7 +17,7 @@
 use bloomchain::group as bc;
 use util::HeapSizeOf;
 
-/// Represents BloomGroup position in database.
+/// Represents `BloomGroup` position in database.
 #[derive(PartialEq, Eq, Hash, Clone, Debug)]
 pub struct GroupPosition {
 	/// Bloom level.

ethcore/src/trace/db.rs

@@ -54,7 +54,7 @@ impl Key<BlockTraces> for H256 {
 	}
 }
 
-/// Wrapper around blooms::GroupPosition so it could be
+/// Wrapper around `blooms::GroupPosition` so it could be
 /// uniquely identified in the database.
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
 struct TraceGroupPosition(blooms::GroupPosition);

parity/migration.rs

@@ -73,7 +73,7 @@ fn version_file_path(path: &PathBuf) -> PathBuf {
 }
 
 /// Reads current database version from the file at given path.
-/// If the file does not exist returns DEFAULT_VERSION.
+/// If the file does not exist returns `DEFAULT_VERSION`.
 fn current_version(path: &PathBuf) -> Result<u32, Error> {
 	match File::open(version_file_path(path)) {
 		Err(ref err) if err.kind() == ErrorKind::NotFound => Ok(DEFAULT_VERSION),