Minor updates

author: Matt Rude <[email protected]> 2016-11-12 12:47:44 -0600
committer: Matt Rude <[email protected]> 2016-11-12 12:47:44 -0600
commit: a866e35971886f7a82f228967ec3d4a5661fa37c (patch)
tree: 3563bf7b9d9fab3dbd80e40cfc18297de75711e3
parent: b867699a06dd2a21a36b21822dcc2cb46af14870 (diff)
download: xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.tar.gz
xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.tar.bz2
xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.zip
7 files changed, 360 insertions, 68 deletions
diff --git a/Gemfile b/Gemfile
index 0e6f73f..bddfc3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,6 @@ gem "rouge"
 gem "kramdown"
 gem "therubyracer"
 gem "jekyll"
-gem "jekyll-press"
 gem "jekyll-sitemap"
 gem "jekyll-less"
+gem "jekyll-minifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index a1ec2c5..d7b5eb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,87 +1,84 @@
 GEM
 remote: https://rubygems.org/
 specs:
- actioncable (5.0.0)
- actionpack (= 5.0.0)
+ actioncable (5.0.0.1)
+ actionpack (= 5.0.0.1)
 nio4r (~> 1.2)
 websocket-driver (~> 0.6.1)
- actionmailer (5.0.0)
- actionpack (= 5.0.0)
- actionview (= 5.0.0)
- activejob (= 5.0.0)
+ actionmailer (5.0.0.1)
+ actionpack (= 5.0.0.1)
+ actionview (= 5.0.0.1)
+ activejob (= 5.0.0.1)
 mail (~> 2.5, >= 2.5.4)
 rails-dom-testing (~> 2.0)
- actionpack (5.0.0)
- actionview (= 5.0.0)
- activesupport (= 5.0.0)
+ actionpack (5.0.0.1)
+ actionview (= 5.0.0.1)
+ activesupport (= 5.0.0.1)
 rack (~> 2.0)
 rack-test (~> 0.6.3)
 rails-dom-testing (~> 2.0)
 rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.0)
- activesupport (= 5.0.0)
+ actionview (5.0.0.1)
+ activesupport (= 5.0.0.1)
 builder (~> 3.1)
 erubis (~> 2.7.0)
 rails-dom-testing (~> 2.0)
 rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (5.0.0)
- activesupport (= 5.0.0)
+ activejob (5.0.0.1)
+ activesupport (= 5.0.0.1)
 globalid (>= 0.3.6)
- activemodel (5.0.0)
- activesupport (= 5.0.0)
- activerecord (5.0.0)
- activemodel (= 5.0.0)
- activesupport (= 5.0.0)
+ activemodel (5.0.0.1)
+ activesupport (= 5.0.0.1)
+ activerecord (5.0.0.1)
+ activemodel (= 5.0.0.1)
+ activesupport (= 5.0.0.1)
 arel (~> 7.0)
- activesupport (5.0.0)
+ activesupport (5.0.0.1)
 concurrent-ruby (~> 1.0, >= 1.0.2)
 i18n (~> 0.7)
 minitest (~> 5.1)
 tzinfo (~> 1.1)
- arel (7.0.0)
+ addressable (2.4.0)
+ arel (7.1.1)
 builder (3.2.2)
- colorator (0.1)
+ colorator (1.1.0)
 commonjs (0.2.7)
 concurrent-ruby (1.0.2)
- css_press (0.3.2)
- csspool-st (= 3.1.2)
- json
- csspool-st (3.1.2)
+ cssminify (1.0.2)
 erubis (2.7.0)
 execjs (2.7.0)
- ffi (1.9.10)
- globalid (0.3.6)
+ ffi (1.9.14)
+ forwardable-extended (2.6.0)
+ globalid (0.3.7)
 activesupport (>= 4.1.0)
- html_press (0.8.2)
- htmlentities
- multi_css (>= 0.1.0)
- multi_js (>= 0.1.0)
- htmlentities (4.3.4)
+ htmlcompressor (0.3.0)
 i18n (0.7.0)
