テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 10 年前差分は期限切れになりません

0 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

82 行

15 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

82 行

# Lines That should already be in your .htacess

Order Allow,Deny

Deny from All

</Files>

Order Allow,Deny

Deny from All

</Files>

# You may need to un-comment the following lines

# Options +FollowSymlinks

# To make sure that rewritten dir or file (/|.html) will not load dir.php in case it exist

# Options -MultiViews

# REMEBER YOU ONLY NEED TO STARD MOD REWRITE ONCE

RewriteEngine On

# Uncomment the statement below if you want to make use of

# HTTP authentication and it does not already work.

# This could be required if you are for example using PHP via Apache CGI.

# RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]

# REWRITE BASE

RewriteBase /

# HERE IS A GOOD PLACE TO FORCE CANONICAL DOMAIN

# RewriteCond %{HTTP_HOST} !^myforum\.com$ [NC]

# RewriteRule ^(.*)$ http://myforum.com/$1 [QSA,L,R=301]

# DO NOT GO FURTHER IF THE REQUESTED FILE / DIR DOES EXISTS

RewriteCond %{REQUEST_FILENAME} -f [OR]

RewriteCond %{REQUEST_FILENAME} -d

RewriteRule . - [L]

#####################################################

# PHPBB SEO REWRITE RULES ALL MODES

#####################################################

# AUTHOR : dcz www.phpbb-seo.com

# STARTED : 01/2006

#################################

# FORUMS PAGES

###############

# FORUM INDEX

RewriteRule ^inicio\.html$ /index.php [QSA,L,NC]

RewriteRule ^inicio\.html$ /index.php [QSA,L,NC,R=301]

# FORUM ALL MODES

RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?f=$2&start=$4 [QSA,L,NC]

RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?f=$2&start=$4 [QSA,L,NC,R=301]

# TOPIC WITH VIRTUAL FOLDER ALL MODES

RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?f=$2&t=$4&start=$6 [QSA,L,NC]

RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?f=$2&t=$4&start=$6 [QSA,L,NC,R=301]

# TOPIC WITHOUT FORUM ID & DELIM ALL MODES

