Merge branch 'master' of https://github.com/petdance/perl101

Conflicts: crank
shlomif · Nov 10, 2010 · 0acbfe8 · 0acbfe8
2 parents 87b70b8 + 5075c87
commit 0acbfe8
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 211 deletions.
diff --git a/Makefile b/Makefile
@@ -7,13 +7,12 @@ SOURCE=s
 
 default: crank
 
-crank: clean
-	mkdir -p $(BUILD)/ || true > /dev/null 2>&1
-	perl crank --podpath=$(SOURCE) --buildpath=$(BUILD)
+crank:
+	podium clean build
 	cp -R static/* $(BUILD)/
 
 clean:
-	rm -fr $(BUILD)
+	podium clean
 
 test: crank
 	prove t/html.t

diff --git a/config.yaml b/config.yaml
@@ -0,0 +1,40 @@
+podpath: s
+buildpath: build
+templatepath: tt
+
+pages:
+    - Index
+    - How to get Perl
+    - Terms
+    - Documentation
+    - Strings
+    - Numbers
+    - Arrays
+    - Hashes
+    - Regexes
+    - Flow Control
+    - Files
+    - Subroutines
+    - POD
+    - Debugging
+    - Modules
+    - 'Modules: Making your own'
+    - External programs
+    - CPAN
+    - Constructs
+    - References
+    - Objects
+    - Special Variables
+    - Command-line Switches
+    - Advanced Functions
+    - Style
+    - Performance
+    - Traps
+    - Email
+    - How do I...?
+    - Developer Tools
+    - Websites
+    - Publications
+    - Community
+    - Random
+    - TODO
diff --git a/crank b/crank
diff --git a/s/documentation.pod b/s/documentation.pod
@@ -55,7 +55,7 @@ L<http://search.cpan.org>.
 
 =head2 Online documentation
 
-There are some websites that HTMLify the Perl documentation.  Thw
+There are some websites that HTMLify the Perl documentation. The
 two biggest ones:
 
 =over
@@ -65,3 +65,11 @@ two biggest ones:
 =item * L<http://search.cpan.org/> for modules
 
 =back
+
+=head2 Writing your own documentation
+
+Perl has a strong culture of documenting everything, and you are
+encouraged to get into this habit early on. You'll write your
+documentation using a format called POD, which is discussed <a 
+href="pod.html">in its own page</a>.
+
diff --git a/s/files.pod b/s/files.pod
@@ -61,7 +61,7 @@ or
     my $file_as_string = join '', <FILE>;
 
 Of those two, choose the former.  The second one reads all the lines
-into an array, and the glomps together a big string.  The first one
+into an array, and then glomps together a big string.  The first one
 just reads into a string, without creating the intervening list of lines.
 
 The best way yet is like so:

diff --git a/s/index.pod b/s/index.pod
@@ -17,6 +17,7 @@ to this site, drop Andy Lester a note at andy [at] perl.org.
 =head1 Thanks
 
 Thanks to the following folks for their contributions:
+Rich Bowen,
 Drew Stephens,
 Usman Jan,
 Adam SjE<oslash>gren,

diff --git a/s/todo.pod b/s/todo.pod
@@ -1,5 +1,11 @@
 =head1 Things to do here at perl101.org
 
+=head2 Handle Perl 6
+
+Ultimately I'd like to have perl101 show both the Perl 6 and Perl
+5 ways of doing things.  This way we show new people to Perl 6 how
+to do things, and can also act as a Perl 5-to-Perl 6 phrasebook.
+
 =head1 Site functionality
 
 =head2 Include the FAQ

diff --git a/tt/footer.tt b/tt/footer.tt
@@ -1,11 +1,18 @@
 <div id="footer">
+    <p>&copy; 2007-2010 Andy Lester</p>
 </div>
 <script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-631706-2']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script');
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
+        'http://www') + '.google-analytics.com/ga.js';
+    ga.setAttribute('async', 'true');
+    document.documentElement.firstChild.appendChild(ga);
+  })();
+
 </script>
-<script type="text/javascript">
-try {
-    var pageTracker = _gat._getTracker("UA-631706-2");
-    pageTracker._trackPageview();
-} catch(err) {}</script>
diff --git a/tt/page.ttml b/tt/page.ttml
@@ -83,10 +83,6 @@
                     <!-- Start content -->
                     [% content %]
                     [% INCLUDE 'feedback.tt' %]
-                    <div id="footer">
-                        <!-- Start Footer -->
-                        <p>&copy; 2007-2010 Andy Lester</p>
-                    </div><!-- End Footer -->
                 </div><!-- End content -->
             </div><!-- End main content wrapper -->
         </div><!-- End container -->