summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--README.md16
2 files changed, 10 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 80f7564..6723f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ mingw:
cmake .. -DCMAKE_TOOLCHAIN_FILE=../toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$(MINGW_INSTALLDIR) ;\
make && make install
-archive: spec.html $(BUILDDIR) man/man1/cmark.1 man/man3/cmark.3
+archive: spec.html $(BUILDDIR) man/man1/cmark.1 man/make_man_page.py
@rm -rf $(PKGDIR); \
mkdir -p $(PKGDIR)/$(SRCDIR); \
mkdir -p $(PKGDIR)/api_test $(PKGDIR)/man/man1 $(PKGDIR)/man/man3 ; \
@@ -60,8 +60,8 @@ archive: spec.html $(BUILDDIR) man/man1/cmark.1 man/man3/cmark.3
cp -a $(SRCDIR)/scanners.c $(PKGDIR)/$(SRCDIR)/; \
cp -a spec.html $(PKGDIR); \
cp -a man/CMakeLists.txt $(PKGDIR)/man;\
+ cp -a man/make_man_page.py $(PKGDIR)/man;\
cp -a man/man1/cmark.1 $(PKGDIR)/man/man1;\
- cp -a man/man3/cmark.3 $(PKGDIR)/man/man3;\
cp CMakeLists.txt $(PKGDIR); \
perl -ne '$$p++ if /^### JavaScript/; print if (!$$p)' Makefile > $(PKGDIR)/Makefile; \
cp -a Makefile.nmake nmake.bat $(PKGDIR); \
@@ -74,12 +74,6 @@ archive: spec.html $(BUILDDIR) man/man1/cmark.1 man/man3/cmark.3
clean:
rm -rf $(BUILDDIR) $(MINGW_BUILDDIR) $(MINGW_INSTALLDIR) $(TARBALL) $(ZIPARCHIVE) $(PKGDIR)
-man/man1/cmark.1.html: man/man1/cmark.1
- groff -mman -Thtml > $@
-
-man/man3/cmark.3.html: man/man3/cmark.3
- groff -mman -Thtml > $@
-
# We include html_unescape.h in the repository, so this shouldn't
# normally need to be generated.
$(SRCDIR)/html_unescape.h: $(SRCDIR)/html_unescape.gperf
diff --git a/README.md b/README.md
index 8db4c1f..0372225 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ To build the JavaScript library as a single standalone file:
browserify --standalone commonmark js/lib/index.js -o js/commonmark.js
Or fetch a pre-built copy from
-<http://spec.commonmark.org/js/commonmark.js>`.
+<http://spec.commonmark.org/js/commonmark.js>.
To run tests for the JavaScript library:
@@ -142,7 +142,7 @@ actually running the tests, you can do:
and you'll get all the tests in JSON format.
-[The spec]: http://jgm.github.io/CommonMark/spec.html
+[The spec]: http://spec.commonmark.org/0.13/
The source of [the spec] is `spec.txt`. This is basically a Markdown
file, with code examples written in a shorthand form:
@@ -192,13 +192,13 @@ There are only a few places where this spec says things that contradict
the canonical syntax description:
- It [allows all punctuation symbols to be
- backslash-escaped](http://jgm.github.io/CommonMark/spec.html#backslash-escapes),
+ backslash-escaped](http://spec.commonmark.org/0.13/#backslash-escapes),
not just the symbols with special meanings in Markdown. We found
that it was just too hard to remember which symbols could be
escaped.
- It introduces an [alternative syntax for hard line
- breaks](http://jgm.github.io/CommonMark/spec.html#hard-line-breaks), a
+ breaks](http://spec.commonmark.org/0.13/#hard-line-breaks), a
backslash at the end of the line, supplementing the
two-spaces-at-the-end-of-line rule. This is motivated by persistent
complaints about the “invisible” nature of the two-space rule.
@@ -208,11 +208,11 @@ the canonical syntax description:
quotes around a title in inline links, but not in reference links.
This kind of difference is really hard for users to remember, so the
spec [allows single quotes in both
- contexts](http://jgm.github.io/CommonMark/spec.html#links).
+ contexts](http://spec.commonmark.org/0.13/#links).
- The rule for HTML blocks differs, though in most real cases it
shouldn't make a difference. (See
- [here](http://jgm.github.io/CommonMark/spec.html#html-blocks) for
+ [here](http://spec.commonmark.org/0.13/#html-blocks) for
details.) The spec's proposal makes it easy to include Markdown
inside HTML block-level tags, if you want to, but also allows you to
exclude this. It is also makes parsing much easier, avoiding
@@ -232,7 +232,7 @@ the canonical syntax description:
- Rules for content in lists differ in a few respects, though (as with
HTML blocks), most lists in existing documents should render as
intended. There is some discussion of the choice points and
- differences [here](http://jgm.github.io/CommonMark/spec.html#motivation).
+ differences [here](http://spec.commonmark.org/0.13/#motivation).
We think that the spec's proposal does better than any existing
implementation in rendering lists the way a human writer or reader
would intuitively understand them. (We could give numerous examples
@@ -254,7 +254,7 @@ the canonical syntax description:
- The start number of an ordered list is significant.
-- [Fenced code blocks](http://jgm.github.io/CommonMark/spec.html#fenced-code-blocks) are supported, delimited by either
+- [Fenced code blocks](http://spec.commonmark.org/0.13/#fenced-code-blocks) are supported, delimited by either
backticks (```` ``` ```` or tildes (` ~~~ `).
Contributing