+30 -29

src/applications/config/option/PhabricatorCoreConfigOptions.php

reviewed

··· 38 38 $applications_app_href = '/applications/'; 39 39 40 40 $silent_description = $this->deformat(pht(<<<EOREMARKUP 41 41 - This option allows you to stop Phabricator from sending data to most external 41 41 + This option allows you to stop this service from sending data to most external 42 42 services: it will disable email, SMS, repository mirroring, remote builds, 43 43 Doorkeeper writes, and webhooks. 44 44 45 45 - This option is intended to allow a Phabricator instance to be exported, copied, 46 46 - imported, and run in a test environment without impacting users. For example, 47 47 - if you are migrating to new hardware, you could perform a test migration first 48 48 - with this flag set, make sure things work, and then do a production cutover 49 49 - later with higher confidence and less disruption. 45 45 + This option is intended to allow an instance to be exported, copied, imported, 46 46 + and run in a test environment without impacting users. For example, if you are 47 47 + migrating to new hardware, you could perform a test migration first with this 48 48 + flag set, make sure things work, and then do a production cutover later with 49 49 + higher confidence and less disruption. 50 50 51 51 Without making use of this flag to silence the temporary test environment, 52 52 users would receive duplicate email during the time the test instance and old ··· 72 72 return array( 73 73 $this->newOption('phabricator.base-uri', 'string', null) 74 74 ->setLocked(true) 75 75 - ->setSummary(pht('URI where Phabricator is installed.')) 75 75 + ->setSummary(pht('URI where this software is installed.')) 76 76 ->setDescription( 77 77 pht( 78 78 - 'Set the URI where Phabricator is installed. Setting this '. 78 78 + 'Set the URI where this software is installed. Setting this '. 79 79 'improves security by preventing cookies from being set on other '. 80 80 'domains, and allows daemons to send emails with links that have '. 81 81 'the correct domain.')) 82 82 - ->addExample('http://phabricator.example.com/', pht('Valid Setting')), 82 82 + ->addExample('http://devtools.example.com/', pht('Valid Setting')), 83 83 $this->newOption('phabricator.production-uri', 'string', null) 84 84 ->setSummary( 85 85 pht('Primary install URI, for multi-environment installs.')) 86 86 ->setDescription( 87 87 pht( 88 88 - 'If you have multiple Phabricator environments (like a '. 88 88 + 'If you have multiple %s environments (like a '. 89 89 'development/staging environment for working on testing '. 90 90 'Phabricator, and a production environment for deploying it), '. 91 91 'set the production environment URI here so that emails and other '. 92 92 'durable URIs will always generate with links pointing at the '. 93 93 'production environment. If unset, defaults to `%s`. Most '. 94 94 'installs do not need to set this option.', 95 95 + PlatformSymbols::getPlatformServerName(), 95 96 'phabricator.base-uri')) 96 96 - ->addExample('http://phabricator.example.com/', pht('Valid Setting')), 97 97 + ->addExample('http://devtools.example.com/', pht('Valid Setting')), 97 98 $this->newOption('phabricator.allowed-uris', 'list<string>', array()) 98 99 ->setLocked(true) 99 99 - ->setSummary(pht('Alternative URIs that can access Phabricator.')) 100 100 + ->setSummary(pht('Alternative URIs that can access this service.')) 100 101 ->setDescription( 101 102 pht( 102 103 "These alternative URIs will be able to access 'normal' pages ". 103 103 - "on your Phabricator install. Other features such as OAuth ". 104 104 + "on your this install. Other features such as OAuth ". 104 105 "won't work. The major use case for this is moving installs ". 105 106 "across domains.")) 106 107 ->addExample( ··· 109 110 pht('Valid Setting')), 110 111 $this->newOption('phabricator.timezone', 'string', null) 111 112 ->setSummary( 112 112 - pht('The timezone Phabricator should use.')) 113 113 + pht('The timezone this software should use by default.')) 113 114 ->setDescription($timezone_description) 114 115 ->addExample('America/New_York', pht('US East (EDT)')) 115 116 ->addExample('America/Chicago', pht('US Central (CDT)')) ··· 119 120 ->setLocked(true) 120 121 ->setSummary( 121 122 pht( 122 122 - 'Set a string Phabricator should use to prefix cookie names.')) 123 123 + 'Set a string this software should use to prefix cookie names.')) 123 124 ->setDescription( 124 125 pht( 125 126 'Cookies set for x.com are also sent for y.x.com. Assuming '. 126 126 - 'Phabricator instances are running on both domains, this will '. 127 127 - 'create a collision preventing you from logging in.')) 127 127 + 'instances are running on both domains, this will create a '. 128 128 + 'collision preventing you from logging in.')) 128 129 ->addExample('dev', pht('Prefix cookie with "%s"', 'dev')), 129 130 $this->newOption('phabricator.show-prototypes', 'bool', false) 130 131 ->setLocked(true) ··· 141 142 "IMPORTANT: The upstream does not provide support for prototype ". 142 143 "applications.". 143 144 "\n\n". 144 144 - "Phabricator includes prototype applications which are in an ". 145 145 + "This platform includes prototype applications which are in an ". 145 146 "**early stage of development**. By default, prototype ". 146 147 "applications are not installed, because they are often not yet ". 147 148 "developed enough to be generally usable. You can enable ". 148 148 - "this option to install them if you're developing Phabricator ". 149 149 + "this option to install them if you're developing applications ". 149 150 "or are interested in previewing upcoming features.". 150 151 "\n\n". 151 152 "To learn more about prototypes, see [[ %s | %s ]].". ··· 164 165 pht('Allows you to remove levity and jokes from the UI.')) 165 166 ->setDescription( 166 167 pht( 167 167 - 'By default, Phabricator includes some flavor text in the UI, '. 168 168 + 'By default, this software includes some flavor text in the UI, '. 168 169 'like a prompt to "Weigh In" rather than "Add Comment" in '. 169 170 'Maniphest. If you\'d prefer more traditional UI strings like '. 170 171 '"Add Comment", you can set this flag to disable most of the '. ··· 189 190 'will not be linked.')) 190 191 ->setDescription( 191 192 pht( 192 192 - 'By default, Phabricator links object names in Remarkup fields '. 193 193 + 'By default, this software links object names in Remarkup fields '. 193 194 'to the corresponding object. This regex can be used to modify '. 194 195 'this behavior; object names that match this regex will not be '. 195 196 'linked.')), ··· 200 201 '$PATH')) 201 202 ->setDescription( 202 203 pht( 203 203 - "Phabricator occasionally shells out to other binaries on the ". 204 204 + "Thhi software sometimes executes other binaries on the ". 204 205 "server. An example of this is the `%s` command, used to ". 205 206 "syntax-highlight code written in languages other than PHP. By ". 206 207 "default, it is assumed that these binaries are in the %s of the ". 207 207 - "user running Phabricator (normally 'apache', 'httpd', or ". 208 208 + "user running this software (normally 'apache', 'httpd', or ". 208 209 "'nobody'). Here you can add extra directories to the %s ". 209 210 "environment variable, for when these binaries are in ". 210 211 "non-standard locations.\n\n". ··· 216 217 'pygmentize', 217 218 '$PATH', 218 219 '$PATH', 219 219 - 'phabricator/support/bin/', 220 220 + 'support/bin/', 220 221 $path)) 221 222 ->setLocked(true) 222 223 ->addExample('/usr/local/bin', pht('Add One Path')) ··· 262 263 pht('Run Silently'), 263 264 pht('Run Normally'), 264 265 )) 265 265 - ->setSummary(pht('Stop Phabricator from sending any email, etc.')) 266 266 + ->setSummary(pht('Stop this software from sending any email, etc.')) 266 267 ->setDescription($silent_description), 267 268 ); 268 269 ··· 306 307 throw new PhabricatorConfigValidationException( 307 308 pht( 308 309 "Config option '%s' is invalid. The URI must NOT have a path, ". 309 309 - "e.g. '%s' is OK, but '%s' is not. Phabricator must be installed ". 310 310 - "on an entire domain; it can not be installed on a path.", 310 310 + "e.g. '%s' is OK, but '%s' is not. This software must be '. 311 311 + 'installed on an entire domain; it can not be installed on a path.", 311 312 $key, 312 312 - 'http://phabricator.example.com/', 313 313 - 'http://example.com/phabricator/')); 313 313 + 'http://devtools.example.com/', 314 314 + 'http://example.com/devtools/')); 314 315 } 315 316 } 316 317

