Commit Graph

681 Commits

Author SHA1 Message Date
Jesse McConnell 569a8d14b9 merge up from 9.3.x release 2016-05-19 10:08:51 -05:00
Jesse McConnell 80cadf2c01 merging in from 9.3.x release 2016-05-19 10:05:44 -05:00
Jesse McConnell 4bf91b5ab3 Merge remote-tracking branch 'origin/release-9.3.9' into jetty-9.3.x 2016-05-19 09:55:58 -05:00
Jesse McConnell b837009059 Merge branch 'jetty-9.4.x' 2016-05-19 07:38:21 -05:00
Jesse McConnell 15c9556c38 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-19 07:37:59 -05:00
WalkerWatch d828100e2e Updated Chapter 4 with ventilated prose and updated grammar/formatting.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-18 17:19:49 -04:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell 26e1d8a09e Merge branch 'jetty-9.4.x' 2016-05-17 14:16:32 -05:00
Jesse McConnell 0193532748 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-17 14:16:17 -05:00
Jesse McConnell 643f8e8096 Merge branch 'jetty-9.3.x' into pr/576
# Conflicts:
#
jetty-documentation/src/main/asciidoc/administration/logging/default-log
ging-with-stderrlog.adoc
2016-05-17 14:02:23 -05:00
WalkerWatch af885d5e09 Reformatting of dump-tool for #549.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-16 22:48:33 -04:00
Simone Bordet 5af72ed1fc Merged branch 'jetty-9.4.x' into 'master'. 2016-05-06 17:44:16 +02:00
Simone Bordet 9a5d8f3943 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-06 17:43:49 +02:00
Jesse McConnell 5d3283af0f add screen styling and switch highlighter to something that matchs current screen look and feel 2016-05-06 08:12:16 -05:00
WalkerWatch 31899c1959 Chapter 20 tweaks
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-05 22:13:04 -04:00
Jesse McConnell cae9c0f1d6 support [source, screen] for html rendering 2016-05-05 17:30:08 -05:00
Jesse McConnell 9a03782447 update the xsl stylesheets and try out a source, shell 2016-05-05 15:43:14 -05:00
Jesse McConnell 4bfc1bfa26 added syntax highlighter colors 2016-05-05 13:01:16 -05:00
Greg Wilkins 13d9263d78 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-05 11:37:29 +10:00
Greg Wilkins 15480a7c94 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-05 11:37:00 +10:00
WalkerWatch 16bb2d91d8 Updated maven link and formatting changes for Jetty config.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-04 21:30:51 -04:00
Jesse McConnell 3eafa7ff56 Merge branch 'jetty-9.4.x' 2016-05-02 19:58:23 -05:00
Jesse McConnell 5606975d15 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 19:57:51 -05:00
Jesse McConnell dc258d884e update the guide for contributions 2016-05-02 12:36:45 -05:00
Joakim Erdfelt 114ac79808 Merge branch 'jetty-9.4.x' 2016-05-02 09:53:02 -07:00
Joakim Erdfelt 932e0125d2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 09:51:24 -07:00
Jesse McConnell ef84beb7d4 update alpn table 2016-05-01 08:35:51 -05:00
Jesse McConnell 7b7d9e58c5 Update pom.xml 2016-04-29 17:01:20 -05:00
Jesse McConnell ef51dd82ac Update pom.xml 2016-04-29 17:00:55 -05:00
Jesse McConnell bf2740148a Issue #436 Migrate Jetty Documentation 2016-04-29 07:07:27 -05:00