Merge branch 'master', remote branch 'jonallen/master'

barbie · Mar 27, 2011 · 5be0fb4 · 5be0fb4
2 parents 0d0a105 + 4fce6e9
commit 5be0fb4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/build/epub/style.css b/build/epub/style.css
@@ -36,7 +36,9 @@ code {
   font: normal normal normal medium/1.2 Consolas, 'Andale Mono', Monaco, 'Liberation Mono', 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', monospace;
 }
 
-table { font-size: 12px; font-family: sans-serif; }
+table { font-size: 12px; font-family: sans-serif;
+	margin-bottom: 1.2em;
+}
 
 th { background: #CCCCCC; text-align: left;}
 

diff --git a/build/tools/build_epub.pl b/build/tools/build_epub.pl
@@ -281,7 +281,7 @@ sub generate_ebook
 
         $epub->copy_xhtml('./build/xhtml/' . $name,
                           'text/' . $name,
-                          linear => 'no');
+                          linear => 'yes');
     }
 
     # Add Pod headings to table of contents.

diff --git a/sections/accommodation_recommendations.pod b/sections/accommodation_recommendations.pod
@@ -11,7 +11,7 @@ been able to negotiate a deal with a primary hotel so much the better.
 =head2 Recommended Accommodation
 
 A primary conference hotel and a less expensive dorm-style option should form 
-the basis of your recommendations. If there others that are worth considering, 
+the basis of your recommendations. If there are others that are worth considering, 
 especially if the primary hotel cannot accommodate all your attendees, make sure 
 you include them. If the conference venue also includes accommodation in the 
 package make sure you mention this. 

diff --git a/sections/budget_progress.pod b/sections/budget_progress.pod
@@ -141,7 +141,7 @@ can potentially have an additional source of revenue.
 Any profits from YAPC::NA benefit The Perl Foundation directly, while for 
 YAPC::Europe all profits have gone to the local host group for them to fund 
 local activities (such as workshops or buying a projector for technical 
-meetings), with any surplus going to future YAPCs, YEF or the Perl Foundation. 
+meetings), with any surplus going to future YAPCs, YEF or The Perl Foundation. 
 Passing funds to the organisers for the following year provides them with a 
 "float" to be used to book a venue and arrange deposits for any long lead time 
 items.
@@ -151,7 +151,7 @@ items.
 This is a tricky area. If you are setting yourselves up as a Charity or 
 Non-Profit organisation, then you may be able to claim tax exemption. However, 
 this is not always easy and you are best advised to seek legal advice to clarify 
-whether this is possible. If you are organising a Perl event in the US, the TPF 
+whether this is possible. If you are organising a Perl event in the US, then TPF 
 can help to some degree as they are a tax exempt organisation, providing you 
 plan to use their services to benefit from this. Contact them for details. 
 
diff --git a/sections/volunteers.pod b/sections/volunteers.pod
@@ -18,7 +18,6 @@ often be worthwhile.
 
 You may also want to ask the community whether anyone would like to help out. 
 Offer free entrance (or reduced entrance if your budget is tight) for anyone 
-willing to help. This is particularly worth doing if your attendance fee is 
-free. You willing likely find several people offering to help out for a half a 
-day, a full day and may be even the for full conference.
+willing to help. You will likely find several people offering to help out for a half a 
+day, a full day and maybe even the for the full conference.