Merge "res_pjsip: Whitespace and comment cleanup." into 14

diff --cc configs/samples/pjsip.conf.sample
Simple merge

diff --cc include/asterisk/res_pjsip.h
index 9dd70dbcaae57beba9491c1e3b9b333d823ceb45,594259ba62e4d223a3897d2b22f2648c68e78878..9bb2a82c5de16cee43dd79ebb148509151084f0d
--- 1/include/asterisk/res_pjsip.h
--- 2/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@@ -749,12 -749,10 +749,12 @@@ struct ast_sip_endpoint 
        unsigned int usereqphone;
        /*! Whether to pass through hold and unhold using re-invites with recvonly and sendrecv */
        unsigned int moh_passthrough;
-       /* Access control list */
+       /*! Access control list */
        struct ast_acl_list *acl;
-       /* Restrict what IPs are allowed in the Contact header (for registration) */
+       /*! Restrict what IPs are allowed in the Contact header (for registration) */
        struct ast_acl_list *contact_acl;
 +      /*! The number of seconds into call to disable fax detection.  (0 = disabled) */
 +      unsigned int faxdetect_timeout;
  };
  
  /*!

diff --cc res/res_pjsip.c
Simple merge