+10 -9

src/applications/config/option/PhabricatorDeveloperConfigOptions.php

reviewed

··· 8 8 } 9 9 10 10 public function getDescription() { 11 11 - return pht('Options for Phabricator developers, including debugging.'); 11 11 + return pht('Options for platform developers, including debugging.'); 12 12 } 13 13 14 14 public function getIcon() { ··· 27 27 pht('Enable DarkConsole'), 28 28 pht('Disable DarkConsole'), 29 29 )) 30 30 - ->setSummary(pht("Enable Phabricator's debugging console.")) 30 30 + ->setSummary(pht('Enable the debugging console.')) 31 31 ->setDescription( 32 32 pht( 33 33 "DarkConsole is a development and profiling tool built into ". 34 34 - "Phabricator's web interface. You should leave it disabled unless ". 35 35 - "you are developing or debugging Phabricator.\n\n". 34 34 + "the web interface. You should leave it disabled unless ". 35 35 + "you are developing or debugging %s.\n\n". 36 36 "Once you activate DarkConsole for the install, **you need to ". 37 37 "enable it for your account before it will actually appear on ". 38 38 "pages.** You can do this in Settings > Developer Settings.\n\n". 39 39 "DarkConsole exposes potentially sensitive data (like queries, ". 40 40 "stack traces, and configuration) so you generally should not ". 41 41 - "turn it on in production.")), 41 41 + "turn it on in production.", 42 42 + PlatformSymbols::getPlatformServerName())), 42 43 $this->newOption('darkconsole.always-on', 'bool', false) 43 44 ->setBoolOptions( 44 45 array( ··· 91 92 'Confirm before redirecting so DarkConsole can be examined.')) 92 93 ->setDescription( 93 94 pht( 94 94 - 'Normally, Phabricator issues HTTP redirects after a successful '. 95 95 + 'Normally, this software issues HTTP redirects after a successful '. 95 96 'POST. This can make it difficult to debug things which happen '. 96 97 'while processing the POST, because service and profiling '. 97 98 'information are lost. By setting this configuration option, '. 98 98 - 'Phabricator will show a page instead of automatically '. 99 99 + 'an interstitial page will be shown instead of automatically '. 99 100 'redirecting, allowing you to examine service and profiling '. 100 101 'information. It also makes the UX awful, so you should only '. 101 102 'enable it when debugging.')), ··· 106 107 ->setSummary(pht('Automatically profile some percentage of pages.')) 107 108 ->setDescription( 108 109 pht( 109 109 - "Normally, Phabricator profiles pages only when explicitly ". 110 110 + "Normally, pages are profiled only when explicitly ". 110 111 "requested via DarkConsole. However, it may be useful to profile ". 111 112 "some pages automatically.\n\n". 112 113 "Set this option to a positive integer N to profile 1 / N pages ". ··· 128 129 ->setDescription( 129 130 pht( 130 131 "The Multimeter application collects performance samples. You ". 131 131 - "can use this data to help you understand what Phabricator is ". 132 132 + "can use this data to help you understand what the software is ". 132 133 "spending time and resources doing, and to identify problematic ". 133 134 "access patterns.". 134 135 "\n\n".

+2 -2

src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php

reviewed

··· 4 4 extends PhabricatorApplicationConfigOptions { 5 5 6 6 public function getName() { 7 7 - return pht('Extending Phabricator'); 7 7 + return pht('Extensions'); 8 8 } 9 9 10 10 public function getDescription() { 11 11 - return pht('Make Phabricator even cooler!'); 11 11 + return pht('Manage extensions.'); 12 12 } 13 13 14 14 public function getIcon() {

+46 -44

src/applications/config/option/PhabricatorMetaMTAConfigOptions.php

reviewed

··· 22 22 public function getOptions() { 23 23 $send_as_user_desc = $this->deformat(pht(<<<EODOC 24 24 When a user takes an action which generates an email notification (like 25 25 - commenting on a Differential revision), Phabricator can either send that mail 26 26 - "From" the user's email address (like "alincoln@logcabin.com") or "From" the 27 27 - '%s' address. 25 25 + commenting on a Differential revision), the "From" address can either be set 26 26 + to the user's email address (like "alincoln@logcabin.com") or the 27 27 + "metamta.defualt-address" address. 28 28 29 29 - The user experience is generally better if Phabricator uses the user's real 30 30 - address as the "From" since the messages are easier to organize when they appear 31 31 - in mail clients, but this will only work if the server is authorized to send 32 32 - email on behalf of the "From" domain. Practically, this means: 29 29 + The user experience is generally better if the user's real address is used as 30 30 + the "From" header value, since the messages are easier to organize when they 31 31 + appear in mail clients, but this will only work if the server is authorized to 32 32 + send email on behalf of the "From" domain. Practically, this means: 33 33 34 34 - If you are doing an install for Example Corp and all the users will have 35 35 - corporate @corp.example.com addresses and any hosts Phabricator is running 35 35 + corporate @corp.example.com addresses and any hosts this software is running 36 36 on are authorized to send email from corp.example.com, you can enable this 37 37 to make the user experience a little better. 38 38 - If you are doing an install for an open source project and your users will 39 39 - be registering via Facebook and using personal email addresses, you probably 40 40 - should not enable this or all of your outgoing email might vanish into SFP 41 41 - blackholes. 39 39 + be registering via third-party services and/or using personal email 40 40 + addresses, you probably should not enable this or all of your outgoing 41 41 + email might vanish into SFP blackholes. 42 42 - If your install is anything else, you're safer leaving this off, at least 43 43 initially, since the risk in turning it on is that your outgoing mail will 44 44 never arrive. 45 45 EODOC 46 46 - , 47 47 - 'metamta.default-address')); 46 46 + )); 48 47 49 48 $one_mail_per_recipient_desc = $this->deformat(pht(<<<EODOC 50 49 When a message is sent to multiple recipients (for example, several reviewers on 51 51 - a code review), Phabricator can either deliver one email to everyone (e.g., "To: 50 50 + a code review), it can either be delieverd as one email to everyone (e.g., "To: 52 51 alincoln, usgrant, htaft") or separate emails to each user (e.g., "To: 53 52 alincoln", "To: usgrant", "To: htaft"). The major advantages and disadvantages 54 53 of each approach are: ··· 62 61 - Getting threading to work properly is harder, and probably requires 63 62 making mail less useful by turning off options. 64 63 - Sometimes people will "Reply All", which can send mail to too many 65 65 - recipients. Phabricator will try not to send mail to users who already 64 64 + recipients. This software will try not to send mail to users who already 66 65 received a similar message, but can not prevent all stray email arising 67 66 from "Reply All". 68 67 - Not supported with a private reply-to address. ··· 104 103 105 104 $re_prefix_description = $this->deformat(pht(<<<EODOC 106 105 Mail.app on OS X Lion won't respect threading headers unless the subject is 107 107 - prefixed with "Re:". If you enable this option, Phabricator will add "Re:" to 106 106 + prefixed with "Re:". If you enable this option, this software will add "Re:" to 108 107 the subject line of all mail which is expected to thread. If you've set 109 108 'metamta.one-mail-per-recipient', users can override this setting in their 110 109 preferences. ··· 121 120 'metamta.one-mail-per-recipient')); 122 121 123 122 $reply_to_description = $this->deformat(pht(<<<EODOC 124 124 - If you enable `%s`, Phabricator uses "From" to authenticate users. You can 123 123 + If you enable `%s`, this software uses "From" to authenticate users. You can 125 124 additionally enable this setting to try to authenticate with 'Reply-To'. Note 126 125 that this is completely spoofable and insecure (any user can set any 'Reply-To' 127 126 address) but depending on the nature of your install or other deliverability ··· 142 141 )); 143 142 144 143 $public_replies_description = $this->deformat(pht(<<<EODOC 145 145 - By default, Phabricator generates unique reply-to addresses and sends a separate 146 146 - email to each recipient when you enable reply handling. This is more secure than 147 147 - using "From" to establish user identity, but can mean users may receive multiple 148 148 - emails when they are on mailing lists. Instead, you can use a single, non-unique 149 149 - reply to address and authenticate users based on the "From" address by setting 150 150 - this to 'true'. This trades away a little bit of security for convenience, but 151 151 - it's reasonable in many installs. Object interactions are still protected using 152 152 - hashes in the single public email address, so objects can not be replied to 153 153 - blindly. 144 144 + By default, this software generates unique reply-to addresses and sends a 145 145 + separate email to each recipient when you enable reply handling. This is more 146 146 + secure than using "From" to establish user identity, but can mean users may 147 147 + receive multiple emails when they are on mailing lists. Instead, you can use a 148 148 + single, non-unique reply to address and authenticate users based on the "From" 149 149 + address by setting this to 'true'. This trades away a little bit of security 150 150 + for convenience, but it's reasonable in many installs. Object interactions are 151 151 + still protected using hashes in the single public email address, so objects 152 152 + can not be replied to blindly. 154 153 EODOC 155 154 )); 156 155 157 156 $single_description = $this->deformat(pht(<<<EODOC 158 158 - If you want to use a single mailbox for Phabricator reply mail, you can use this 159 159 - and set a common prefix for reply addresses generated by Phabricator. It will 157 157 + If you want to use a single mailbox for reply mail, you can use this 158 158 + and set a common prefix for generated reply addresses. It will 160 159 make use of the fact that a mail-address such as 161 161 - `phabricator+D123+1hjk213h@example.com` will be delivered to the `phabricator` 160 160 + `devtools+D123+1hjk213h@example.com` will be delivered to the `devtools` 162 161 user's mailbox. Set this to the left part of the email address and it will be 163 162 prepended to all generated reply addresses. 164 163 165 165 - For example, if you want to use `phabricator@example.com`, this should be set 166 166 - to `phabricator`. 164 164 + For example, if you want to use `devtools@example.com`, this should be set 165 165 + to `devtools`. 167 166 EODOC 168 167 )); 169 168 170 169 $address_description = $this->deformat(pht(<<<EODOC 171 171 - When email is sent, what format should Phabricator use for user's email 170 170 + When email is sent, what format should the software use for users' email 172 171 addresses? Valid values are: 173 172 174 173 - `short`: 'gwashington <gwashington@example.com>' ··· 192 191 required but no meaningful address is available. 193 192 194 193 If you configure inbound mail, you generally do not need to set this: 195 195 - Phabricator will automatically generate and use a suitable mailbox on the 194 194 + the software will automatically generate and use a suitable mailbox on the 196 195 inbound mail domain. 197 196 198 197 Otherwise, this option should be configured to point at a valid mailbox which 199 198 discards all mail sent to it. If you point it at an invalid mailbox, mail sent 200 200 - by Phabricator and some mail sent by users will bounce. If you point it at a 199 199 + by the software and some mail sent by users will bounce. If you point it at a 201 200 real user mailbox, that user will get a lot of mail they don't want. 202 201 203 202 For further guidance, see **[[ %s | %s ]]** in the documentation. ··· 226 225 )) 227 226 ->setSummary( 228 227 pht( 229 229 - 'Controls whether Phabricator sends one email with multiple '. 230 230 - 'recipients in the "To:" line, or multiple emails, each with a '. 231 231 - 'single recipient in the "To:" line.')) 228 228 + 'Controls whether email for multiple recipients is sent by '. 229 229 + 'creating one message with everyone in the "To:" line, or '. 230 230 + 'multiple messages that each have a single recipeint in the '. 231 231 + '"To:" line.')) 232 232 ->setDescription($one_mail_per_recipient_desc), 233 233 $this->newOption('metamta.can-send-as-user', 'bool', false) 234 234 ->setBoolOptions( 235 235 array( 236 236 pht('Send as User Taking Action'), 237 237 - pht('Send as Phabricator'), 237 237 + pht( 238 238 + 'Send as %s', 239 239 + PlatformSymbols::getPlatformServerName()), 238 240 )) 239 241 ->setSummary( 240 242 pht( 241 241 - 'Controls whether Phabricator sends email "From" users.')) 243 243 + 'Controls whether email is sent "From" users.')) 242 244 ->setDescription($send_as_user_desc), 243 245 $this->newOption( 244 246 'metamta.reply-handler-domain', ··· 246 248 null) 247 249 ->setLocked(true) 248 250 ->setDescription(pht('Domain used for reply email addresses.')) 249 249 - ->addExample('phabricator.example.com', ''), 251 251 + ->addExample('devtools.example.com', ''), 250 252 $this->newOption('metamta.recipients.show-hints', 'bool', true) 251 253 ->setBoolOptions( 252 254 array( ··· 271 273 )) 272 274 ->setSummary( 273 275 pht( 274 274 - 'Phabricator can use less-secure but mailing list friendly public '. 275 275 - 'reply addresses.')) 276 276 + 'Reply addresses can either be private (more secure) or '. 277 277 + 'public (which works better with mailing lists).')) 276 278 ->setDescription($public_replies_description), 277 279 $this->newOption('metamta.single-reply-handler-prefix', 'string', null) 278 280 ->setSummary( 279 279 - pht('Allow Phabricator to use a single mailbox for all replies.')) 281 281 + pht('Allow a single mailbox to be used for all replies.')) 280 282 ->setDescription($single_description), 281 283 $this->newOption('metamta.user-address-format', 'enum', 'full') 282 284 ->setEnumOptions( ··· 285 287 'real' => pht('Real'), 286 288 'full' => pht('Full'), 287 289 )) 288 288 - ->setSummary(pht('Control how Phabricator renders user names in mail.')) 290 290 + ->setSummary(pht('Control how user names are rendered in mail.')) 289 291 ->setDescription($address_description) 290 292 ->addExample('gwashington <gwashington@example.com>', 'short') 291 293 ->addExample('George Washington <gwashington@example.com>', 'real')

+3 -3

src/applications/config/option/PhabricatorMySQLConfigOptions.php

reviewed

··· 38 38 $this->newOption('storage.default-namespace', 'string', 'phabricator') 39 39 ->setLocked(true) 40 40 ->setSummary( 41 41 - pht('The namespace that Phabricator databases should use.')) 41 41 + pht('The namespace that databases should use.')) 42 42 ->setDescription( 43 43 pht( 44 44 - "Phabricator puts databases in a namespace, which defaults to ". 44 44 + "Databases are created in a namespace, which defaults to ". 45 45 "'phabricator' -- for instance, the Differential database is ". 46 46 "named 'phabricator_differential' by default. You can change ". 47 47 "this namespace if you want. Normally, you should not do this ". 48 48 - "unless you are developing Phabricator and using namespaces to ". 48 48 + "unless you are developing extensions and using namespaces to ". 49 49 "separate multiple sandbox datasets.")), 50 50 $this->newOption('mysql.port', 'string', null) 51 51 ->setLocked(true)

+23 -25

src/applications/config/option/PhabricatorSecurityConfigOptions.php

reviewed

··· 67 67 PhabricatorEnv::getDoclink('Configuring Encryption'))); 68 68 69 69 $require_mfa_description = $this->deformat(pht(<<<EOTEXT 70 70 - By default, Phabricator allows users to add multi-factor authentication to 70 70 + By default, this software allows users to add multi-factor authentication to 71 71 their accounts, but does not require it. By enabling this option, you can 72 72 force all users to add at least one authentication factor before they can use 73 73 their accounts. ··· 87 87 ->setSummary(pht('Alternate domain to serve files from.')) 88 88 ->setDescription( 89 89 pht( 90 90 - 'By default, Phabricator serves files from the same domain '. 90 90 + 'By default, this software serves files from the same domain '. 91 91 'the application is served from. This is convenient, but '. 92 92 'presents a security risk.'. 93 93 "\n\n". ··· 119 119 pht( 120 120 "If the web server responds to both HTTP and HTTPS requests but ". 121 121 "you want users to connect with only HTTPS, you can set this ". 122 122 - "to `true` to make Phabricator redirect HTTP requests to HTTPS.". 122 122 + "to `true` to make this service redirect HTTP requests to HTTPS.". 123 123 "\n\n". 124 124 "Normally, you should just configure your server not to accept ". 125 125 "HTTP traffic, but this setting may be useful if you originally ". ··· 128 128 "balancer which terminates HTTPS connections and you can not ". 129 129 "reasonably configure more granular behavior there.". 130 130 "\n\n". 131 131 - "IMPORTANT: Phabricator determines if a request is HTTPS or not ". 132 132 - "by examining the PHP `%s` variable. If you run ". 133 133 - "Apache/mod_php this will probably be set correctly for you ". 134 134 - "automatically, but if you run Phabricator as CGI/FCGI (e.g., ". 135 135 - "through nginx or lighttpd), you need to configure your web ". 136 136 - "server so that it passes the value correctly based on the ". 137 137 - "connection type.". 131 131 + "IMPORTANT: A request is identified as HTTP or HTTPS by examining ". 132 132 + "the PHP `%s` variable. If you run Apache/mod_php this will ". 133 133 + "probably be set correctly for you automatically, but if you run ". 134 134 + "as CGI/FCGI (e.g., through nginx or lighttpd), you need to ". 135 135 + "configure your web server so that it passes the value correctly ". 136 136 + "based on the connection type.". 138 137 "\n\n". 139 139 - "If you configure Phabricator in cluster mode, note that this ". 138 138 + "If you configure clustering, note that this ". 140 139 "setting is ignored by intracluster requests.", 141 140 "\$_SERVER['HTTPS']")) 142 141 ->setBoolOptions( ··· 177 176 'dangerous URI handlers.'. 178 177 "\n\n". 179 178 'This set is also used to enforce valid redirect URIs. '. 180 180 - 'Phabricator will refuse to issue a HTTP "Location" redirect to a '. 181 181 - 'URI with a protocol not on this set.'. 179 179 + 'This service will refuse to issue a HTTP "Location" redirect '. 180 180 + 'to a URI with a protocol not on this set.'. 182 181 "\n\n". 183 182 'Usually, "http" and "https" should be present in this set. If '. 184 184 - 'you remove one or both protocols, some Phabricator features '. 185 185 - 'which rely on links or redirects may not work.')) 183 183 + 'you remove one or both protocols, some features which rely on '. 184 184 + 'links or redirects may not work.')) 186 185 ->addExample("http\nhttps", pht('Valid Setting')) 187 186 ->setLocked(true), 188 187 $this->newOption( ··· 248 247 'requests.')) 249 248 ->setDescription( 250 249 pht( 251 251 - 'Phabricator users can make requests to other services from '. 252 252 - 'the Phabricator host in some circumstances (for example, by '. 253 253 - 'creating a repository with a remote URL or having Phabricator '. 254 254 - 'fetch an image from a remote server).'. 250 250 + 'Users can make requests to other services from '. 251 251 + 'service hosts in some circumstances (for example, by '. 252 252 + 'creating a repository with a remote URL).'. 255 253 "\n\n". 256 254 'This may represent a security vulnerability if services on '. 257 255 'the same subnet will accept commands or reveal private '. ··· 259 257 'IP address. In particular, all hosts in EC2 have access to '. 260 258 'such a service.'. 261 259 "\n\n". 262 262 - 'This option defines a list of netblocks which Phabricator '. 263 263 - 'will decline to connect to. Generally, you should list all '. 260 260 + 'This option defines a list of netblocks which requests will '. 261 261 + 'never be issued to. Generally, you should list all '. 264 262 'private IP space here.')) 265 263 ->addExample(array('0.0.0.0/0'), pht('No Outbound Requests')), 266 264 $this->newOption('security.strict-transport-security', 'bool', false) ··· 326 324 throw new PhabricatorConfigValidationException( 327 325 pht( 328 326 "Config option '%s' is invalid. The URI must NOT have a path, ". 329 329 - "e.g. '%s' is OK, but '%s' is not. Phabricator must be installed ". 330 330 - "on an entire domain; it can not be installed on a path.", 327 327 + "e.g. '%s' is OK, but '%s' is not. This software must be ". 328 328 + "installed on an entire domain; it can not be installed on a path.", 331 329 $key, 332 332 - 'http://phabricator.example.com/', 333 333 - 'http://example.com/phabricator/')); 330 330 + 'http://devtools.example.com/', 331 331 + 'http://example.com/devtools/')); 334 332 } 335 333 } 336 334 }