- jekyll (3.1.6)
- colorator (~> 0.1)
+ jekyll (3.2.1)
+ colorator (~> 1.0)
 jekyll-sass-converter (~> 1.0)
 jekyll-watch (~> 1.1)
 kramdown (~> 1.3)
 liquid (~> 3.0)
 mercenary (~> 0.3.3)
+ pathutil (~> 0.9)
 rouge (~> 1.7)
 safe_yaml (~> 1.0)
 jekyll-less (0.0.4)
 jekyll (>= 0.10.0)
 less (>= 2.0.5)
- jekyll-press (0.2.1)
- html_press (>= 0.8.2)
- jekyll
- multi_css (>= 0.1.0)
- multi_js (>= 0.1.0)
+ jekyll-minifier (0.0.9)
+ cssminify (~> 1.0)
+ htmlcompressor (~> 0.3)
+ jekyll (~> 3.0)
+ uglifier (~> 2.7)
 jekyll-sass-converter (1.4.0)
 sass (~> 3.4)
- jekyll-sitemap (0.10.0)
- jekyll-watch (1.4.0)
+ jekyll-sitemap (0.11.0)
+ addressable (~> 2.4.0)
+ jekyll-watch (1.5.0)
 listen (~> 3.0, < 3.1)
- json (2.0.1)
- kramdown (1.11.1)
+ json (2.0.2)
+ kramdown (1.12.0)
 less (2.6.0)
 commonjs (~> 0.2.7)
 libv8 (3.16.14.15)
@@ -100,38 +97,36 @@ GEM
 mime-types-data (3.2016.0521)
 mini_portile2 (2.1.0)
 minitest (5.9.0)
- multi_css (0.1.0)
- css_press
- multi_js (0.1.0)
- uglifier (~> 2)
 nio4r (1.2.1)
 nokogiri (1.6.8)
 mini_portile2 (~> 2.1.0)
 pkg-config (~> 1.1.7)
+ pathutil (0.14.0)
+ forwardable-extended (~> 2.6)
 pkg-config (1.1.7)
 rack (2.0.1)
 rack-test (0.6.3)
 rack (>= 1.0)
- rails (5.0.0)
- actioncable (= 5.0.0)
- actionmailer (= 5.0.0)
- actionpack (= 5.0.0)
- actionview (= 5.0.0)
- activejob (= 5.0.0)
- activemodel (= 5.0.0)
- activerecord (= 5.0.0)
- activesupport (= 5.0.0)
+ rails (5.0.0.1)
+ actioncable (= 5.0.0.1)
+ actionmailer (= 5.0.0.1)
+ actionpack (= 5.0.0.1)
+ actionview (= 5.0.0.1)
+ activejob (= 5.0.0.1)
+ activemodel (= 5.0.0.1)
+ activerecord (= 5.0.0.1)
+ activesupport (= 5.0.0.1)
 bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.0)
+ railties (= 5.0.0.1)
 sprockets-rails (>= 2.0.0)
 rails-dom-testing (2.0.1)
 activesupport (>= 4.2.0, < 6.0)
 nokogiri (~> 1.6.0)
 rails-html-sanitizer (1.0.3)
 loofah (~> 2.0)
- railties (5.0.0)
- actionpack (= 5.0.0)
- activesupport (= 5.0.0)
+ railties (5.0.0.1)
+ actionpack (= 5.0.0.1)
+ activesupport (= 5.0.0.1)
 method_source
 rake (>= 0.8.7)
 thor (>= 0.18.1, < 2.0)
@@ -143,10 +138,10 @@ GEM
 rouge (1.11.1)
 safe_yaml (1.0.4)
 sass (3.4.22)
- sprockets (3.6.3)
+ sprockets (3.7.0)
 concurrent-ruby (~> 1.0)
 rack (> 1, < 3)
