Index: codex-buddypress-org/activity-entry.php
===================================================================
--- codex-buddypress-org/activity-entry.php	(revision 12387)
+++ codex-buddypress-org/activity-entry.php	(working copy)
@@ -1,13 +1,13 @@
 <?php /* This template is used by activity-loop.php and AJAX functions to show each activity */ ?>
 
-<?php do_action( 'bp_before_activity_entry' ) ?>
+<?php do_action( 'bp_before_activity_entry' ); ?>
 
-<li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>">
+<li class="<?php bp_activity_css_class(); ?>" id="activity-<?php bp_activity_id(); ?>">
 	<div class="activity-content">
 
 		<div class="activity-avatar">
-			<a href="<?php bp_activity_user_link() ?>">
-				<?php bp_activity_avatar( 'type=full&width=100&height=100' ) ?>
+			<a href="<?php bp_activity_user_link(); ?>">
+				<?php bp_activity_avatar( 'type=full&width=100&height=100' ); ?>
 			</a>
 		</div>
 
@@ -18,18 +18,18 @@
 		<?php if ( bp_activity_has_content() ) : ?>
 
 			<div class="activity-inner">
-				<?php bp_activity_content_body() ?>
+				<?php bp_activity_content_body(); ?>
 			</div>
 
 		<?php endif; ?>
 
-		<?php do_action( 'bp_activity_entry_content' ) ?>
+		<?php do_action( 'bp_activity_entry_content' ); ?>
 
 		<?php if ( 'activity_comment' == bp_get_activity_type() ) : ?>
 
 			<div class="activity-inreplyto">
-				<strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> - <?php bp_activity_parent_content() ?> &middot;
-				<a href="<?php bp_activity_thread_permalink() ?>" class="view" title="<?php esc_attr_e( 'Permalink', 'buddypress' ) ?>"><?php _e( 'View', 'buddypress' ) ?></a>
+				<strong><?php _e( 'In reply to', 'buddypress' ); ?></strong> - <?php bp_activity_parent_content(); ?> &middot;
+				<a href="<?php bp_activity_thread_permalink(); ?>" class="view" title="<?php esc_attr_e( 'Permalink', 'buddypress' ); ?>"><?php _e( 'View', 'buddypress' ); ?></a>
 			</div>
 
 		<?php endif; ?>
@@ -39,11 +39,11 @@
 			<?php if ( is_user_logged_in() ) : ?>
 				<?php if ( !bp_get_activity_is_favorite() ) : ?>
 
-					<a href="<?php bp_activity_favorite_link() ?>" class="button fav" title="<?php esc_attr_e( 'Mark as Favorite', 'buddypress' ) ?>"><?php _e( 'Favorite', 'buddypress' ) ?></a>
+					<a href="<?php bp_activity_favorite_link(); ?>" class="button fav" title="<?php esc_attr_e( 'Mark as Favorite', 'buddypress' ); ?>"><?php _e( 'Favorite', 'buddypress' ); ?></a>
 
 				<?php else : ?>
 
-					<a href="<?php bp_activity_unfavorite_link() ?>" class="button unfav" title="<?php esc_attr_e( 'Remove Favorite', 'buddypress' ) ?>"><?php _e( 'Remove Favorite', 'buddypress' ) ?></a>
+					<a href="<?php bp_activity_unfavorite_link(); ?>" class="button unfav" title="<?php esc_attr_e( 'Remove Favorite', 'buddypress' ); ?>"><?php _e( 'Remove Favorite', 'buddypress' ); ?></a>
 
 				<?php endif; ?>
 			<?php endif;?>
@@ -50,13 +50,13 @@
 
 			<?php if ( bp_get_activity_type() == 'new_forum_topic' || bp_get_activity_type() == 'new_forum_reply' ) : ?>
 
-				<a href="<?php bp_activity_thread_permalink() ?>" class="button view-thread"><?php _e( 'View Topic' ); ?></a>
+				<a href="<?php bp_activity_thread_permalink(); ?>" class="button view-thread"><?php _e( 'View Topic' ); ?></a>
 
 			<?php else : ?>
 
 				<?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
 
-					<a href="<?php bp_activity_comment_link() ?>" class="button acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Comment', 'buddypress' ) ?> (<span><?php bp_activity_comment_count() ?></span>)</a>
+					<a href="<?php bp_activity_comment_link(); ?>" class="button acomment-reply" id="acomment-comment-<?php bp_activity_id(); ?>"><?php _e( 'Comment', 'buddypress' ); ?> (<span><?php bp_activity_comment_count(); ?></span>)</a>
 
 				<?php endif; ?>
 
@@ -69,7 +69,7 @@
 		</div>
 	</div>
 
-	<?php do_action( 'bp_before_activity_entry_comments' ) ?>
+	<?php do_action( 'bp_before_activity_entry_comments' ); ?>
 
 	<?php if ( bp_activity_can_comment() ) : ?>
 		<div class="activity-comments">
@@ -78,26 +78,26 @@
 				<div class="arrow"></div>
 			<?php endif; ?>
 
-			<?php bp_activity_comments() ?>
+			<?php bp_activity_comments(); ?>
 
 			<?php if ( is_user_logged_in() ) : ?>
-			<form action="<?php bp_activity_comment_form_action() ?>" method="post" id="ac-form-<?php bp_activity_id() ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display() ?>>
-				<div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=50&height=50' ) ?></div>
+			<form action="<?php bp_activity_comment_form_action(); ?>" method="post" id="ac-form-<?php bp_activity_id(); ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display(); ?>>
+				<div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=50&height=50' ); ?></div>
 				<div class="ac-reply-content">
 					<div class="ac-textarea">
-						<textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac_input_<?php bp_activity_id() ?>"></textarea>
+						<textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
 					</div>
-					<input type="submit" name="ac_form_submit" value="<?php esc_attr_e( 'Post', 'buddypress' ) ?> &rarr;" /> &nbsp; <?php _e( 'or press esc to cancel.', 'buddypress' ) ?>
-					<input type="hidden" name="comment_form_id" value="<?php bp_activity_id() ?>" />
+					<input type="submit" name="ac_form_submit" value="<?php esc_attr_e( 'Post', 'buddypress' ); ?> &rarr;" /> &nbsp; <?php _e( 'or press esc to cancel.', 'buddypress' ); ?>
+					<input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
 				</div>
-				<?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
+				<?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
 			</form>
 			<?php endif; ?>
 		</div>
 	<?php endif; ?>
 
-	<?php do_action( 'bp_after_activity_entry_comments' ) ?>
+	<?php do_action( 'bp_after_activity_entry_comments' ); ?>
 </li>
 
-<?php do_action( 'bp_after_activity_entry' ) ?>
+<?php do_action( 'bp_after_activity_entry' ); ?>
 
Index: codex-buddypress-org/bbpress.php
===================================================================
--- codex-buddypress-org/bbpress.php	(revision 12387)
+++ codex-buddypress-org/bbpress.php	(working copy)
@@ -1,4 +1,4 @@
-<?php get_header() ?>
+<?php get_header(); ?>
 
 	<div id="content">