+6 -7

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

reviewed

··· 31 31 ->setSummary(pht('Default non-pygments syntax highlighter engine.')) 32 32 ->setDescription( 33 33 pht( 34 34 - 'Phabricator can highlight PHP by default and use Pygments for '. 35 35 - 'other languages if enabled. You can provide a custom '. 36 36 - 'highlighter engine by extending class %s.', 34 34 + 'You can provide a custom highlighter engine by extending '. 35 35 + 'class %s.', 37 36 'PhutilSyntaxHighlighterEngine')), 38 37 $this->newOption('pygments.enabled', 'bool', false) 39 38 ->setSummary( 40 40 - pht('Should Phabricator use Pygments to highlight code?')) 39 39 + pht('Use Pygments to highlight code?')) 41 40 ->setBoolOptions( 42 41 array( 43 42 pht('Use Pygments'), ··· 45 44 )) 46 45 ->setDescription( 47 46 pht( 48 48 - 'Phabricator supports syntax highlighting a few languages by '. 47 47 + 'Syntax highlighting a supported for a few languages by '. 49 48 'default, but you can install Pygments (a third-party syntax '. 50 49 'highlighting tool) to provide support for many more languages.'. 51 50 "\n\n". ··· 54 53 'download and install instructions.'. 55 54 "\n\n". 56 55 'Once Pygments is installed, enable this option '. 57 57 - '(`pygments.enabled`) to make Phabricator use Pygments when '. 56 56 + '(`pygments.enabled`) to make use of Pygments when '. 58 57 'highlighting source code.'. 59 58 "\n\n". 60 59 'After you install and enable Pygments, newly created source '. 61 60 'code (like diffs and pastes) should highlight correctly. '. 62 62 - 'You may need to clear Phabricator\'s caches to get previously '. 61 61 + 'You may need to clear caches to get previously '. 63 62 'existing source code to highlight. For instructions on '. 64 63 'managing caches, see [[ %s | Managing Caches ]].', 65 64 $caches_href)),

