<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13775">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">doc: Fix CHANGES entries to have .txt suffix and update READMEs<br><br>Although the wiki page for the new CHANGES and UPGRADE scheme<br>states that the files must have the ".txt" suffix, the READMEs<br>didn't.<br><br>Change-Id: I490306aa2cc24d6f014738e9ebbc78592efe0f05<br>(cherry picked from commit 7416703f04f12eb583a3427a3f64d06951c18c6e)<br>---<br>M doc/CHANGES-staging/README.md<br>A doc/CHANGES-staging/hide_messaging_ami_events.txt<br>D doc/CHANGES-staging/res_fax_negotiate_both<br>M doc/UPGRADE-staging/README.md<br>4 files changed, 19 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/CHANGES-staging/README.md b/doc/CHANGES-staging/README.md</span><br><span>index 8a2407f..8fc51bc 100644</span><br><span>--- a/doc/CHANGES-staging/README.md</span><br><span>+++ b/doc/CHANGES-staging/README.md</span><br><span>@@ -9,10 +9,10 @@</span><br><span> add multiple files, each with their own description. If the message is going to</span><br><span> be the same for each subject, then you can add multiple subject headers to one</span><br><span> file. The "Subject: xxx" line is case sensitive! For example, if you are making</span><br><span style="color: hsl(0, 100%, 40%);">-a change to PJSIP, then you might add the file "res_pjsip_my_cool_feature" to</span><br><span style="color: hsl(0, 100%, 40%);">-this directory, with a short description of what it does. If you are adding</span><br><span style="color: hsl(0, 100%, 40%);">-multiple entries, they should be done in the same commit to avoid merge</span><br><span style="color: hsl(0, 100%, 40%);">-conflicts. Here's an example:</span><br><span style="color: hsl(120, 100%, 40%);">+a change to PJSIP, then you might add the file "res_pjsip_my_cool_feature.txt" to</span><br><span style="color: hsl(120, 100%, 40%);">+this directory, with a short description of what it does. The files must have</span><br><span style="color: hsl(120, 100%, 40%);">+the ".txt" suffix. If you are adding multiple entries, they should be done in</span><br><span style="color: hsl(120, 100%, 40%);">+the same commit to avoid merge conflicts. Here's an example:</span><br><span> </span><br><span> > Subject: res_pjsip</span><br><span> > Subject: Core</span><br><span>diff --git a/doc/CHANGES-staging/hide_messaging_ami_events.txt b/doc/CHANGES-staging/hide_messaging_ami_events.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..0afbeec</span><br><span>--- /dev/null</span><br><span>+++ b/doc/CHANGES-staging/hide_messaging_ami_events.txt</span><br><span>@@ -0,0 +1,11 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: Messaging</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+In order to reduce the amount of AMI and ARI events generated,</span><br><span style="color: hsl(120, 100%, 40%);">+the global "Message/ast_msg_queue" channel can be set to suppress</span><br><span style="color: hsl(120, 100%, 40%);">+it's normal channel housekeeping events such as "Newexten",</span><br><span style="color: hsl(120, 100%, 40%);">+"VarSet", etc. This can greatly reduce load on the manager</span><br><span style="color: hsl(120, 100%, 40%);">+and ARI applications when the Digium Phone Module for Asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+is in use. To enable, set "hide_messaging_ami_events" in</span><br><span style="color: hsl(120, 100%, 40%);">+asterisk.conf to "yes" In Asterisk versions <18, the default</span><br><span style="color: hsl(120, 100%, 40%);">+is "no" preserving existing behavior. Beginning with</span><br><span style="color: hsl(120, 100%, 40%);">+Asterisk 18, the option will default to "yes".</span><br><span>diff --git a/doc/CHANGES-staging/res_fax_negotiate_both b/doc/CHANGES-staging/res_fax_negotiate_both</span><br><span>deleted file mode 100644</span><br><span>index 73be756..0000000</span><br><span>--- a/doc/CHANGES-staging/res_fax_negotiate_both</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: res_fax</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Added configuration option "negotiate_both". This option is only used</span><br><span style="color: hsl(0, 100%, 40%);">-when a gateway is enabled, and a v21 preamble is detected. If this option</span><br><span style="color: hsl(0, 100%, 40%);">-is enabled, once a preamble is detected Asterisk will initiate negotiation</span><br><span style="color: hsl(0, 100%, 40%);">-requests to both T.38 enabled endpoint versus waiting, and forwarding a</span><br><span style="color: hsl(0, 100%, 40%);">-request from an initiating endpoint. Defaults to disabled.</span><br><span>diff --git a/doc/UPGRADE-staging/README.md b/doc/UPGRADE-staging/README.md</span><br><span>index 8147161..21cbe78 100644</span><br><span>--- a/doc/UPGRADE-staging/README.md</span><br><span>+++ b/doc/UPGRADE-staging/README.md</span><br><span>@@ -9,9 +9,10 @@</span><br><span> their own description. If the message is going to be the same for each subject,</span><br><span> then you can add multiple subject headers to one file. The "Subject: xxx" line</span><br><span> is case sensitive! For example, if you are making a change to PJSIP, then you</span><br><span style="color: hsl(0, 100%, 40%);">-might add the file "res_pjsip_my_cool_feature" to this directory, with a short</span><br><span style="color: hsl(0, 100%, 40%);">-description of what it does. If you are adding multiple entries, they should be</span><br><span style="color: hsl(0, 100%, 40%);">-done in the same commit to avoid merge conflicts. Here's an example:</span><br><span style="color: hsl(120, 100%, 40%);">+might add the file "res_pjsip_my_cool_feature.txt" to this directory, with a</span><br><span style="color: hsl(120, 100%, 40%);">+short description of what it does. The files must have the ".txt" suffix.</span><br><span style="color: hsl(120, 100%, 40%);">+If you are adding multiple entries, they should be done in the same commit</span><br><span style="color: hsl(120, 100%, 40%);">+to avoid merge conflicts. Here's an example:</span><br><span> </span><br><span> > Subject: res_pjsip</span><br><span> > Subject: Core</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13775">change 13775</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13775"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I490306aa2cc24d6f014738e9ebbc78592efe0f05 </div>
<div style="display:none"> Gerrit-Change-Number: 13775 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>