Browse Source

Merge pull request #1350 from slingamn/traditional

rename conventional.yaml -> traditional.yaml
tags/v2.4.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
9670d96282
No account linked to committer's email address
3 changed files with 5 additions and 5 deletions
  1. 1
    1
      .goreleaser.yml
  2. 2
    2
      default.yaml
  3. 2
    2
      traditional.yaml

+ 1
- 1
.goreleaser.yml View File

46
       - CHANGELOG.md
46
       - CHANGELOG.md
47
       - oragono.motd
47
       - oragono.motd
48
       - default.yaml
48
       - default.yaml
49
-      - conventional.yaml
49
+      - traditional.yaml
50
       - docs/*
50
       - docs/*
51
       - languages/*.yaml
51
       - languages/*.yaml
52
       - languages/*.json
52
       - languages/*.json

+ 2
- 2
default.yaml View File

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

conventional.yaml → traditional.yaml View File

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

Loading…
Cancel
Save