+5 -4

src/applications/config/option/PhabricatorUIConfigOptions.php

reviewed

··· 8 8 } 9 9 10 10 public function getDescription() { 11 11 - return pht('Configure the Phabricator UI, including colors.'); 11 11 + return pht('Configure the UI, including colors.'); 12 12 } 13 13 14 14 public function getIcon() { ··· 51 51 return array( 52 52 $this->newOption('ui.header-color', 'enum', 'blindigo') 53 53 ->setDescription( 54 54 - pht('Sets the default color scheme of Phabricator.')) 54 54 + pht('Sets the default color scheme.')) 55 55 ->setEnumOptions($options), 56 56 $this->newOption('ui.logo', $logo_type, array()) 57 57 ->setSummary( ··· 61 61 "Customize the logo image and text which appears in the main ". 62 62 "site header:\n\n". 63 63 " - **Logo Image**: Upload a new 80 x 80px image to replace the ". 64 64 - "Phabricator logo in the site header.\n\n". 64 64 + "logo in the site header.\n\n". 65 65 " - **Wordmark**: Choose new text to display next to the logo. ". 66 66 - "By default, the header displays //Phabricator//.\n\n")), 66 66 + "By default, the header displays //%s//.\n\n", 67 67 + PlatformSymbols::getPlatformServerName())), 67 68 $this->newOption('ui.favicons', 'wild', array()) 68 69 ->setSummary(pht('Customize favicons.')) 69 70 ->setDescription(pht('Customize favicons.'))

