updates

author: Matt Rude <[email protected]> 2016-12-09 23:27:37 -0600
committer: Matt Rude <[email protected]> 2016-12-09 23:27:37 -0600
commit: 1bcef4c9d7ac44e210524e900e7388bf3f2dc450 (patch)
tree: da0322214970cbfffeda5e4170b4d6743fe51575
parent: a866e35971886f7a82f228967ec3d4a5661fa37c (diff)
download: xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.tar.gz
xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.tar.bz2
xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.zip
9 files changed, 8 insertions, 429 deletions
diff --git a/_config.yml b/_config.yml
index 0d4386f..a0e0587 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,7 +16,7 @@ fingerprint-sha1: "BD:32:61:05:5D:F2:1D:FC:9E:40:74:29:CC:37:98:60:B5:C6:7C:8B"
 fingerprint-sha256: "C3:0E:A2:BF:1E:C5:C4:DD:E9:BE:10:1D:A1:F6:79:34:7C:FD:4A:CF:7F:73:22:16:CA:DC:F5:4C:59:A7:F8:1D"
 fingerprint-conference-sha1: "35:3E:7B:63:89:B3:C6:6D:D7:32:70:C6:8B:27:92:A6:74:1C:98:96"
 fingerprint-conference-sha256: "8F:54:F8:8B:C1:52:C3:40:E6:47:94:9D:DA:1E:1E:51:E5:92:FC:9F:79:A8:E3:2D:2E:84:1D:FC:F2:8B:7A:AD"
-prosody-version: "0.9.10"
+prosody-version: "0.10.0"
 
 # Analytics settings
 #google_analytics_id: UA-9532791-9
