about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2014-12-11 00:56:56 +0100
committerhut <hut@lepus.uberspace.de>2014-12-11 00:56:56 +0100
commitddc07b767f79874bd3a39c274492da41424329c9 (patch)
tree8ba34a66160c93a0a4cb5834c67cb3348004249d
parentb071cb85290860895ca53d11105c825674cadebb (diff)
parentb38b4dd1c053efd4b7669fa8727ca0da7c9fa379 (diff)
downloadranger-ddc07b767f79874bd3a39c274492da41424329c9.tar.gz
Merge branch 'fix-hacking-references' of https://github.com/threeifbywhiskey/ranger
-rw-r--r--README.md2
-rw-r--r--doc/ranger.14
-rw-r--r--doc/ranger.pod6
-rwxr-xr-xsetup.py2
4 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index 56565c46..0e0e3c02 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ out which program to use for what file type.
 ![screenshot](doc/screenshot.png)
 
 This file describes ranger and how to get it to run.  For instructions on the
-usage, please read the man page.  See doc/HACKING for development specific
+usage, please read the man page.  See HACKING.md for development specific
 information.  For configuration, check the files in ranger/config/.  They
 are usually installed to /usr/lib/python*/site-packages/ranger/config/
 and can be obtained with ranger's --copy-config option.  The doc/examples/
diff --git a/doc/ranger.1 b/doc/ranger.1
index dcbca8ce..c57cce0d 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -142,7 +142,7 @@
 ranger \- visual file manager
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBranger\fR [\fB\-\-version\fR] [\fB\-\-help\fR] [\fB\-\-debug\fR] [\fB\-\-clean\fR] 
+\&\fBranger\fR [\fB\-\-version\fR] [\fB\-\-help\fR] [\fB\-\-debug\fR] [\fB\-\-clean\fR]
 [\fB\-\-confdir\fR=\fIdirectory\fR] [\fB\-\-copy\-config\fR=\fIwhich\fR]
 [\fB\-\-choosefile\fR=\fItarget\fR] [\fB\-\-choosefiles\fR=\fItarget\fR]
 [\fB\-\-choosedir\fR=\fItarget\fR] [\fB\-\-selectfile\fR=\fIfilepath\fR]
@@ -160,7 +160,7 @@ commands and \fI3?\fR for settings.
 .PP
 The \fI\s-1README\s0\fR contains install instructions.
 .PP
-The file \fIdoc/HACKING\fR contains guidelines for code modification.
+The file \fIHACKING.md\fR contains guidelines for code modification.
 .PP
 The directory \fIdoc/configs\fR contains configuration files.  They are usually
 installed to \fI/usr/lib/python*/site\-packages/ranger/config\fR and can be
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 211aea11..f9836e41 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -7,7 +7,7 @@ ranger - visual file manager
 
 =head1 SYNOPSIS
 
-B<ranger> [B<--version>] [B<--help>] [B<--debug>] [B<--clean>] 
+B<ranger> [B<--version>] [B<--help>] [B<--debug>] [B<--clean>]
 [B<--confdir>=I<directory>] [B<--copy-config>=I<which>]
 [B<--choosefile>=I<target>] [B<--choosefiles>=I<target>]
 [B<--choosedir>=I<target>] [B<--selectfile>=I<filepath>]
@@ -33,7 +33,7 @@ commands and I<3?> for settings.
 
 The F<README> contains install instructions.
 
-The file F<doc/HACKING> contains guidelines for code modification.
+The file F<HACKING.md> contains guidelines for code modification.
 
 The directory F<doc/configs> contains configuration files.  They are usually
 installed to F</usr/lib/python*/site-packages/ranger/config> and can be
@@ -793,7 +793,7 @@ Gather and display data about version control systems. Supported vcs: git, hg.
 =item vcs_backend_git, vcs_backend_hg, vcs_backend_bzr [string]
 
 Sets the state for the version control backend. The possible values are:
-    
+
  disabled   don't display any information.
  local      display only local state.
  enabled    display both, local and remote state. May be slow for hg and bzr.
diff --git a/setup.py b/setup.py
index 7bb67837..d38b43ab 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if __name__ == '__main__':
             ('share/doc/ranger',
                 ['README.md',
                  'CHANGELOG',
-                 'doc/HACKING',
+                 'HACKING.md',
                  'doc/colorschemes.txt']),
             ('share/doc/ranger/config/colorschemes',
                 _findall('doc/config/colorschemes')),
='#n317'>317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497