- sprockets-rails (3.1.1)
+ sprockets-rails (3.2.0)
 actionpack (>= 4.0)
 activesupport (>= 4.0)
 sprockets (>= 3.0.0)
@@ -170,7 +165,7 @@ PLATFORMS
 DEPENDENCIES
 jekyll
 jekyll-less
- jekyll-press
+ jekyll-minifier
 jekyll-sitemap
 kramdown
 rails
@@ -178,4 +173,4 @@ DEPENDENCIES
 therubyracer
 
 BUNDLED WITH
- 1.12.5
+ 1.13.0
diff --git a/_config.yml b/_config.yml
index fcdeac3..0d4386f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -37,7 +37,8 @@ exclude:
 
 gems:
 - jekyll-sitemap
-- jekyll-less
+- jekyll-minifier
+#- jekyll-less
 #- jekyll-press
 #- jekyll-redirect-from
 #- jekyll-last-modified-at
diff --git a/css/main.css b/css/main.css
new file mode 100644
index 0000000..01afbc8
--- /dev/null
+++ b/css/main.css
@@ -0,0 +1,273 @@
+body {
+ color: black;
+ background: #ffffff;
+ font-family: "lucida grande", Calibri, "segoe UI", "lucida sans unicode", "Droid Sans", "DejaVu Sans", "bitstream vera sans", verdana, arial, helvetica, sans-serif;
+ margin: 0;
+ font-size: 1em; }
+
+#content {
+ color: black;
+ background: #ffffff;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ margin-right: auto;
+ margin-left: auto;
+ padding: 0 1em;
+ line-height: 1.3em;
+ text-align: left;
+ max-width: 800px;
+ min-width: 240px;
+ position: relative; }
+
+#header h4 {
+ -webkit-margin-before: -0.8em;
+ -webkit-margin-after: 1.0em; }
+
+#title h1 {
+ text-align: left;
+ margin-bottom: 8px;
+ padding: 2px;
+ padding-top: 10px;
+ border-bottom: 1px solid #CCC;
+ line-height: 1.1em; }
+#title i {
+ color: #A9A9A9;
+ font-size: 0.8em; }
+
+h2 {
+ font-weight: normal;
+ margin-bottom: 8px;
+ padding: 2px;
+ padding-top: 10px;
+ border-bottom: 1px solid #CCC; }
+ h2 small {
+ font-size: 0.8em;
+ color: #777; }
+
+h3 small {
+ font-size: 0.8em;
+ color: #777; }
+
+td {
+ padding: 5px; }
+ td.PASSED {
+ background-color: green;
+ color: white; }
+ td.FAILED {
+ background-color: red;
+ color: white; }
+
+a {
+ text-decoration: none;
+ color: #0078e7; }
+
+a, a:visited {
+ color: #0078e7;
+ background: inherit; }
+
+a:hover {
+ text-decoration: underline;
+ color: #0078e7; }
+
+#footer {
+ font-size: 80%;
+ border-top: 1px solid #CCC; }
+
+.footer-left {
+ text-align: left;
+ float: left;
+ width: 49%; }
+
+.footer-right {
+ display: block;
+ text-align: right;
+ float: right;
+ width: 49%; }
+
+img {
+ border-width: 0px; }
+
+.center {
+ text-align: center; }
+
+.big {
+ font-size: larger; }
+
+.small {
+ font-size: small; }
+
+.quote {
+ max-width: 75%;
+ text-align: center; }
+
+div.code, p code {
+ font-family: Monaco, Consolas, 'Lucida Console', "Droid Sans Mono", "DejaVu Sans Mono", Courier, monospace;
+ font-size: 14px;
+ background-color: #eee;
+ border: 1px solid #999;
+ padding: 0 2px;
+ margin: 0 2px; }
+
+div#sksoutput pre, div#sksoutput code {
+ font-size: 12px; }
+
+pre, pre.code {
+ font-family: Monaco, Consolas, 'Lucida Console', "Droid Sans Mono", "DejaVu Sans Mono", Courier, monospace;
+ font-size: 14px;
+ width: auto;
+ overflow: auto;
+ background-color: #eee;
+ color: inherit;
+ border: 1px solid #999;
+ line-height: 1.3em;
+ padding: 5px; }
+
+pre.code {
+ border: 0; }
+
+fieldset {
+ border: 1px dotted #bedce7;
+ padding: 10px 15px;
+ color: inherit; }
+
+h1 {
+ line-height: 1em; }
+ h1 a {
+ text-decoration: none; }
+ h1 small {
+ color: #777;
+ font-size: 0.7em; }
+
+h4 small {
+ line-height: 1;
+ color: #777; }
+
+table {
+ background: #fff;
+ margin-bottom: 1.25rem;
+ border: solid 1px #ddd;
+ table-layout: auto; }
+ table thead {
+ background: #f5f5f5; }
+ table tr:nth-of-type(even) {
+ background: #F9F9F9; }
+
+#form {
+ display: table; }
+ #form.extract {
+ max-width: 430px;
+ margin: 0 auto; }
+ #form.extract .options {
+ border: 1px solid #CCC;
+ display: inline-block;
+ float: left;
+ min-height: 120px;
+ padding: 5px;
+ margin: 5px 0; }
+ #form.extract .key {
+ width: 418px;
+ border: 1px solid #CCC;
+ padding: 5px; }
+ #form.extract .key .extract-field {
+ float: right;
+ width: 300px; }
+ #form.extract .key .extract-field-label {
+ text-align: right;
+ width: 100px; }
+ #form.extract .checkboxs input {
+ margin: 0; }
+ #form.extract .radio {
+ margin-left: 5px; }
+ #form.extract label {
+ margin-bottom: 3px;
+ display: inline-block; }
+ #form.extract label.checkbox, #form.extract label.key {
+ width: 165px;
+ margin: 5px; }
+ #form.extract label.checkbox, #form.extract label input {
+ text-align: right; }
+ #form.extract label.extract-field-label.fingerprint, #form.extract label.extract-field-label.hash, #form.extract label.extract-field-label.exact, #form.extract label.extract-field-label.mr {
+ text-align: right;
+ width: 165px;
+ margin-right: 5px; }
+ #form.extract div.buttons {
+ float: right;
+ padding-right: 10px; }
+ #form.submit {
+ width: 550px;
+ margin: 0 auto; }
+ #form.submit textarea {
+ margin-bottom: 5px;
+ width: 100%;
+ padding: 0px; }
+ #form.submit input {
+ float: right;
+ margin-right: 5px; }
+
+#menu {
+ border-bottom: 1px solid #CCC;
+ border-top: 1px solid #CCC;
+ font-size: 0.9em;
+ margin: 5px 0 20px 0;
+ padding-left: 5px;
+ line-height: 1.5em; }
+ #menu a {
+ font-weight: bold; }
+
+#menu-sub {
+ font-size: 0.8em;
+ margin: -20px 0 20px 0;
+ padding: 5px 10px;
+ line-height: 1em;
+ background-color: #eee;
+ border: 1px solid #ccc;
+ border-top: 0; }
+
+#news ul {
+ -webkit-padding-start: 0px;
+ border-top: 1px solid #CCC; }
+ #news ul p {
+ margin-left: 2em;
+ font-style: italic; }
+#news li {
+ list-style-type: none; }
+#news h2 {
+ padding: 0px;
+ border-bottom: none; }
+
+@media (max-width: 600px) {
+ #form.submit {
+ width: 99%; }
+
+ .footer-left .small-hide {
+ display: none; } }
+@media (max-width: 500px) {
+ #content {
+ max-width: 100%; }
+
+ #form {
+ width: 100%; }
+ #form.extract {
+ width: 100%; }
+ #form.extract .key {
+ float: none;
+ display: table;
+ width: 95%; }
+ #form.extract .key .extract-field {
+ float: none;
+ width: 90%;
+ padding: 0 5px; }
+ #form.extract .key .extract-field-label {
+ text-align: left; }
+ #form.extract .checkboxs input {
+ float: left; }
+ #form.extract .options {
+ width: 95%; }
+ #form.extract .radio {
+ margin-left: 0px; }
+ #form.extract label.extract-field-label.fingerprint, #form.extract label.extract-field-label.hash, #form.extract label.extract-field-label.exact, #form.extract label.extract-field-label.mr {
+ text-align: left;
+ margin-left: 5px;
+ margin-right: 0px; }
+ #form.submit {
+ width: 99%; } }
diff --git a/doc/guides.md b/doc/guides.md
index f8afa02..011d4c8 100644
--- a/doc/guides.md
+++ b/doc/guides.md
@@ -7,3 +7,4 @@ permalink: /doc/
 ## Administrator Documents
 
 * [Supported XMPP Standards]({{ site.url }}/doc/supported-standards/)
