Skip to content
This repository
Browse code

Merge branch 'extra' into lib; added version number 0.1 for lib branch.

Conflicts:
	Readme.md
	michelf/Markdown.php
  • Loading branch information...
commit 0b6ce2ee109230ab25114359fa1741e772397b07 2 parents 4ded9bd + f5c6892
Michel Fortin authored January 12, 2013
4  License.md
Source Rendered
... ...
@@ -1,6 +1,6 @@
1 1
 PHP Markdown & Extra  
2  
-Copyright (c) 2004-2009 Michel Fortin  
3  
-<http://michelf.com/>  
  2
+Copyright (c) 2004-2013 Michel Fortin  
  3
+<http://michelf.ca/>  
4 4
 All rights reserved.
5 5
 
6 6
 Based on Markdown  
23  Readme.md
Source Rendered
... ...
@@ -1,11 +1,10 @@
1 1
 PHP Markdown & Extra
2 2
 ====================
3 3
 
4  
-PHP Markdown & Extra version 1.0.1o - Sun 8 Jan 2012  
5  
-PHP Markdown Extra version 1.2.5 - Sun 8 Jan 2012
  4
+PHP Markdown Lib 0.1 - Sun 13 Jan 2013
6 5
 
7 6
 by Michel Fortin  
8  
-<http://michelf.com/>
  7
+<http://michelf.ca/>
9 8
 
10 9
 based on Markdown by John Gruber  
11 10
 <http://daringfireball.net/>
@@ -26,9 +25,9 @@ tool, written in Perl, that converts the plain text markup to HTML.
26 25
 PHP Markdown is a port to PHP of the original Markdown program by 
27 26
 John Gruber.
28 27
 
29  
-PHP Markdown can work as a plug-in for WordPress and bBlog, as a 
30  
-modifier for the Smarty templating engine, or as a replacement for
31  
-Textile formatting in any software that supports Textile.
  28
+PHP Markdown can work as a plug-in for WordPress, as a modifier for
  29
+the Smarty templating engine, or as a replacement for Textile
  30
+formatting in any software that supports Textile.
32 31
 
33 32
 Full documentation of Markdown's syntax is available on John's 
34 33
 Markdown page: <http://daringfireball.net/projects/markdown/>
@@ -100,7 +99,7 @@ Bugs
100 99
 ----
101 100
 
102 101
 To file bug reports please send email to:
103  
-<michel.fortin@michelf.com>
  102
+<michel.fortin@michelf.ca>
104 103
 
105 104
 Please include with your report: (1) the example input; (2) the output you
106 105
 expected; (3) the output PHP Markdown actually produced.
@@ -113,7 +112,9 @@ See Installation and Requirement above for details.
113 112
 Version History
114 113
 ---------------
115 114
 
116  
-Current Extra:
  115
+Lib 0.1 (13 Jan 2013):
  116
+
  117
+Extra 1.2.6 (13 Jan 2013):
117 118
 
118 119
 *	Headers can now have a class attribute. You can add a class inside the
119 120
 	extra attribute block which can optionally be put after a header:
@@ -162,7 +163,7 @@ Current Extra:
162 163
 *	Fixed an issue where no_markup mode was ineffective.
163 164
 
164 165
 
165  
-Current:
  166
+1.0.1p (13 Jan 2013):
166 167
 
167 168
 *	Created a library-style unified package that will work with namespace-based 
168 169
 	autoloading introduced in PHP 5.3. This is the same parser, but packaged
@@ -737,8 +738,8 @@ Copyright and License
737 738
 ---------------------
738 739
 
739 740
 PHP Markdown & Extra  
740  
-Copyright (c) 2004-2009 Michel Fortin  
741  
-<http://michelf.com/>  
  741
+Copyright (c) 2004-2013 Michel Fortin  
  742
+<http://michelf.ca/>  
742 743
 All rights reserved.
743 744
 
744 745
 Based on Markdown  
11  michelf/Markdown.php
@@ -2,11 +2,11 @@
2 2
 #
3 3
 # Markdown  -  A text-to-HTML conversion tool for web writers
4 4
 #
5  
-# PHP Markdown
6  
-# Copyright (c) 2004-2012 Michel Fortin  
  5
+# PHP Markdown  
  6
+# Copyright (c) 2004-2013 Michel Fortin  
7 7
 # <http://michelf.com/projects/php-markdown/>
8 8
 #
9  
-# Original Markdown
  9
+# Original Markdown  
10 10
 # Copyright (c) 2004-2006 John Gruber  
11 11
 # <http://daringfireball.net/projects/markdown/>
12 12
 #
@@ -20,8 +20,9 @@
20 20
 # class: \michelf\Markdown::MARKDOWN_VERSION.
21 21
 #
22 22
 
23  
-const  MARKDOWN_VERSION  =  "1.0.1o";  # Sun 8 Jan 2012
24  
-const  MARKDOWNEXTRA_VERSION  =  "1.2.5";  # Sun 8 Jan 2012
  23
+const  MARKDOWNLIB_VERSION  =  "0.1";  # Sun 13 Jan 2013
  24
+const  MARKDOWN_VERSION  =  "1.0.1p";  # Sun 13 Jan 2013
  25
+const  MARKDOWNEXTRA_VERSION  =  "1.2.6";  # Sun 13 Jan 2013
25 26
 
26 27
 
27 28
 #

0 notes on commit 0b6ce2e

Please sign in to comment.
Something went wrong with that request. Please try again.