RewriteRule ^([a-z0-9_-]*)/?(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?forum_uri=$1&t=$3&start=$5 [QSA,L,NC]

RewriteRule ^([a-z0-9_-]*)/?(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?forum_uri=$1&t=$3&start=$5 [QSA,L,NC,R=301]

# PHPBB FILES ALL MODES

RewriteRule ^archivo/[a-z0-9_-]+/(thumb/)?([0-9]+)$ /download/file.php?id=$2&t=$1 [QSA,L,NC]

RewriteRule ^archivo/[a-z0-9_-]+/(thumb/)?([0-9]+)$ /download/file.php?id=$2&t=$1 [QSA,L,NC,R=301]

# PROFILES THROUGH USERNAME

RewriteRule ^usuario/([^/]+)/?$ /memberlist.php?mode=viewprofile&un=$1 [QSA,L,NC]

RewriteRule ^usuario/([^/]+)/?$ /memberlist.php?mode=viewprofile&un=$1 [QSA,L,NC,R=301]

# USER MESSAGES THROUGH USERNAME

RewriteRule ^usuario/([^/]+)/(topics|posts)/?(pagina([0-9]+)\.html)?$ /search.php?author=$1&sr=$2&start=$4 [QSA,L,NC]

RewriteRule ^usuario/([^/]+)/(topics|posts)/?(pagina([0-9]+)\.html)?$ /search.php?author=$1&sr=$2&start=$4 [QSA,L,NC,R=301]

# GROUPS ALL MODES

RewriteRule ^(grupo|[a-z0-9_-]*-g)([0-9]+)(-([0-9]+))?\.html$ /memberlist.php?mode=group&g=$2&start=$4 [QSA,L,NC]

RewriteRule ^(grupo|[a-z0-9_-]*-g)([0-9]+)(-([0-9]+))?\.html$ /memberlist.php?mode=group&g=$2&start=$4 [QSA,L,NC,R=301]

# POST

RewriteRule ^mensaje([0-9]+)\.html$ /viewtopic.php?p=$1 [QSA,L,NC]

RewriteRule ^mensaje([0-9]+)\.html$ /viewtopic.php?p=$1 [QSA,L,NC,R=301]

# ACTIVE TOPICS

RewriteRule ^temas-activos(-([0-9]+))?\.html$ /search.php?search_id=active_topics&start=$2&sr=topics [QSA,L,NC]

RewriteRule ^temas-activos(-([0-9]+))?\.html$ /search.php?search_id=active_topics&start=$2&sr=topics [QSA,L,NC,R=301]

# UNANSWERED TOPICS

RewriteRule ^temas-sin-respuesta(-([0-9]+))?\.html$ /search.php?search_id=unanswered&start=$2&sr=topics [QSA,L,NC]

RewriteRule ^temas-sin-respuesta(-([0-9]+))?\.html$ /search.php?search_id=unanswered&start=$2&sr=topics [QSA,L,NC,R=301]

# NEW POSTS

RewriteRule ^nuevos-mensajes(-([0-9]+))?\.html$ /search.php?search_id=newposts&start=$2&sr=topics [QSA,L,NC]

RewriteRule ^nuevos-mensajes(-([0-9]+))?\.html$ /search.php?search_id=newposts&start=$2&sr=topics [QSA,L,NC,R=301]

# UNREAD POSTS

RewriteRule ^mensajes-no-leidos(-([0-9]+))?\.html$ /search.php?search_id=unreadposts&start=$2 [QSA,L,NC]

RewriteRule ^mensajes-no-leidos(-([0-9]+))?\.html$ /search.php?search_id=unreadposts&start=$2 [QSA,L,NC,R=301]

# THE TEAM

RewriteRule ^equipo\.html$ /memberlist.php?mode=leaders [QSA,L,NC]

RewriteRule ^equipo\.html$ /memberlist.php?mode=leaders [QSA,L,NC,R=301]

# HERE IS A GOOD PLACE TO ADD OTHER PHPBB RELATED REWRITERULES

# FORUM WITHOUT ID & DELIM ALL MODES

# THESE THREE LINES MUST BE LOCATED AT THE END OF YOUR HTACCESS TO WORK PROPERLY

RewriteCond %{REQUEST_FILENAME} !-f

RewriteCond %{REQUEST_FILENAME} !-d

RewriteRule ^([a-z0-9_-]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?forum_uri=$1&start=$3 [QSA,L,NC]

RewriteRule ^([a-z0-9_-]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?forum_uri=$1&start=$3 [QSA,L,NC,R=301]

# FIX RELATIVE PATHS : FILES

RewriteRule ^.+/(style\.php|ucp\.php|mcp\.php|faq\.php|download/file.php)$ /$1 [QSA,L,NC,R=301]

# FIX RELATIVE PATHS : IMAGES

RewriteRule ^.+/(styles/.*|images/.*)/$ /$1 [QSA,L,NC,R=301]

# END PHPBB PAGES

#####################################################

保存された差分

原文

ファイルを開く

# Lines That should already be in your .htacess
<Files "config.php">
Order Allow,Deny
Deny from All
</Files>
<Files "common.php">
Order Allow,Deny
Deny from All
</Files>

# You may need to un-comment the following lines
# Options +FollowSymlinks
# To make sure that rewritten dir or file (/|.html) will not load dir.php in case it exist
# Options -MultiViews
# REMEBER YOU ONLY NEED TO STARD MOD REWRITE ONCE
RewriteEngine On
# Uncomment the statement below if you want to make use of
# HTTP authentication and it does not already work.
# This could be required if you are for example using PHP via Apache CGI.
# RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
# REWRITE BASE
RewriteBase /
# HERE IS A GOOD PLACE TO FORCE CANONICAL DOMAIN
# RewriteCond %{HTTP_HOST} !^myforum\.com$ [NC]
# RewriteRule ^(.*)$ http://myforum.com/$1 [QSA,L,R=301]

# DO NOT GO FURTHER IF THE REQUESTED FILE / DIR DOES EXISTS
RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule . - [L]
#####################################################
# PHPBB SEO REWRITE RULES ALL MODES
#####################################################
# AUTHOR : dcz www.phpbb-seo.com
# STARTED : 01/2006
#################################
# FORUMS PAGES
###############
# FORUM INDEX
RewriteRule ^inicio\.html$ /index.php [QSA,L,NC]
# FORUM ALL MODES
RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?f=$2&start=$4 [QSA,L,NC]
# TOPIC WITH VIRTUAL FOLDER ALL MODES
RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?f=$2&t=$4&start=$6 [QSA,L,NC]
# TOPIC WITHOUT FORUM ID & DELIM ALL MODES
RewriteRule ^([a-z0-9_-]*)/?(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?forum_uri=$1&t=$3&start=$5 [QSA,L,NC]
# PHPBB FILES ALL MODES
RewriteRule ^archivo/[a-z0-9_-]+/(thumb/)?([0-9]+)$ /download/file.php?id=$2&t=$1 [QSA,L,NC]
# PROFILES THROUGH USERNAME
RewriteRule ^usuario/([^/]+)/?$ /memberlist.php?mode=viewprofile&un=$1 [QSA,L,NC]
# USER MESSAGES THROUGH USERNAME
RewriteRule ^usuario/([^/]+)/(topics|posts)/?(pagina([0-9]+)\.html)?$ /search.php?author=$1&sr=$2&start=$4 [QSA,L,NC]
# GROUPS ALL MODES
RewriteRule ^(grupo|[a-z0-9_-]*-g)([0-9]+)(-([0-9]+))?\.html$ /memberlist.php?mode=group&g=$2&start=$4 [QSA,L,NC]
# POST
RewriteRule ^mensaje([0-9]+)\.html$ /viewtopic.php?p=$1 [QSA,L,NC]
# ACTIVE TOPICS
RewriteRule ^temas-activos(-([0-9]+))?\.html$ /search.php?search_id=active_topics&start=$2&sr=topics [QSA,L,NC]
# UNANSWERED TOPICS
RewriteRule ^temas-sin-respuesta(-([0-9]+))?\.html$ /search.php?search_id=unanswered&start=$2&sr=topics [QSA,L,NC]
# NEW POSTS
RewriteRule ^nuevos-mensajes(-([0-9]+))?\.html$ /search.php?search_id=newposts&start=$2&sr=topics [QSA,L,NC]
# UNREAD POSTS
RewriteRule ^mensajes-no-leidos(-([0-9]+))?\.html$ /search.php?search_id=unreadposts&start=$2 [QSA,L,NC]
# THE TEAM
RewriteRule ^equipo\.html$ /memberlist.php?mode=leaders [QSA,L,NC]
# HERE IS A GOOD PLACE TO ADD OTHER PHPBB RELATED REWRITERULES

# FORUM WITHOUT ID & DELIM ALL MODES
# THESE THREE LINES MUST BE LOCATED AT THE END OF YOUR HTACCESS TO WORK PROPERLY
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^([a-z0-9_-]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?forum_uri=$1&start=$3 [QSA,L,NC]
# FIX RELATIVE PATHS : FILES
RewriteRule ^.+/(style\.php|ucp\.php|mcp\.php|faq\.php|download/file.php)$ /$1 [QSA,L,NC,R=301]
# FIX RELATIVE PATHS : IMAGES
RewriteRule ^.+/(styles/.*|images/.*)/$ /$1 [QSA,L,NC,R=301]
# END PHPBB PAGES
#####################################################

変更されたテキスト

ファイルを開く

# Lines That should already be in your .htacess
<Files "config.php">
Order Allow,Deny
Deny from All
</Files>
<Files "common.php">
Order Allow,Deny
Deny from All
</Files>

# DO NOT GO FURTHER IF THE REQUESTED FILE / DIR DOES EXISTS
RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule . - [L]
#####################################################
# PHPBB SEO REWRITE RULES ALL MODES
#####################################################
# AUTHOR : dcz www.phpbb-seo.com
# STARTED : 01/2006
#################################
# FORUMS PAGES
###############
# FORUM INDEX
RewriteRule ^inicio\.html$ /index.php [QSA,L,NC,R=301]
# FORUM ALL MODES
RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?f=$2&start=$4 [QSA,L,NC,R=301]
# TOPIC WITH VIRTUAL FOLDER ALL MODES
RewriteRule ^(foro|[a-z0-9_-]*-f)([0-9]+)/(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?f=$2&t=$4&start=$6 [QSA,L,NC,R=301]
# TOPIC WITHOUT FORUM ID & DELIM ALL MODES
RewriteRule ^([a-z0-9_-]*)/?(tema|[a-z0-9_-]*-t)([0-9]+)(-([0-9]+))?\.html$ /viewtopic.php?forum_uri=$1&t=$3&start=$5 [QSA,L,NC,R=301]
# PHPBB FILES ALL MODES
RewriteRule ^archivo/[a-z0-9_-]+/(thumb/)?([0-9]+)$ /download/file.php?id=$2&t=$1 [QSA,L,NC,R=301]
# PROFILES THROUGH USERNAME
RewriteRule ^usuario/([^/]+)/?$ /memberlist.php?mode=viewprofile&un=$1 [QSA,L,NC,R=301]
# USER MESSAGES THROUGH USERNAME
RewriteRule ^usuario/([^/]+)/(topics|posts)/?(pagina([0-9]+)\.html)?$ /search.php?author=$1&sr=$2&start=$4 [QSA,L,NC,R=301]
# GROUPS ALL MODES
RewriteRule ^(grupo|[a-z0-9_-]*-g)([0-9]+)(-([0-9]+))?\.html$ /memberlist.php?mode=group&g=$2&start=$4 [QSA,L,NC,R=301]
# POST
RewriteRule ^mensaje([0-9]+)\.html$ /viewtopic.php?p=$1 [QSA,L,NC,R=301]
# ACTIVE TOPICS
RewriteRule ^temas-activos(-([0-9]+))?\.html$ /search.php?search_id=active_topics&start=$2&sr=topics [QSA,L,NC,R=301]
# UNANSWERED TOPICS
RewriteRule ^temas-sin-respuesta(-([0-9]+))?\.html$ /search.php?search_id=unanswered&start=$2&sr=topics [QSA,L,NC,R=301]
# NEW POSTS
RewriteRule ^nuevos-mensajes(-([0-9]+))?\.html$ /search.php?search_id=newposts&start=$2&sr=topics [QSA,L,NC,R=301]
# UNREAD POSTS
RewriteRule ^mensajes-no-leidos(-([0-9]+))?\.html$ /search.php?search_id=unreadposts&start=$2 [QSA,L,NC,R=301]
# THE TEAM
RewriteRule ^equipo\.html$ /memberlist.php?mode=leaders [QSA,L,NC,R=301]
# HERE IS A GOOD PLACE TO ADD OTHER PHPBB RELATED REWRITERULES

# FORUM WITHOUT ID & DELIM ALL MODES
# THESE THREE LINES MUST BE LOCATED AT THE END OF YOUR HTACCESS TO WORK PROPERLY
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^([a-z0-9_-]+)/?(pagina([0-9]+)\.html)?$ /viewforum.php?forum_uri=$1&start=$3 [QSA,L,NC,R=301]
# FIX RELATIVE PATHS : FILES
RewriteRule ^.+/(style\.php|ucp\.php|mcp\.php|faq\.php|download/file.php)$ /$1 [QSA,L,NC,R=301]
# FIX RELATIVE PATHS : IMAGES
RewriteRule ^.+/(styles/.*|images/.*)/$ /$1 [QSA,L,NC,R=301]
# END PHPBB PAGES
#####################################################