+* [Server Compliance]({{ site.url }}/doc/compliance/)
diff --git a/help/definitions.md b/help/definitions.md
index 9e24cc0..6453813 100644
--- a/help/definitions.md
+++ b/help/definitions.md
@@ -15,6 +15,27 @@ permalink: /help/definitions/
 
 ## Federation
 
+<b>Federation</b> is the method used by XMPP servers to connect to other XMPP server to allow users from one server to chat with users on other server.
+
+The following diagram provides a high-level overview of this architecture (where `-` represents communications that use XMPP and `=` represents communications that use any other protocol).
+
+<pre><code> C1
+ |
+ C2---S1---C3
+ |
+ C4---S2---G1===FN1===FC1
+ |
+ C5
+</code></pre>
+
+The symbols are as follows:
+
+* C1, C2, C3, C4, C5 = XMPP clients
+* S1, S2 = XMPP servers
+* G1 = A gateway that translates between XMPP and the protocol(s) used on a foreign (non-XMPP) messaging network
+* FN1 = A foreign messaging network
+* FC1 = A client on a foreign messaging network
+
 ## Gateway
 
 ## IP Address
diff --git a/index.md b/index.md
index 3ac3703..60bb167 100644
--- a/index.md
+++ b/index.md
@@ -14,7 +14,8 @@ This service requires the use of a client to connect to the server with. Please
 
 * Hostname: <b>{{ site.xmpp-url }}</b>
 * Port: <b>5222</b>{% if site.xmpp-conference-url and site.xep-0045 == 1 %}
