3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 10:42:52 +01:00

Merge pull request #1350 from slingamn/traditional

rename conventional.yaml -> traditional.yaml
This commit is contained in:
Shivaram Lingamneni 2020-10-22 22:20:53 -07:00 committed by GitHub
commit 9670d96282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -46,7 +46,7 @@ archives:
- CHANGELOG.md
- oragono.motd
- default.yaml
- conventional.yaml
- traditional.yaml
- docs/*
- languages/*.yaml
- languages/*.json

View File

@ -1,7 +1,7 @@
# This is the default config file for Oragono.
# It contains recommended defaults for all settings, including some behaviors
# that differ from conventional ircds. See conventional.yaml for a config
# with more "mainstream" behavior.
# that differ from conventional ircd+services setups. See traditional.yaml
# for a config with more "mainstream" behavior.
#
# If you are setting up a new oragono server, you should copy this file
# to a new one named 'ircd.yaml', then read the whole file to see which

View File

@ -1,4 +1,4 @@
# This is the "conventional" or "mainstream" config file for Oragono.
# This is the "traditional" or "mainstream" config file for Oragono.
# It tries to replicate the behavior of other ircds, at the cost of not
# taking full advantage of Oragono's features. This config is suitable for use
# in IRCv3 conformance testing.
@ -437,7 +437,7 @@ accounts:
# parallel setting to force-nick-equals-account: if true, this forbids
# anonymous users (i.e., users not logged into an account) to change their
# nickname after the initial connection is complete
forbid-anon-nick-changes: false
forbid-anonymous-nick-changes: false
# multiclient controls whether oragono allows multiple connections to
# attach to the same client/nickname identity; this is part of the