Commit Graph

310 Commits

Author SHA1 Message Date
Jesse McConnell 15866e6187 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-22 11:36:31 -05:00
Jesse McConnell 2dc45f3780 Update what-version.adoc 2016-09-22 11:36:03 -05:00
Jesse McConnell 48a455c6aa Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-22 11:07:42 -05:00
Shauway 94324c82f0 Two way authentication configuration (#925)
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-22 11:05:02 -05:00
Jesse McConnell 9d23147d19 Merge pull request #916 from WalkerWatch/docupdates/Sessions
Further updates to Sessions documentation
2016-09-22 11:02:03 -05:00
WalkerWatch cdb86f810d Further updates to Sessions documentation
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-22 11:55:53 -04:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Simone Bordet 14e000428f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 17:26:00 +02:00
Simone Bordet cb89ea8466 Fixes #131 - Improve Connector Statistic names and values.
Removed references to deprecated ConnectorStatistic in favor of
ConnectionStatistics.
2016-09-14 17:24:45 +02:00
WalkerWatch f0e270c380 Updates for 9.4 Sessions
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-07 10:41:38 -04:00
WalkerWatch f08fc31e9d Additional Sessions documentation for 9.4.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-06 14:35:00 -04:00
WalkerWatch 297c5ba762 Resolves #653. (#873)
* Resolves #653.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Issue #653 updates.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-05 19:07:04 +10:00
Jesse McConnell ecbac9ea55 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-02 10:57:30 -05:00
Jesse McConnell 96bde3263a fix up documentation after the docbx-maven-plugin changed where it generated source 2016-09-02 10:57:02 -05:00
Greg Wilkins 25574d2843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 14:57:44 +10:00
WalkerWatch 20cd7bcb35 Resolves #872 and cleans up XML chapter. (#891)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-02 12:16:19 +10:00
Jesse McConnell 174a3bc9be merge 9.3.x 2016-08-26 14:35:49 -05:00
WalkerWatch 635cdc628d Resolves #860
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-22 11:47:18 -04:00
Joakim Erdfelt d3f725637c Updating docbkx-maven-plugin version 2016-08-19 13:41:41 -07:00
Jesse McConnell c80fe2b0b9 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-18 14:34:57 -05:00
Jesse McConnell 2b9a4ead3d Resolve #725 add page for reporting security issues 2016-08-18 13:53:08 -05:00
Jesse McConnell d0beca546d merge from 9.3.x 2016-08-18 10:09:07 -05:00
Jesse McConnell 2bfdc41a45 Merge pull request #849 from WalkerWatch/jetty-9.4.x
Clean up of Startup examples.
2016-08-18 10:06:09 -05:00
Jesse McConnell 10a86e73fc Merge pull request #852 from WalkerWatch/issues/843
Resolves #843
2016-08-18 10:05:54 -05:00
Jesse McConnell c1c5e76c4c Merge pull request #838 from WalkerWatch/docupdates/Sessions
Sessions redux rough drafts.
2016-08-18 10:05:38 -05:00
WalkerWatch 1635bc6b12 Resolves #843
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 11:00:45 -04:00
WalkerWatch 483cc3abbf Updates for Sessions overhaul.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 10:57:03 -04:00
WalkerWatch 5dbe4aa5fa Clean up of Startup examples.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-16 16:19:55 -04:00
WalkerWatch 405de2db8f Sessions redux rough drafts.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-12 12:59:16 -04:00
Jesse McConnell 4c6f6fc290 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-10 09:59:04 -05:00
Jesse McConnell 1bff5c0d6a Merge pull request #823 from WalkerWatch/docupdates/Cleanup
Doc flow cleanup.
2016-08-10 09:58:39 -05:00
WalkerWatch ed3168a57b Doc flow cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-08 17:09:57 -04:00
WalkerWatch c8036e540f Updates for Jetty Handlers.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:04:11 -04:00
Jesse McConnell 6108b9a234 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-02 14:48:14 -05:00
WalkerWatch 271728ef7d Jetty and Maven updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-01 17:55:54 -04:00
Jesse McConnell 0ecc8caff6 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-29 16:13:38 -05:00
WalkerWatch 5edc2a0bb3 Chapter 22 revisions and misc adoc updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-29 16:40:25 -04:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Jesse McConnell a2d37ad98d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-28 12:20:08 -05:00
Jesse McConnell b45fbbfd04 Merge pull request #781 from WalkerWatch/docupdates/Chapter20
Chapter 20 cleanup.
2016-07-28 12:19:21 -05:00
WalkerWatch 431d2fb016 Chapter 20 cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 13:29:12 -04:00
WalkerWatch 98005ea9ab Resolves #761
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 07:58:24 -04:00
Greg Wilkins 8d380220c4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 10:35:37 +10:00
WalkerWatch 5a1263b4bd Docupdates/jetty runner (#772)
* Updates to Servlets/Filters/Handlers in Chapter 17.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Jetty Runner doc updates.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 10:28:40 +10:00
Jesse McConnell e9140a30b2 merging 9.3 to 9.4 2016-07-26 07:53:17 -05:00
Jesse McConnell 0adee58367 Merge pull request #769 from WalkerWatch/jetty-9.3.x
Fixing doc rendering issue.
2016-07-26 07:51:46 -05:00
Jesse McConnell 043b494c57 Merge pull request #763 from WalkerWatch/docupdates/chapter17
Chapter 17 cleanup.
2016-07-26 07:51:38 -05:00
WalkerWatch 288ebe8d30 Fixing doc rendering issue.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-26 08:48:03 -04:00
Jesse McConnell f3fe72a708 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 17:32:27 -05:00
WalkerWatch 232ca5b1d8 Resolves #764."
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 18:14:14 -04:00
WalkerWatch e368f3d8ee Chapter 17 cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 14:53:18 -04:00
Jesse McConnell 85af98b483 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 12:08:40 -05:00
Jesse McConnell e800e616d6 Merge pull request #758 from WalkerWatch/docupdates/chapter16
Chapter 16 updates
2016-07-22 12:08:11 -05:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
WalkerWatch 7c9f3ec727 Chapter 16 updates
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 17:19:25 -04:00
WalkerWatch 127028d4d9 Chapter 15 cleanup
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 12:34:30 -04:00
Simone Bordet cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00
WalkerWatch fa24eb3541 Resolves #747.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 18:14:47 -04:00
Jesse McConnell 4a2d471537 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-20 15:17:57 -05:00
WalkerWatch 77a8556ffe Updates images for chapter 14.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 16:11:49 -04:00
WalkerWatch 92af8eb8fc Updates for Chapter 14.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 16:09:01 -04:00
Simone Bordet 11d0569a75 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-20 13:18:26 +02:00
Simone Bordet c09251fbaf Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:17:31 +02:00
Jesse McConnell 9071456f8f resolve merge conflict 2016-07-19 14:32:50 -05:00
WalkerWatch 45d4415781 Chapter 13 clean up and addition of {MVNCENTRAL} attribute.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-19 15:02:33 -04:00
Simone Bordet 0d8f1b9e69 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-19 10:34:19 +02:00
WalkerWatch 554d0ab4c1 Chapter 12 Updates (#738)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-19 08:42:52 +10:00
WalkerWatch 087fd07007 Chapter 12 Updates
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-18 16:37:37 -04:00
Jesse McConnell 8718f4e1bf Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-15 14:32:30 -05:00
WalkerWatch 7ba4e9c8d2 Minor edits to RequestLog documentation.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:29:22 -04:00
WalkerWatch 00b3738536 Updated RequestLog xml/module/documentation. Resolves #734
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:08:30 -04:00
Jesse McConnell d178f23ec7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:29:38 -05:00
Jesse McConnell 37d0caedee Merge pull request #728 from WalkerWatch/jetty-9.3.x
Fixing SRCDIR references.
2016-07-14 11:28:47 -07:00
WalkerWatch ff200043de Fixing SRCDIR references.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-14 14:25:20 -04:00
Jesse McConnell 73d546ceac update for proper branch 2016-07-14 13:18:34 -05:00
Jesse McConnell 37015b8536 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:18:03 -05:00
Jesse McConnell 312028df15 Update pom.xml 2016-07-14 13:17:10 -05:00
Jesse McConnell 55d9ba9307 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 12:47:43 -05:00
Jesse McConnell 1000ba52e0 Merge pull request #719 from WalkerWatch/jetty-9.3.x
Chapter 9 cleanup and removed doc reference to disablejsr for #706.
2016-07-14 10:45:48 -07:00
WalkerWatch 49f55cf5fc Removed references to Glassfish, updated Java versions.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-14 08:12:10 -04:00
WalkerWatch a17dd2775c Chapter 9 part II
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-13 15:45:13 -04:00
Simone Bordet 92b0be6f69 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-13 12:35:38 +02:00
Simone Bordet 22c78d79f0 Fixes #718 - Document HttpClient transports. 2016-07-13 12:35:12 +02:00
WalkerWatch b041ecbe76 Removing doc reference to disablejsr for #706.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-12 21:12:52 -04:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 27195a3b04 Merge pull request #712 from WalkerWatch/jetty-9.3.x
Chapter 8 and 9 cleanup.
2016-07-12 16:32:35 -07:00
WalkerWatch 00551d73b2 Chapter 9 clean up and fixes Part I
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-12 19:12:15 -04:00
Simone Bordet c77562bc95 Issue #684 - HttpClient proxies (HttpProxy and Socks4Proxy) do not support authentication.
The feature was already present, improved documentation.
2016-07-12 23:22:43 +02:00
Joakim Erdfelt bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
WalkerWatch 83d99159f6 First pass of Chapter 8 cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-11 17:49:59 -04:00
WalkerWatch aa6685e1f8 Chapter 7 clean up, prose fix.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-11 16:45:23 -04:00
Joakim Erdfelt bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
WalkerWatch ced94f0eb8 Chapter 6 fixes, removal of Quickstart pieces for #679.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-08 16:37:54 -04:00
Joakim Erdfelt 66dfe7a5c2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-08 08:45:39 -07:00
WalkerWatch e4807076b2 Resolves #701
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-08 10:47:49 -04:00
Greg Wilkins 16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
WalkerWatch db9a8dc962 Updates to Intro, Chapter 5 and ResourceHandler example for #687.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-07 16:34:58 -04:00
WalkerWatch f73423be9c Chapter 4 updates and corrections.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-07 12:41:14 -04:00
Greg Wilkins 8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
WalkerWatch c96e58fa37 Chapter 2 and 3 updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-06 14:00:50 -04:00
Jan Bartel 44e95a2fcd Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-05 18:01:13 +10:00
Joakim Erdfelt 173a5d8724 Merge pull request #683 from WalkerWatch/jetty-9.3.x
Updated Chapter listing & misc changes
2016-07-01 08:52:48 -07:00
WalkerWatch 2214dda719 Merge branch 'jetty-9.3.x' of https://github.com/WalkerWatch/jetty.project into jetty-9.3.x 2016-07-01 11:25:55 -04:00
WalkerWatch f830bb35d5 Updated chapter listing
Signed-off-by: WalkerWatch <chris@webtide.com>
2016-07-01 11:23:43 -04:00
Joakim Erdfelt 2aa2f12eca Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:12:37 -07:00
Jan Bartel ae4472ca28 Issue #658
Added documentation.
2016-06-29 15:46:15 +10:00
WalkerWatch 1f74d10358 Fixing link and grammatical changes for JMX Dump; added updated diagram for configuration. (#666)
* Fixing link and grammatical changes.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Updating diagram of configuration elements.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-29 09:35:04 +10:00
WalkerWatch 9ce27beb3b Updating diagram of configuration elements.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-25 20:55:41 -04:00
WalkerWatch aa054c85af Fixing link and grammatical changes.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-25 20:44:22 -04:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
WalkerWatch 69804f9e76 Chapter 24 touch-ups. (#635)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-15 15:55:11 +10:00
Jesse McConnell 147df2a031 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-09 14:18:27 -05:00
Jesse McConnell 7e3db100ab resolve version expansion across blocks by adding subs= attributes 2016-06-09 14:18:04 -05:00
Jesse McConnell 4283c15fe1 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 15:52:07 -05:00
WalkerWatch ef63395b07 Removed references to SPDY in Chapter 3, updated Chapter 10 with general info on Sessions
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-07 16:40:24 -04:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
WalkerWatch 1d3816fdc5 Chapter 10 clean up and link fixes.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-06 21:20:11 -04:00
Simone Bordet a8f25b550f Fixes #487 - JDK 9 build compatibility.
Fixes #306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Jesse McConnell b4c958e68c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-31 20:38:31 -05:00
WalkerWatch 2508d73a94 Added note for CVE-2016-4800 and several small grammatical clean ups.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-31 20:37:06 -05:00
Simone Bordet bfeccd9e39 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-30 19:11:24 +02:00
Alexander Farber f6e460fc35 Remove Session.setMaximumMessageSize(long) example, because that method has been removed in jetty-9.1
Signed-off-by: Alexander Farber <Alexander.Farber@gmail.com>
2016-05-30 19:10:08 +02:00
Jesse McConnell 68d0ff1373 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-27 15:41:29 -05:00
Jesse McConnell 3e809af7f6 alter the basedir of the documentation zip 2016-05-27 15:40:58 -05:00
Jesse McConnell 6819455c16 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-25 11:39:14 -05:00
WalkerWatch ff495bc92f Fixed bug that was causing docbook elements to duplicate on screen.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-24 21:42:26 -04:00
WalkerWatch 6c9276f946 Quick start re-work and illustration.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-24 21:30:56 -04:00
Simone Bordet 5fe1ff697e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-24 12:42:12 +02:00
WalkerWatch 261db9aa01 Converted chapters 5 and 6 to ventilated prose and cleaned up formatting and grammar.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-22 13:31:27 -04: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 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 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 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 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 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 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 bf2740148a Issue #436 Migrate Jetty Documentation 2016-04-29 07:07:27 -05:00