-* Conference Rooms: <b>{{ site.xmpp-conference-url }}</b>{% endif %}
+* Conference Rooms: <b>{{ site.xmpp-conference-url }}</b>{% endif %}{% if site.xmpp-proxy-url %}
+* Socks 5 Proxy: <b>{{ site.xmpp-proxy-url }}</b>{% endif %}
 
 ## Services Provided
 
@@ -25,7 +26,7 @@ This service provides conference rooms via the mulit-user chats (MUC) interface
 
 The conference services URL is `{{ site.xmpp-conference-url }}`, the fingerprints are [listed below]({{ site.url }}/#certificates-fingerprints).
 
-Please see the page [Using Conferences]({{ site.url }}/help/using-conferences/) for more infromation on how to connect and use the confrencing service.
+Please see the page [Using Conferences]({{ site.url }}/help/using-conferences/) for more infromation on how to connect and use the conferencing service.
 {% endif %}
 
 {% if site.xep-0191 == 1 %}
author	Matt Rude <[email protected]>	2016-11-12 12:47:44 -0600
committer	Matt Rude <[email protected]>	2016-11-12 12:47:44 -0600
commit	a866e35971886f7a82f228967ec3d4a5661fa37c (patch)
tree	3563bf7b9d9fab3dbd80e40cfc18297de75711e3
parent	b867699a06dd2a21a36b21822dcc2cb46af14870 (diff)
download	xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.tar.gz xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.tar.bz2 xmpp-site-a866e35971886f7a82f228967ec3d4a5661fa37c.zip