+1 -1

src/applications/config/response/PhabricatorConfigResponse.php

reviewed

··· 21 21 } 22 22 23 23 protected function getResponseTitle() { 24 24 - return pht('Phabricator Setup Error'); 24 24 + return pht('Setup Error'); 25 25 } 26 26 27 27 protected function getResponseBodyClass() {

+9 -9

src/applications/config/view/PhabricatorSetupIssueView.php

reviewed

··· 90 90 91 91 $fallback_info = pht( 92 92 "If those commands don't work, try Google. The process of installing ". 93 93 - "PHP extensions is not specific to Phabricator, and any instructions ". 94 94 - "you can find for installing them on your system should work. On Mac ". 95 95 - "OS X, you might want to try Homebrew."); 93 93 + "PHP extensions is not specific to this software, and any ". 94 94 + "instructions you can find for installing them on your system should ". 95 95 + "work. On Mac OS X, you might want to try Homebrew."); 96 96 97 97 $restart_info = pht( 98 98 - 'After installing new PHP extensions, <strong>restart Phabricator '. 98 98 + 'After installing new PHP extensions, <strong>restart everything '. 99 99 'for the changes to take effect</strong>. For help with restarting '. 100 100 - 'Phabricator, see %s in the documentation.', 100 100 + 'everything, see %s in the documentation.', 101 101 $this->renderRestartLink()); 102 102 103 103 $description[] = phutil_tag( ··· 249 249 'p', 250 250 array(), 251 251 pht( 252 252 - 'The current Phabricator configuration has these %d value(s):', 252 252 + 'The current configuration has these %d value(s):', 253 253 count($configs))); 254 254 255 255 $options = PhabricatorApplicationConfigOptions::loadAllOptions(); ··· 284 284 $update = array(); 285 285 foreach ($configs as $key) { 286 286 $update[] = hsprintf( 287 287 - '<tt>phabricator/ $</tt> ./bin/config set %s <em>value</em>', 287 287 + '<tt>$</tt> ./bin/config set %s <em>value</em>', 288 288 $key); 289 289 } 290 290 $update = phutil_tag('pre', array(), phutil_implode_html("\n", $update)); ··· 460 460 'p', 461 461 array(), 462 462 pht( 463 463 - 'After editing the PHP configuration, <strong>restart Phabricator for '. 463 463 + 'After editing the PHP configuration, <strong>restart everything for '. 464 464 'the changes to take effect</strong>. For help with restarting '. 465 465 - 'Phabricator, see %s in the documentation.', 465 465 + 'everything, see %s in the documentation.', 466 466 $this->renderRestartLink())); 467 467 468 468 return phutil_tag(