Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 23626)
+++ wp-includes/general-template.php	(working copy)
@@ -790,6 +790,77 @@
 }
 
 /**
+ * Retrieve or display the archive title based on the queried object
+ *
+ * @since 3.6.0
+ *
+ * @param string $prefix Optional. What to display before the title.
+ * @param string $container Optional. The HTML container to wrap the type of archive with.
+ * @param bool $display Whether to display or return the archive title.
+ * @return string Text archive title
+ */
+function the_archive_title( $prefix = '', $container = 'span', $display = true ) {
+	$before = $after = '';
+	if ( ! empty( $container ) ) {
+		$before = sprintf( '<%s>', $container );
+		$after = sprintf( '</%s>', $container );
+	}
+
+	if ( is_day() ) {
+		$title = sprintf( __( 'Daily Archives: %s' ), $before . get_the_date() . $after );
+	} elseif ( is_month() ) {
+		$title = sprintf( __( 'Monthly Archives: %s' ), $before . get_the_date( _x( 'F Y', 'monthly archives date format' ) ) . $after );
+	} elseif ( is_year() ) {
+		$title = sprintf( __( 'Yearly Archives: %s' ), $before . get_the_date( _x( 'Y', 'yearly archives date format' ) ) . $after );
+	} elseif ( is_tag() ) {
+		$title = sprintf( __( 'Tag Archives: %s' ), $before . single_tag_title( '', false ) . $after );
+	} elseif ( is_category() ) {
+		$title = sprintf( __( 'Category Archives: %s' ), $before . single_cat_title( '', false ) . $after );
+	} elseif ( is_tax() ) {
+		$term = get_queried_object();
+		$tax = get_taxonomy( $term->taxonomy );
+		/* translators: 1: Taxonomy singular name, 2: Current taxonomy term */
+		$title = sprintf( __( '%1$s Archives: %2$s' ), $tax->labels->singular_name, $before . single_term_title( '', false ) . $after );					
+	} elseif ( is_author() ) {
+		$title = sprintf( __( 'Author Archives: %s' ), $before . get_the_author() . $after );
+	} elseif ( is_post_type_archive() ) {
+		$title = sprintf( __( 'Archives: %s' ), $before . post_type_archive_title( '', false ) . $after );
+	} else {
+		$title = __( 'Archives' );
+	}
+
+	$title = $prefix . $title;
+
+	if ( $display )
+		echo apply_filters( 'the_archive_title', $title );
+	else
+		return apply_filters( 'the_archive_title', $title );
+}
+
+/**
+ * Retrieve or display tag, category or term description
+ *
+ * @since 3.6.0
+ *
+ * @uses term_description()
+ *
+ * @param bool $display Whether to display or return the archive description.
+ * @return string Category, tag or term description
+ */
+function the_archive_description( $display = true ) {
+	if ( is_tag() || is_category() || is_tax() ) {
+		$term = get_queried_object();
+		$taxonomy = $term->taxonomy;		
+		$description = term_description( '', $taxonomy );
+	}
+
+	if ( $display )
+		echo apply_filters( 'the_archive_description', $description );
+	else
+		return apply_filters( 'the_archive_description', $description );
+}
+
+/**
  * Retrieve archive link content based on predefined or custom code.
  *
  * The format can be one of four styles. The 'link' for head element, 'option'