Skip to content

Commit

Permalink
Merge branch 'master' into v10.2-documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@amyblais
amyblais authored Oct 28, 2024
2 parents f2aa55d + 58a2070 commit b598410
Show file tree
Hide file tree
Showing 71 changed files with 7,637 additions and 8,467 deletions.
2 changes: 1 addition & 1 deletion source/about/mobile-app-changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3847,7 +3847,7 @@ Many thanks to all our contributors. In alphabetical order:
- Release Date: March 29, 2017
- Server Versions Supported: Server v3.7+ is required, Self-Signed SSL Certificates are not yet supported

Note: If you need an SSL certificate, consider using [Let's Encrypt](https://docs.mattermost.com/install/config-ssl-http2-nginx.html) instead of a self-signed one.
Note: If you need an SSL certificate, consider using Let's Encrypt instead of a self-signed one.

### Highlights

Expand Down
91 changes: 0 additions & 91 deletions source/about/orchestration.rst
View file

This file was deleted.

264 changes: 261 additions & 3 deletions source/collaborate/format-messages.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,272 @@ Or by indenting each line by four spaces:
^^^^ 4x spaces
**Syntax highlighting**
Syntax highlighting
^^^^^^^^^^^^^^^^^^^^

To add syntax highlighting, type the language to be highlighted after the ``````` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, and Monokai) that can be changed in **Settings > Display > Theme > Custom Theme > Center Channel Styles**.

Supported languages and their aliases include:

.. include:: syntax-highlighting.rst
:start-after: :nosearch:
.. raw:: html

<table width="100%" border="1" cellpadding="5px" style="margin-bottom:20px;">
<tr class="row-odd">
<th class="head">Language</th>
<th class="head">Aliases</th>
</tr>
<tr class="row-odd">
<td valign="middle">ActionScript</td>
<td valign="middle">actionscript, as, as3</td>
</tr>
<tr class="row-odd">
<td valign="middle">AppleScript</td>
<td valign="middle">applescript</td>
</tr>
<tr class="row-odd">
<td valign="middle">Bash</td>
<td valign="middle">bash, sh</td>
</tr>
<tr class="row-odd">
<td valign="middle">Clojure</td>
<td valign="middle">clojure</td>
</tr>
<tr class="row-odd">
<td valign="middle">CoffeeScript</td>
<td valign="middle">coffescript, coffee, coffee-script</td>
</tr>
<tr class="row-odd">
<td valign="middle">C/C++</td>
<td valign="middle">cpp, c++, c</td>
</tr>
<tr class="row-odd">
<td valign="middle">C#</td>
<td valign="middle">cs, c#, csharp</td>
</tr>
<tr class="row-odd">
<td valign="middle">CSS</td>
<td valign="middle">css</td>
</tr>
<tr class="row-odd">
<td valign="middle">D</td>
<td valign="middle">d, dlang</td>
</tr>
<tr class="row-odd">
<td valign="middle">Dart</td>
<td valign="middle">dart</td>
</tr>
<tr class="row-odd">
<td valign="middle">Delphi</td>
<td valign="middle">delphi</td>
</tr>
<tr class="row-odd">
<td valign="middle">Diff</td>
<td valign="middle">diff, patch, udiff</td>
</tr>
<tr class="row-odd">
<td valign="middle">Django</td>
<td valign="middle">django</td>
</tr>
<tr class="row-odd">
<td valign="middle">Dockerfile</td>
<td valign="middle">dockerfile, docker</td>
</tr>
<tr class="row-odd">
<td valign="middle">Elixir</td>
<td valign="middle">elixir, ex, exs</td>
</tr>
<tr class="row-odd">
<td valign="middle">Erlang</td>
<td valign="middle">erlang, erl</td>
</tr>
<tr class="row-odd">
<td valign="middle">Fortran</td>
<td valign="middle">fortran</td>
</tr>
<tr class="row-odd">
<td valign="middle">F#</td>
<td valign="middle">fsharp</td>
</tr>
<tr class="row-odd">
<td valign="middle">G-Code</td>
<td valign="middle">gcode</td>
</tr>
<tr class="row-odd">
<td valign="middle">Go</td>
<td valign="middle">go, golang</td>
</tr>
<tr class="row-odd">
<td valign="middle">Groovy</td>
<td valign="middle">groovy</td>
</tr>
<tr class="row-odd">
<td valign="middle">Handlebars</td>
<td valign="middle">handlebars, hbs, mustache</td>
</tr>
<tr class="row-odd">
<td valign="middle">Haskell</td>
<td valign="middle">haskell, hs</td>
</tr>
<tr class="row-odd">
<td valign="middle">Haxe</td>
<td valign="middle">haxe</td>
</tr>
<tr class="row-odd">
<td valign="middle">Java</td>
<td valign="middle">java</td>
</tr>
<tr class="row-odd">
<td valign="middle">JavaScript</td>
<td valign="middle">javascript, js</td>
</tr>
<tr class="row-odd">
<td valign="middle">JSON</td>
<td valign="middle">json</td>
</tr>
<tr class="row-odd">
<td valign="middle">Julia</td>
<td valign="middle">julia, jl</td>
</tr>
<tr class="row-odd">
<td valign="middle">Kotlin</td>
<td valign="middle">kotlin</td>
</tr>
<tr class="row-odd">
<td valign="middle">LaTeX</td>
<td valign="middle">latex, tex</td>
</tr>
<tr class="row-odd">
<td valign="middle">Less</td>
<td valign="middle">less</td>
</tr>
<tr class="row-odd">
<td valign="middle">Lisp</td>
<td valign="middle">lisp</td>
</tr>
<tr class="row-odd">
<td valign="middle">Lua</td>
<td valign="middle">lua</td>
</tr>
<tr class="row-odd">
<td valign="middle">Makefile</td>
<td valign="middle">makefile, make, mf, gnumake, bsdmake</td>
</tr>
<tr class="row-odd">
<td valign="middle">Markdown</td>
<td valign="middle">markdown, md, mkd</td>
</tr>
<tr class="row-odd">
<td valign="middle">Matlab</td>
<td valign="middle">matlab, m</td>
</tr>
<tr class="row-odd">
<td valign="middle">Objective C</td>
<td valign="middle">objectivec, objective_c, objc</td>
</tr>
<tr class="row-odd">
<td valign="middle">OCaml</td>
<td valign="middle">ocaml</td>
</tr>
<tr class="row-odd">
<td valign="middle">Perl</td>
<td valign="middle">perl, pl</td>
</tr>
<tr class="row-odd">
<td valign="middle">Pascal</td>
<td valign="middle">pascal, pas</td>
</tr>
<tr class="row-odd">
<td valign="middle">PostgreSQL</td>
<td valign="middle">pgsql, postgres, postgresql</td>
</tr>
<tr class="row-odd">
<td valign="middle">PHP</td>
<td valign="middle">php, php3, php4, php5</td>
</tr>
<tr class="row-odd">
<td valign="middle">PowerShell</td>
<td valign="middle">powershell, posh</td>
</tr>
<tr class="row-odd">
<td valign="middle">Puppet</td>
<td valign="middle">puppet, pp</td>
</tr>
<tr class="row-odd">
<td valign="middle">Python</td>
<td valign="middle">python, py</td>
</tr>
<tr class="row-odd">
<td valign="middle">R</td>
<td valign="middle">r, s</td>
</tr>
<tr class="row-odd">
<td valign="middle">Ruby</td>
<td valign="middle">ruby, rb</td>
</tr>
<tr class="row-odd">
<td valign="middle">Rust</td>
<td valign="middle">rust, rs</td>
</tr>
<tr class="row-odd">
<td valign="middle">Scala</td>
<td valign="middle">scala</td>
</tr>
<tr class="row-odd">
<td valign="middle">Scheme</td>
<td valign="middle">scheme</td>
<tr class="row-odd">
<td valign="middle">SCSS</td>
<td valign="middle">scss</td>
</tr>
<tr class="row-odd">
<td valign="middle">Smalltalk</td>
<td valign="middle">smalltalk, st, squeak</td>
</tr>
<tr class="row-odd">
<td valign="middle">SQL</td>
<td valign="middle">sql</td>
</tr>
<tr class="row-odd">
<td valign="middle">Stylus</td>
<td valign="middle">stylus, styl</td>
</tr>
<tr class="row-odd">
<td valign="middle">Swift</td>
<td valign="middle">swift</td>
</tr>
<tr class="row-odd">
<td valign="middle">Text</td>
<td valign="middle">text</td>
</tr>
<tr class="row-odd">
<td valign="middle">TypeScript</td>
<td valign="middle">typescript, ts, tsx</td>
</tr>
<tr class="row-odd">
<td valign="middle">VB.Net</td>
<td valign="middle">vbnet, vb, visualbasic</td>
</tr>
<tr class="row-odd">
<td valign="middle">VBScript</td>
<td valign="middle">vbscript</td>
</tr>
<tr class="row-odd">
<td valign="middle">Verilog</td>
<td valign="middle">verilog</td>
</tr>
<tr class="row-odd">
<td valign="middle">VHDL</td>
<td valign="middle">vhdl</td>
</tr>
<tr class="row-odd">
<td valign="middle">HTML, XML</td>
<td valign="middle">html, xml</td>
</tr>
<tr class="row-odd">
<td valign="middle">YAML</td>
<td valign="middle">yaml, yml</td>
</tr>
</table>

Example:

Expand Down
7 changes: 1 addition & 6 deletions source/collaborate/learn-about-roles.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,7 @@ This is the default role given to users when they join a team. Members have basi
Guest
-----

A guest is a role with restricted permissions. Guests enable organizations to collaborate with users outside of their organization, and control what channels they are in and who they can collaborate with.

.. include:: /onboard/guest-account-access.rst
:start-after: :nosearch:

See the :doc:`guest accounts </onboard/guest-accounts>` documentation for details on working with guest accounts.
A guest is a role with restricted permissions. Guests enable organizations to collaborate with users outside of their organization, and control what channels they are in and who they can collaborate with. See the :doc:`guest accounts </onboard/guest-accounts>` documentation for details on working with guest accounts.

Deactivated
-----------
Expand Down
Loading

0 comments on commit b598410

Please sign in to comment.