diff --git a/css/main.less b/css/main.less
deleted file mode 100644
index 64da195..0000000
--- a/css/main.less
+++ /dev/null
@@ -1,8 +0,0 @@
-// Import the main site less file
-@import "site.less";
-
-// Import the syntax.less content for Highlighting code snippets
-//@import "syntax.less";
-
-// Import the small.less content for small screen display
-@import "small.less";
diff --git a/css/site.less b/css/site.less
deleted file mode 100644
index d249ae2..0000000
--- a/css/site.less
+++ /dev/null
@@ -1,303 +0,0 @@
-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;
- }
- i {
- color: #A9A9A9;
- font-size: 0.8em;
- }
-}
-
-h2 {
- font-weight: normal;
- margin-bottom: 8px;
- padding: 2px;
- padding-top: 10px;
- border-bottom: 1px solid #CCC;
- small {
- font-size: 0.8em;
- color: #777;
- }
-}
-
-h3 {
- small {
- font-size: 0.8em;
- color: #777;
- }
-}
-
-td {
- padding: 5px;
- &.PASSED {
- background-color: green;
- color: white;
- }
- &.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, 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;
- a {
- text-decoration: none;
- }
- 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;
- thead {
- background: #f5f5f5;
- }
- tr:nth-of-type(even) {
- background: #F9F9F9;
- }
-}
-#form {
- display: table;
- &.extract {
- max-width: 430px;
- margin: 0 auto;
- .options {
- border: 1px solid #CCC;
- display: inline-block;
- float: left;
- min-height: 120px;
- padding: 5px;
- margin: 5px 0;
- }
- .key {
- width: 418px;
- border: 1px solid #CCC;
- padding: 5px;
- .extract-field {
- float: right;
- width: 300px;
- }
- .extract-field-label {
- text-align: right;
- width: 100px;
- }
- }
- .checkboxs input{
- margin: 0;
- }
- .radio {
- margin-left: 5px;
- }
- label {
- margin-bottom: 3px;
- display: inline-block;
- &.checkbox, &.key {
- width: 165px;
- margin: 5px;
- }
- &.checkbox, input {
- text-align: right;
- }
- &.extract-field-label {
- &.fingerprint, &.hash, &.exact, &.mr {
- text-align: right;
- width: 165px;
- margin-right: 5px;
- }
- }
- }
- div.buttons {
- float: right;
- padding-right: 10px;
- }
- }
- &.submit {
- width: 550px;
- margin: 0 auto;
- textarea {
- margin-bottom: 5px;
- width: 100%;
- padding: 0px;
- }
- 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;
- 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;
- p {
- margin-left: 2em;
- font-style: italic;
- }
- }
- li {
- list-style-type: none;
- }
- h2 {
- padding: 0px;
- border-bottom: none;
- }
-}
diff --git a/css/small.less b/css/small.less
deleted file mode 100644
index 5403b67..0000000
--- a/css/small.less
+++ /dev/null
@@ -1,54 +0,0 @@
-@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%;
- &.extract {
- width: 100%;
- .key {
- float: none;
- display: table;
- width: 95%;
- .extract-field {
- float: none;
- width: 90%;
- padding: 0 5px;
- }
- .extract-field-label {
- text-align: left;
- }
- }
- .checkboxs input {
- float: left;
- }
- .options {
- width: 95%;
- }
- .radio {
- margin-left: 0px;
- }
- label.extract-field-label.fingerprint, label.extract-field-label.hash, label.extract-field-label.exact, label.extract-field-label.mr {
- text-align: left;
- margin-left: 5px;
- margin-right: 0px;
- }
- }
- &.submit {
- width: 99%;
- }
- }
-}
-
diff --git a/css/syntax.less b/css/syntax.less
deleted file mode 100644
index aa820a7..0000000
--- a/css/syntax.less
+++ /dev/null
@@ -1,61 +0,0 @@
-// Downloaded from: https://github.com/mojombo/tpw/blob/master/css/syntax.css
-.highlight{background:#ffffff;}
-.highlight .c{color:blue;font-weight:bold;}
-.highlight .err{color:#a61717;background-color:#e3d2d2}
-.highlight .k{font-weight: bold}
-.highlight .o{font-weight: bold}
-.highlight .cm{color:#999988;font-style:italic}
-.highlight .cp{color:#999999;font-weight:bold}
-.highlight .c1{color:#999988;font-style:italic}
-.highlight .cs{color:#999999;font-weight:bold;font-style:italic}
-.highlight .gd{color:#000000;background-color:#ffdddd}
-.highlight .gd .x{color:#000000;background-color:#ffaaaa}
-.highlight .ge{font-style:italic}
-.highlight .gr{color:#aa0000}
-.highlight .gh{color:#999999}
-.highlight .gi{color:#000000;background-color:#ddffdd}
-.highlight .gi .x{color:#000000;background-color:#aaffaa}
-.highlight .go{color:#888888}
-.highlight .gp{color:#555555}
-.highlight .gs{font-weight:bold}
-.highlight .gu{color:#aaaaaa}
-.highlight .gt{color:#aa0000}
-.highlight .kc{font-weight:bold}
-.highlight .kd{font-weight:bold}
-.highlight .kp{font-weight:bold}
-.highlight .kr{font-weight:bold}
-.highlight .kt{color:#445588;font-weight:bold}
-.highlight .m{color:#009999}
-.highlight .s{color:#d14}
-.highlight .na{color:#008080}
-.highlight .nb{color:#0086B3}
-.highlight .nc{color:#445588;font-weight:bold}
-.highlight .no{color:#008080}
-.highlight .ni{color:#800080}
-.highlight .ne{color:#990000;font-weight:bold}
-.highlight .nf{color:#990000;font-weight:bold}
-.highlight .nn{color:#555555}
-.highlight .nt{color:#000080}
-.highlight .nv{color:#008080}
-.highlight .ow{ font-weight:bold}
-.highlight .w{color:#bbbbbb}
-.highlight .mf{color:#009999}
-.highlight .mh{color:#009999}
-.highlight .mi{color:#009999}
-.highlight .mo{color:#009999}
-.highlight .sb{color:#d14}
-.highlight .sc{color:#d14}
-.highlight .sd{color:#d14}
-.highlight .s2{color:#d14}
-.highlight .se{color:#d14}
-.highlight .sh{color:#d14}
-.highlight .si{color:#d14}
-.highlight .sx{color:#d14}
-.highlight .sr{color:#009926}
-.highlight .s1{color:#d14}
-.highlight .ss{color:#990073}
-.highlight .bp{color:#999999}
-.highlight .vc{color:#008080}
-.highlight .vg{color:#008080}
-.highlight .vi{color:#008080}
-.highlight .il{color:#009999}
diff --git a/help/definitions.md b/help/definitions.md
index 6453813..e96f6ee 100644
--- a/help/definitions.md
+++ b/help/definitions.md
@@ -48,6 +48,7 @@ A users unique [XMPP](#xmpp-server) address, is called a JID (or for historical
 ## LAN
 
 ## Presence
+A users [XMPP](#xmpp-server) presence indicates if a users is **online**, **away**, or **offline**.
 
 ## Prosody
 
diff --git a/help/generic-configuration.md b/help/generic-configuration.md
index acf50f5..67039db 100644
--- a/help/generic-configuration.md
+++ b/help/generic-configuration.md
@@ -21,4 +21,4 @@ Some clients may require you to specify a full IM address when you're adding som
 
 If you want to access a chat room, you may need to specify the chat room server. It's `{{ site.xmpp-conference-url }}`. The generic address of a chat room is `chatroom-name@{{ site.xmpp-conference-url }}`. Note that the "real" name of a chat room cannot have spaces, but you can specify a nickname or description which some clients will display in lieu of the real name -- this can cause some confusion.
 
-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 information on how to connect and use the conferencing service.
diff --git a/help/using-conferences.md b/help/using-conferences.md
index 1a7fe19..0b43405 100644
--- a/help/using-conferences.md
+++ b/help/using-conferences.md
@@ -5,6 +5,10 @@ permalink: /help/using-conferences/
 ---
 
 {% if site.xmpp-conference-url and site.xep-0045 == 1 %}
+# Conferences
+
+XMPP is normally a single person to single person chat system, but it has the ability to also run conference rooms. A conference room or MUC (Multiple User Chat) allows users on the same server, or via federation, different servers or domains, to all connect to the same chat room. Similar to how IRC works.
+
 ## Connecting from a federated XMPP server
 
 By default the server will try to use [TLS]({{ site.url }}/help/definitions/#tls) if the other side supports it, and fall back to [dialback]({{ site.url }}/help/definitions/#dialback) if it does not or if the certificate is incorrect or not trusted.
diff --git a/index.md b/index.md
index 60bb167..0112a09 100644
--- a/index.md
+++ b/index.md
@@ -4,7 +4,7 @@ title: Home
 permalink: /
 ---
 
-This is the **{{ site.name }}** communication service website. This site is here to provide basic infromation on using this service. A [XMPP]({{ site.url }}/help/definitions/#xmpp-server) service provides messaging ability via a local client. By using this service, security in increased due to the settings and the fact this service is owned and ran by the users.{% if site.xep-0375 == 1%} This service is in complete compliance with [XEP-0375](https://xmpp.org/extensions/xep-0375.html). The XEP-0375 document specifies the 2016 compliance levels for XMPP clients and servers.{% endif %}
+This is the **{{ site.name }}** communication service website. This site is here to provide basic infromation on using this service. A [XMPP]({{ site.url }}/help/definitions/#xmpp-server) service provides messaging ability via a local client. {% if site.xep-0375 == 1%}This service is in complete compliance with [XEP-0375](https://xmpp.org/extensions/xep-0375.html). The XEP-0375 document specifies the 2016 compliance levels for XMPP clients and servers.{% endif %}
 
 ## How to use the service
author	Matt Rude <[email protected]>	2016-12-09 23:27:37 -0600
committer	Matt Rude <[email protected]>	2016-12-09 23:27:37 -0600
commit	1bcef4c9d7ac44e210524e900e7388bf3f2dc450 (patch)
tree	da0322214970cbfffeda5e4170b4d6743fe51575
parent	a866e35971886f7a82f228967ec3d4a5661fa37c (diff)
download	xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.tar.gz xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.tar.bz2 xmpp-site-builder-1bcef4c9d7ac44e210524e900e7388bf3f2dc450.zip